PR#624: [f42] Backport composefs and GRUB static migration changes. - workstation-ostree-config

Timothée Ravier • 3 months ago

c124e79

Timothée Ravier • 3 months ago

82b01d5

Timothée Ravier • 3 months ago

b49a695

Timothée Ravier • 3 months ago

2df5b79

bootupd.yaml

file modified

+5 -14

		`@@ -12,22 +12,13 @@`
		`# Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload`
		`/usr/bin/bootupctl backend generate-update-metadata`

		`- # Trigger a bootloader update on boot`
		`- cat > /usr/lib/systemd/system/bootloader-update.service << 'EOF'`
		`- [Unit]`
		`- Description=Update bootloader on boot`
		`- Documentation=https://github.com/coreos/bootupd`
		`-`
		`+ # Enable migration to a static GRUB config`
		`+ install -dm0755 /usr/lib/systemd/system/bootloader-update.service.d`
		`+ cat > /usr/lib/systemd/system/bootloader-update.service.d/migrate-static-grub-config.conf << 'EOF'`
		`[Service]`
		`- Type=oneshot`
		`- ExecStart=/usr/bin/bootupctl update`
		`- RemainAfterExit=yes`
		`- MountFlags=slave`
		`-`
		`- [Install]`
		`- WantedBy=multi-user.target`
		`+ ExecStart=/usr/bin/bootupctl migrate-static-grub-config`
		`EOF`
		`- chmod 644 /usr/lib/systemd/system/bootloader-update.service`
		`+`
		`echo "enable bootloader-update.service" > /usr/lib/systemd/system-preset/81-atomic-desktop.preset`

		`# Turn permissive mode on for bootupd until all SELinux issues are fixed`

common.yaml

file modified

+2 -4

		`@@ -17,6 +17,8 @@`
		`- sysroot-ro.yaml`
		`# Enable kernel-install support`
		`- kernel-install.yaml`
		`+ # Enable composefs`
		`+ - composefs.yaml`

		`arch-include:`
		`x86_64:`
		`@@ -32,7 +34,6 @@`
		`# Manifests included only for the Bootable Container variants`
		`- if: bootable_container == true`
		`include:`
		`- - composefs.yaml`
		`- bootc.yaml`
		`- dnf5.yaml`

		`@@ -45,9 +46,6 @@`
		`- git-core`
		`# Explicitely add Git docs`
		`- git-core-doc`
		`- # Required for compatibility with old bootloaders until we have bootupd`
		`- # See https://github.com/fedora-silverblue/issue-tracker/issues/120`
		`- - ostree-grub2`
		`# Required until we've completed the move to systemd-sysusers`
		`# See: https://github.com/fedora-silverblue/issue-tracker/issues/362`
		`- nss-altfiles`

ostree-classic.yaml

file modified

-5

		`@@ -1,10 +1,5 @@`
		`# Manifest for classic ostree varaints only and not Bootable Containers`

		`- # Packages only included in the legacy ostree variants and not in Bootable`
		`- # Containers`
		`- packages:`
		`- - ostree-grub2`
		`-`
		`# We do not include any version of DNF in the classic ostree Atomic Desktops`
		`# See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora`
		`exclude-packages:`