Capture all fedora atomic variants in install script (#11170)

* Capture all fedora atomic variants in install script Signed-off-by: Derek Nola <[email protected]> * Cover bluefin and other "fedora-like" OS as well Signed-off-by: Derek Nola <[email protected]>
k3s-io · Oct 31, 2024 · 4f714d3 · 4f714d3
1 parent a39e191
commit 4f714d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/install.sh b/install.sh
@@ -579,7 +579,8 @@ setup_selinux() {
             rpm_site_infix=slemicro
             package_installer=zypper
         fi
-    elif [ "${ID_LIKE:-}" = coreos ] || [ "${VARIANT_ID:-}" = coreos ] || [ "${VARIANT_ID:-}" = "iot" ]; then
+    elif [ "${ID_LIKE:-}" = coreos ] || [ "${VARIANT_ID:-}" = coreos ] || [ "${VARIANT_ID:-}" = "iot" ] || \
+         { { [ "${ID:-}" = fedora ] || [ "${ID_LIKE:-}" = fedora ]; } && [ -n "${OSTREE_VERSION:-}" ]; }; then
         rpm_target=coreos
         rpm_site_infix=coreos
         package_installer=rpm-ostree
@@ -629,7 +630,8 @@ setup_selinux() {
             $policy_error "Failed to apply container_runtime_exec_t to ${BIN_DIR}/k3s, ${policy_hint}"
         fi
     elif [ ! -f /usr/share/selinux/packages/k3s.pp ]; then
-        if [ -x /usr/sbin/transactional-update ] || [ "${ID_LIKE:-}" = coreos ] || [ "${VARIANT_ID:-}" = coreos ] || [ "${VARIANT_ID:-}" = iot ]; then
+        if [ -x /usr/sbin/transactional-update ] || [ "${ID_LIKE:-}" = coreos ] || \
+            { { [ "${ID:-}" = fedora ] || [ "${ID_LIKE:-}" = fedora ]; } && [ -n "${OSTREE_VERSION:-}" ]; }; then
             warn "Please reboot your machine to activate the changes and avoid data loss."
         else
             $policy_error "Failed to find the k3s-selinux policy, ${policy_hint}"

diff --git a/install.sh.sha256sum b/install.sh.sha256sum
@@ -1 +1 @@
-e0fbc48a74045ae279bde25bf6ac5502b256017d4d648b53750050993d4b71e6  install.sh
+afacec791f66d92cec11880479c42b9e261912e0d97d3e3a3de21315b6ac49f3  install.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e0fbc48a74045ae279bde25bf6ac5502b256017d4d648b53750050993d4b71e6 install.sh
		afacec791f66d92cec11880479c42b9e261912e0d97d3e3a3de21315b6ac49f3 install.sh