From 97a0af43e799af9db5faad7d4756a3cb71a32331 Mon Sep 17 00:00:00 2001 From: Ronald G Minnich Date: Thu, 12 Dec 2024 10:18:49 -0800 Subject: [PATCH] Fix the TESTCPU script and .gitignore for the new world goanwyhere is really nice, use that. Signed-off-by: Ronald G Minnich --- .gitignore | 2 ++ TESTCPU | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7ba2e5b4..7c1589c0 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ *tar *uck *.pub + +u-root/ diff --git a/TESTCPU b/TESTCPU index e996461b..8d3ffa04 100755 --- a/TESTCPU +++ b/TESTCPU @@ -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 @@ -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