Skip to content

K
k3s
Commit 30449e01 authored by Manuel Buil's avatar Manuel Buil
Browse files
Options

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

Signed-off-by: 's avatarManuel Buil <mbuil@suse.com>
parent 0ad5d65a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
install.sh
View file @ 30449e01
...@@ -905,7 +905,7 @@ TasksMax=infinity ...@@ -905,7 +905,7 @@ TasksMax=infinity
TimeoutStartSec=0 TimeoutStartSec=0
Restart=always Restart=always
RestartSec=5s 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 br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=${BIN_DIR}/k3s \\ ExecStart=${BIN_DIR}/k3s \\
......
install.sh.sha256sum
View file @ 30449e01
5f785120f00ef4b0aba205161232d2a04b6e7a75332cae7059fcc1f517340777 install.sh 65c1abf5e125fc4e7b92953d07ceaf15859c315a450f919d131e66d519fe4dfb install.sh
k3s.service
View file @ 30449e01
...@@ -9,7 +9,7 @@ Type=notify ...@@ -9,7 +9,7 @@ Type=notify
EnvironmentFile=-/etc/default/%N EnvironmentFile=-/etc/default/%N
EnvironmentFile=-/etc/sysconfig/%N EnvironmentFile=-/etc/sysconfig/%N
EnvironmentFile=-/etc/systemd/system/k3s.service.env 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 ExecStart=/usr/local/bin/k3s server
KillMode=process KillMode=process
Delegate=yes Delegate=yes
......
package/rpm/install.sh
View file @ 30449e01
...@@ -690,7 +690,7 @@ TasksMax=infinity ...@@ -690,7 +690,7 @@ TasksMax=infinity
TimeoutStartSec=0 TimeoutStartSec=0
Restart=always Restart=always
RestartSec=5s 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 br_netfilter
ExecStartPre=-/sbin/modprobe overlay ExecStartPre=-/sbin/modprobe overlay
ExecStart=${BIN_DIR}/k3s ${CMD_K3S} \$${CMD_K3S_ARGS_VAR} ExecStart=${BIN_DIR}/k3s ${CMD_K3S} \$${CMD_K3S_ARGS_VAR}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment