| Message ID | 526ec153b1cabc1d5b111be27ded8d0d4da5178a.1744403499.git-series.marmarek@invisiblethingslab.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Several CI cleanups and improvements around initrd/rootfs | expand |
On 11/04/2025 9:32 pm, Marek Marczykowski-Górecki wrote: > diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh > index 861e302d845b..dd88a1398f2b 100755 > --- a/automation/scripts/qubes-x86-64.sh > +++ b/automation/scripts/qubes-x86-64.sh > @@ -182,7 +182,10 @@ ${domU_check} > " > etc/local.d/xen.start > chmod +x etc/local.d/xen.start > echo "rc_verbose=yes" >> etc/rc.conf > - sed -i -e 's/^Welcome/domU \0/' etc/issue > + echo "domU Welcome to Alpine Linux 3.18 This 3.18 is going to go stale shortly. Because of LOG_MSG="Welcome to Alpine Linux", the version doesn't matter. Alpine does have /etc/os-release, but busybox's getty doesn't translate \S. https://github.com/brgl/busybox/blob/abbf17abccbf832365d9acf1c280369ba7d5f8b2/libbb/login.c#L84-L86 I'd suggest just dropping the 3.18. Otherwise, Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
On Fri, Apr 11, 2025 at 10:07:28PM +0100, Andrew Cooper wrote: > On 11/04/2025 9:32 pm, Marek Marczykowski-Górecki wrote: > > diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh > > index 861e302d845b..dd88a1398f2b 100755 > > --- a/automation/scripts/qubes-x86-64.sh > > +++ b/automation/scripts/qubes-x86-64.sh > > @@ -182,7 +182,10 @@ ${domU_check} > > " > etc/local.d/xen.start > > chmod +x etc/local.d/xen.start > > echo "rc_verbose=yes" >> etc/rc.conf > > - sed -i -e 's/^Welcome/domU \0/' etc/issue > > + echo "domU Welcome to Alpine Linux 3.18 > > This 3.18 is going to go stale shortly. > > Because of LOG_MSG="Welcome to Alpine Linux", the version doesn't matter. > > Alpine does have /etc/os-release, but busybox's getty doesn't translate > \S. > https://github.com/brgl/busybox/blob/abbf17abccbf832365d9acf1c280369ba7d5f8b2/libbb/login.c#L84-L86 > > I'd suggest just dropping the 3.18. Fine with me. > Otherwise, Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 861e302d845b..dd88a1398f2b 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,10 @@ ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf - sed -i -e 's/^Welcome/domU \0/' etc/issue + echo "domU Welcome to Alpine Linux 3.18 +Kernel \r on an \m (\l) + +" > etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 69caabe2d8ed..4db249530823 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,7 +103,10 @@ ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue +echo "domU Welcome to Alpine Linux 3.18 +Kernel \r on an \m (\l) + +" > etc/issue copy_domU_files find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd ..
Upcoming changes won't unpack original rootfs anymore, so sed on existing file cannot be used. Override the whole file instead. No functional change intended. Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> --- automation/scripts/qubes-x86-64.sh | 5 ++++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-)