Fail to start k3s if nm-cloud-setup is enabled

Signed-off-by: Manuel Buil <[email protected]>
rowanthorpe · Jun 17, 2021 · a629db0 · a629db0
1 parent b74c499
commit a629db0
Show file tree

Hide file tree

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

diff --git a/k3s.service b/k3s.service
@@ -9,6 +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'
 ExecStart=/usr/local/bin/k3s server
 KillMode=process
 Delegate=yes

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