From 47dd0aa7615d847c06627007873b3d7e09bcd441 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 22 May 2024 08:14:50 -0700
Subject: Disable systemd-firstboot on Cloud images via cmdline (#2282195)

systemd 256 added a new feature which wants to create users on
boot if none exist yet:
https://github.com/systemd/systemd/commit/3ccadbce3358ba1db7ce5fa3f8dd17c627ffd93b
We don't want that, cloud-init handles this situation. So let's
disable it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 teams/cloud/cloud.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'teams/cloud/cloud.xml')

diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml
index c3a9255..aa928dd 100644
--- a/teams/cloud/cloud.xml
+++ b/teams/cloud/cloud.xml
@@ -31,7 +31,7 @@
 	<preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64">
 		<type image="oem" format="vhd-fixed" formatoptions="force_size"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -51,7 +51,7 @@
 	<preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64">
 		<type image="oem"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -71,7 +71,7 @@
 	<preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64">
 		<type image="oem" format="gce"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=ttyS0,38400n8d"
+		      kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -92,7 +92,7 @@
 	<preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64">
 		<type image="oem" format="qcow2"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
 		      rootfs_label="fedora"
@@ -112,7 +112,7 @@
 	<preferences profiles="Cloud-Base-Generic" arch="ppc64le">
 		<type image="oem" format="qcow2"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off"
 		      devicepersistency="by-uuid" target_blocksize="4096"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
 		      rootfs_label="fedora"
@@ -132,7 +132,7 @@
 	<preferences profiles="Cloud-Base-Generic" arch="s390x">
 		<type image="oem" format="qcow2"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1"
-		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev"
+		      kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev systemd.firstboot=off"
 		      devicepersistency="by-uuid" target_blocksize="4096"
 		      bootpartition="true" bootpartsize="1000" bootfilesystem="ext4"
 		      rootfs_label="fedora"
@@ -154,6 +154,7 @@
 		      firmware="uefi" efipartsize="1000"
 		      bootpartition="false"
 		      filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="true"
+		      kernelcmdline="systemd.firstboot=off"
 		      devicepersistency="by-uuid"
 		      rootfs_label="fedora"
 		      initrd_system="none"
-- 
cgit v1.3.1+13