Update u-root invocation in provisioning test scripts

integration/qemu-provision.sh

@@ -98,15 +98,17 @@ echo SUCCESS: provisioning
 shutdown
 EOF
 
-./bin/u-root -o out/stprov.cpio \
-	     -uroot-source=cache/u-root \
+(cd cache/u-root &&
+    ../../bin/u-root -o ../../out/stprov.cpio \
 	-uinitcmd="/bin/sh stprov.sh" \
-	     -files out/1-modules.conf:lib/modules-load.d/1-modules.conf \
-	     -files out/modules/usr/lib/modules:lib/modules \
-	     -files bin/stprov:bin/stprov \
-	     -files out/stprov.sh:stprov.sh \
-	     -files isrgrootx1.pem:etc/trust_policy/tls_roots.pem\
-	     cache/u-root/cmds/core/{init,elvish,mount,shutdown}
+	-defaultsh="elvish"\
+	-files ../../out/1-modules.conf:lib/modules-load.d/1-modules.conf \
+	-files ../../out/modules/usr/lib/modules:lib/modules \
+	-files ../../bin/stprov:bin/stprov \
+	-files ../../out/stprov.sh:stprov.sh \
+	-files ../../isrgrootx1.pem:etc/trust_policy/tls_roots.pem\
+	./cmds/core/{init,elvish,mount,shutdown}
+)
 
 gzip -9 out/stprov.cpio && mv out/stprov.cpio.gz out/stprov-initramfs
 ./bin/stmgr ospkg create -cmdline='console=ttyS0,115200n8' \

integration/supermicro-x11scl-provision-iso.sh

@@ -138,15 +138,17 @@ sleep 10
 shutdown reboot
 EOF
 
-./bin/u-root -o out/stprov.cpio \
-	     -uroot-source=cache/u-root \
+(cd cache/u-root &&
+    ../../bin/u-root -o ../../out/stprov.cpio \
 	-uinitcmd="/bin/sh stprov.sh" \
-	     -files out/1-modules.conf:lib/modules-load.d/1-modules.conf \
-	     -files out/modules/usr/lib/modules:lib/modules \
-	     -files bin/stprov:bin/stprov \
-	     -files out/stprov.sh:stprov.sh \
-	     -files isrgrootx1.pem:etc/trust_policy/tls_roots.pem\
-	     cache/u-root/cmds/core/{init,elvish,mount,shutdown}
+	-defaultsh="elvish"\
+	-files ../../out/1-modules.conf:lib/modules-load.d/1-modules.conf \
+	-files ../../out/modules/usr/lib/modules:lib/modules \
+	-files ../../bin/stprov:bin/stprov \
+	-files ../../out/stprov.sh:stprov.sh \
+	-files ../../isrgrootx1.pem:etc/trust_policy/tls_roots.pem\
+	./cmds/core/{init,elvish,mount,shutdown}
+)
 
 gzip -9 out/stprov.cpio && mv out/stprov.cpio.gz out/stprov-initramfs
 ./bin/stmgr ospkg create -cmdline="${CONSOLE}" \