Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the TESTCPU script and .gitignore for the new world #292

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@
*tar
*uck
*.pub

u-root/
12 changes: 5 additions & 7 deletions TESTCPU
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SOURCE=${SOURCE:=$HOME/go/src/github.com/u-root/u-root}
KERNEL=${KERNEL:=$HOME/linuxboot/mainboards/intel/generic/kernel-noinitramfs}
VMN=${VMN:=42}
KEY=${KEY:=~/.ssh/cpu_rsa.pub:key.pub}
UROOT=${UROOT:=~/go/src/github.com/u-root/u-root}

echo NOTE: WE USED TO RUN CPUD AUTOMAGICALLY
echo That turned out to be inconvenient for testing
Expand All @@ -17,13 +18,10 @@ echo -initcmd=/bbin/cpud \
# $* is positioned where it is so you can use extra switches like -h or add files via, e.g., -files whatever
# you can also add non-switch args too.
# it allows you to configure the initramfs a bit more, with or without switches
u-root \
-files $KEY \
-uroot-source $SOURCE \
$* \
all \
cmds/cpud \
cmds/cpu \
# The day when u-root was superconvenient to use is gone, done in by modules.
# goanywhere makes it much less hard.
go install github.com/u-root/gobusybox/src/cmd/goanywhere@latest
goanywhere ${UROOT}/cmds/core/* ./cmds/cpu ./cmds/cpud -- u-root -files $KEY

echo NOT adding a host key at -files ssh_host_rsa_key:etc/ssh/ssh_host_rsa_key

Expand Down
Loading