From 30449e01281f6067b9a34c1564519319c5315102 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 13 Nov 2023 12:40:47 +0100 Subject: [PATCH] Add 2>dev/null when checking nm-cloud systemd unit Signed-off-by: Manuel Buil --- install.sh | 2 +- install.sh.sha256sum | 2 +- k3s.service | 2 +- package/rpm/install.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 15a1ce8fbf..da42ad57b2 100644 --- a/install.sh +++ b/install.sh @@ -905,7 +905,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 --quiet 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 index 1c595068d9..a7962553c2 100644 --- a/install.sh.sha256sum +++ b/install.sh.sha256sum @@ -1 +1 @@ -5f785120f00ef4b0aba205161232d2a04b6e7a75332cae7059fcc1f517340777 install.sh +65c1abf5e125fc4e7b92953d07ceaf15859c315a450f919d131e66d519fe4dfb install.sh diff --git a/k3s.service b/k3s.service index 7f8c9ec89c..70ce10c1aa 100644 --- 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 --quiet 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 index f53b6c142f..ebeee5412f 100755 --- 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 --quiet 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}