Fix K3S_DATA_DIR when running as non-root user (#11378)

When running the generated kill and uninstall scripts, the environment variable `K3S_DATA_DIR` got lost, because `sudo` by default doesn't preserve the environment. This is fixed by adding the `--preserve-env` flag. Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>

Fix K3S_DATA_DIR when running as non-root user (#11378)
dde2fef0 · Reinhard Nägele · GitHub · 0144d9b7 · dde2fef0 · dde2fef0
Unverified Commit dde2fef0 authored Jan 10, 2025 by Reinhard Nägele Committed by GitHub Jan 10, 2025
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

install.sh install.sh +2 -2

install.sh.sha256sum install.sh.sha256sum +1 -1

No files found.
--- a/install.sh
+++ b/install.sh
@@ -775,7 +775,7 @@ create_killall() {
    info "Creating killall script ${KILLALL_K3S_SH}"
    $SUDO tee ${KILLALL_K3S_SH} >/dev/null << \EOF
 #!/bin/sh
-[ $(id -u) -eq 0 ] || exec sudo $0 $@
+[ $(id -u) -eq 0 ] || exec sudo --preserve-env=K3S_DATA_DIR $0 $@
 K3S_DATA_DIR=${K3S_DATA_DIR:-/var/lib/rancher/k3s}
@@ -877,7 +877,7 @@ create_uninstall() {
    $SUDO tee ${UNINSTALL_K3S_SH} >/dev/null << EOF
 #!/bin/sh
 set -x
-[ \$(id -u) -eq 0 ] || exec sudo \$0 \$@
+[ \$(id -u) -eq 0 ] || exec sudo --preserve-env=K3S_DATA_DIR \$0 \$@
 K3S_DATA_DIR=\${K3S_DATA_DIR:-/var/lib/rancher/k3s}

--- a/install.sh.sha256sum
+++ b/install.sh.sha256sum
-d75e014f2d2ab5d30a318efa5c326f3b0b7596f194afcff90fa7a7a91166d5f7  install.sh
+73ca045f12174c87138d59dd14b23b8ab70d96c9eaead63104109d330daa8a6a  install.sh