[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.20] CI: Create initrd fragments explicitly as root
commit ae992e68d3ed7a177adea8b9afa4ec88c27254f0 Author: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> AuthorDate: Tue Sep 9 18:06:37 2025 +0100 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Wed Sep 10 17:19:50 2025 +0100 CI: Create initrd fragments explicitly as root We have a mix of root and non-root containers, and are trying to become rootless. This can cause the local CPIO fragements to end up being user:user in the test environment. Nothing seems to go wrong so far, but it's a trap waiting to happen. Make everything consistently root for the initrds, irrespective of the rootness of the container the test is running in. No practical change. Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Reviewed-by: Denis Mukhin <dmukhin@xxxxxxxx> Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> (cherry picked from commit e3042c9fc28f2cbeaae6fd248eee7f63ac2ae494) --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 4 ++-- automation/scripts/qemu-smoke-dom0-arm32.sh | 4 ++-- automation/scripts/qemu-smoke-dom0-arm64.sh | 4 ++-- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm64.sh | 4 ++-- automation/scripts/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index a348c781d1..fdf72ee735 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -108,7 +108,7 @@ else # Note: Some smoke tests depending on finding binaries/xen on a full build # even though dist/ contains everything, while some containers don't even # build Xen - (cd dist/install; find | cpio -o -H newc | gzip) > binaries/xen-tools.cpio.gz + (cd dist/install; find | cpio -R 0:0 -o -H newc | gzip) > binaries/xen-tools.cpio.gz cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 746e70483d..b95e63360b 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,7 +25,7 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. # Dom0 rootfs @@ -57,7 +57,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index 4f50eabdef..43bb4102e5 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -30,13 +30,13 @@ curl --fail --silent --show-error --location --output initrd.tar.gz https://dl-c mkdir rootfs cd rootfs tar xvzf ../initrd.tar.gz -find . | cpio -H newc -o | gzip > ../root/initrd.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip > ../root/initrd.cpio.gz cd .. rm -rf rootfs rm initrd.tar.gz cp ../zImage ./root -find . | cpio -H newc -o | gzip > ../initrd.gz +find . | cpio -R 0:0 -H newc -o | gzip > ../initrd.gz cd .. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index d6f6b74880..6517437a5d 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio -H newc -o | gzip > ../domU-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip > ../domU-rootfs.cpio.gz cd .. # Dom0 rootfs @@ -54,7 +54,7 @@ xl -vvv create -c /root/domU.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -find . | cpio -H newc -o | gzip >> ../dom0-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../dom0-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 0e2c5496db..f100a9a9d2 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -75,7 +75,7 @@ mount -t devtmpfs devtmpfs /dev ${domU_check} /bin/sh" > init chmod +x init -find . | cpio -H newc -o | gzip > ../initrd.gz +find . | cpio -R 0:0 -H newc -o | gzip > ../initrd.gz cd .. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 18ea071c2a..4d08d2f4f5 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -108,7 +108,7 @@ ${domU_check} /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format='newc' | gzip > ../binaries/initrd +find . | cpio -R 0:0 -o -H newc | gzip > ../binaries/initrd cd .. # Dom0 rootfs @@ -136,7 +136,7 @@ xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index bfdd2ceb99..e20a38e4f3 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,7 @@ ${domU_check} Kernel \r on an \m (\l) " > etc/issue - find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz + find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi @@ -239,7 +239,7 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 8f02fa73bd..e68b0ce61f 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -99,7 +99,7 @@ echo "domU Welcome to Alpine Linux Kernel \r on an \m (\l) " > etc/issue -find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs @@ -127,7 +127,7 @@ echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # Load software into TFTP server directory. diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 293232eebf..3c89b8694a 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -50,7 +50,7 @@ echo "#!/bin/sh ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs @@ -71,7 +71,7 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz +find . | cpio -R 0:0 -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.20
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |