Accepting request 1175752 from devel:microos:aeon:images

- Remove unused disk.sh (no systemd-boot on installer)
- Remove growfs from initrd
- Remove ro mount option as can cause racy mount behaviour on boot

OBS-URL: https://build.opensuse.org/request/show/1175752
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openSUSE-Aeon?expand=0&rev=5
This commit is contained in:
Ana Guerrero 2024-05-22 19:32:15 +00:00 committed by Git OBS Bridge
commit 059791a520
3 changed files with 9 additions and 24 deletions

View File

@ -100,15 +100,12 @@ set -eux
/usr/sbin/setup-fstab-for-overlayfs /usr/sbin/setup-fstab-for-overlayfs
# ... set options for autoexpanding /home # ... set options for autoexpanding /home
gawk -i inplace '$2 == "/home" { $4 = $4",x-systemd.growfs" } { print $0 }' /etc/fstab gawk -i inplace '$2 == "/home" { $4 = $4",x-systemd.growfs" } { print $0 }' /etc/fstab
# workaround https://github.com/systemd/systemd/issues/927, drop the ro from the fstab mount
gawk -i inplace '$2 == "/" && $4 == "compress=zstd:1,ro" { $4 = "compress=zstd:1" } { print $0 }' /etc/fstab
EOF EOF
chmod a+x /etc/fstab.script chmod a+x /etc/fstab.script
# To make x-systemd.growfs work from inside the initrd
cat >/etc/dracut.conf.d/50-microos-growfs.conf <<"EOF"
install_items+=" /usr/lib/systemd/systemd-growfs "
EOF
#====================================== #======================================
# Enable NetworkManager # Enable NetworkManager
#-------------------------------------- #--------------------------------------

19
disk.sh
View File

@ -1,19 +0,0 @@
#!/bin/bash
set -euxo pipefail
[ -x /usr/bin/sdbootutil ] || exit 0
echo "#######DISK"
rootuuid=$(findmnt / -n --output uuid)
sed -i -e "s,\$, root=UUID=$rootuuid," /etc/kernel/cmdline
arch="$(uname -m)"
case "$arch" in
x86_64) arch=x64 ;;
*) echo "Unsupported arch for Aeon - $arch"; exit 1 ;;
esac
echo "install boot loader"
sdbootutil -v --no-random-seed --arch "$arch" --esp-path /boot/efi --entry-token=auto --no-variables install
echo "add kernels"
export hostonly_l=no # for dracut
sdbootutil -v --arch "$arch" --esp-path /boot/efi --entry-token=auto add-all-kernels
echo "##### AFTER ####"
rm -f /boot/mbrid
find /boot

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 22 11:07:36 UTC 2024 - Richard Brown <rbrown@suse.com>
- Remove unused disk.sh (no systemd-boot on installer)
- Remove growfs from initrd
- Remove ro mount option as can cause racy mount behaviour on boot
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 16 13:16:58 UTC 2024 - Richard Brown <rbrown@suse.com> Thu May 16 13:16:58 UTC 2024 - Richard Brown <rbrown@suse.com>