Add 2>dev/null when checking nm-cloud systemd unit

Signed-off-by: Manuel Buil <mbuil@suse.com>
k3s-io · Nov 14, 2023 · a731529 · a731529
1 parent 8f7a8b2
commit a731529
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/install.sh b/install.sh
@@ -904,7 +904,7 @@ TasksMax=infinity
 TimeoutStartSec=0
 Restart=always
 RestartSec=5s
-ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
+ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled nm-cloud-setup.service 2>/dev/null'
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 ExecStart=${BIN_DIR}/k3s \\

diff --git a/install.sh.sha256sum b/install.sh.sha256sum
@@ -1 +1 @@
-8c71108b5602b40ab6a9e60fe66403302b458046cb8afd1980d3c183d25278ac  install.sh
+a5de85c83b3fe8edc883787c3cf26d2b510d70baed75888a5e60df2e0b88f709  install.sh
diff --git a/k3s.service b/k3s.service
@@ -9,7 +9,7 @@ Type=notify
 EnvironmentFile=-/etc/default/%N
 EnvironmentFile=-/etc/sysconfig/%N
 EnvironmentFile=-/etc/systemd/system/k3s.service.env
-ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
+ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled nm-cloud-setup.service 2>/dev/null'
 ExecStart=/usr/local/bin/k3s server
 KillMode=process
 Delegate=yes

diff --git a/package/rpm/install.sh b/package/rpm/install.sh
@@ -690,7 +690,7 @@ TasksMax=infinity
 TimeoutStartSec=0
 Restart=always
 RestartSec=5s
-ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
+ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled nm-cloud-setup.service 2>/dev/null'
 ExecStartPre=-/sbin/modprobe br_netfilter
 ExecStartPre=-/sbin/modprobe overlay
 ExecStart=${BIN_DIR}/k3s ${CMD_K3S} \$${CMD_K3S_ARGS_VAR}