Use --strict flag in elemental-setup services

The default behavior has been to hide any errors and only log warnings. Using the --strict flag will ensure any yip errors are actually reported. Signed-off-by: Fredrik Lönnegren <fredrik.lonnegren@suse.com>
rancher · Oct 11, 2024 · 432d445 · 432d445
1 parent 0fc05a9
commit 432d445
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service
@@ -5,7 +5,7 @@ Before=getty.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage boot
+ExecStart=/usr/bin/elemental run-stage --strict boot
 
 [Install]
 WantedBy=multi-user.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service
@@ -8,7 +8,7 @@ Before=sysinit.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage fs
+ExecStart=/usr/bin/elemental run-stage --strict fs
 
 [Install]
 WantedBy=sysinit.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service
@@ -10,7 +10,7 @@ RootDirectory=/sysroot
 BindPaths=/proc /sys /dev /run /tmp
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage initramfs
+ExecStart=/usr/bin/elemental run-stage --strict initramfs
 
 [Install]
 WantedBy=initrd.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service
@@ -8,7 +8,7 @@ Nice=19
 IOSchedulingClass=2
 IOSchedulingPriority=7
 Type=oneshot
-ExecStart=/usr/bin/elemental run-stage network
+ExecStart=/usr/bin/elemental run-stage --strict network
 TimeoutStopSec=180
 KillMode=process
 KillSignal=SIGINT

diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service
@@ -11,7 +11,7 @@ Conflicts=initrd-switch-root.target
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage pre-rootfs
+ExecStart=/usr/bin/elemental run-stage --strict pre-rootfs
 
 [Install]
-WantedBy=initrd-root-device.target
+WantedBy=initrd-root-device.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service
@@ -6,7 +6,7 @@ Nice=19
 IOSchedulingClass=2
 IOSchedulingPriority=7
 Type=oneshot
-ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage reconcile"
+ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage --strict reconcile"
 TimeoutStopSec=180
 KillMode=process
 KillSignal=SIGINT

diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service
@@ -10,7 +10,7 @@ Conflicts=initrd-switch-root.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStartPre=/usr/bin/ln -sf -t / /sysroot/system
-ExecStart=/usr/bin/elemental run-stage rootfs
+ExecStart=/usr/bin/elemental run-stage --strict rootfs
 
 [Install]
 WantedBy=initrd-root-fs.target