Skip to content

Commit 6c6144f

Browse files
rminnichorangecms
authored andcommitted
Fix the TESTCPU script and .gitignore for the new world
goanwyhere is really nice, use that. Signed-off-by: Ronald G Minnich <[email protected]>
1 parent 50279c5 commit 6c6144f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@
2828
*tar
2929
*uck
3030
*.pub
31+
32+
u-root/

TESTCPU

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ SOURCE=${SOURCE:=$HOME/go/src/github.com/u-root/u-root}
44
KERNEL=${KERNEL:=$HOME/linuxboot/mainboards/intel/generic/kernel-noinitramfs}
55
VMN=${VMN:=42}
66
KEY=${KEY:=~/.ssh/cpu_rsa.pub:key.pub}
7+
UROOT=${UROOT:=~/go/src/github.com/u-root/u-root}
78

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

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

0 commit comments

Comments
 (0)