diff --git a/install.sh b/install.sh index b08e6054a4ea..df20ce4e117a 100755 --- a/install.sh +++ b/install.sh @@ -280,11 +280,11 @@ can_skip_download_binary() { fi } -can_skip_download_selinux() { - if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != selinux ]; then - return 1 - fi -} +can_skip_download_selinux() { + if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != selinux ]; then + return 1 + fi +} # --- verify an executable k3s binary is installed --- verify_k3s_is_executable() { @@ -385,7 +385,7 @@ get_release_version() { get_k3s_selinux_version() { available_version="k3s-selinux-1.2-2.${rpm_target}.noarch.rpm" info "Finding available k3s-selinux versions" - + # run verify_downloader in case it binary installation was skipped verify_downloader curl || verify_downloader wget || fatal 'Can not find curl or wget for downloading files' @@ -552,7 +552,7 @@ setup_binary() { # --- setup selinux policy --- setup_selinux() { - case ${INSTALL_K3S_CHANNEL} in + case ${INSTALL_K3S_CHANNEL} in *testing) rpm_channel=testing ;; @@ -614,7 +614,7 @@ setup_selinux() { info "Skipping installation of SELinux RPM" return fi - + get_k3s_selinux_version install_selinux_rpm ${rpm_site} ${rpm_channel} ${rpm_target} ${rpm_site_infix} @@ -683,7 +683,7 @@ EOF if [ "${rpm_installer}" = "yum" ] && [ -x /usr/bin/dnf ]; then rpm_installer=dnf fi - if rpm -q --quiet k3s-selinux; then + if rpm -q --quiet k3s-selinux; then # remove k3s-selinux module before upgrade to allow container-selinux to upgrade safely if check_available_upgrades container-selinux ${3} && check_available_upgrades k3s-selinux ${3}; then MODULE_PRIORITY=$($SUDO semodule --list=full | grep k3s | cut -f1 -d" ") @@ -1150,4 +1150,3 @@ eval set -- $(escape "${INSTALL_K3S_EXEC}") $(quote "$@") create_service_file service_enable_and_start } - diff --git a/install.sh.sha256sum b/install.sh.sha256sum index 237fa59e599b..a6c5e68b4773 100644 --- a/install.sh.sha256sum +++ b/install.sh.sha256sum @@ -1 +1 @@ -f60c3d8940dfc896f7d83aaf57726c91cf21afc4bca40036472df108d9700b4b install.sh +e0fbc48a74045ae279bde25bf6ac5502b256017d4d648b53750050993d4b71e6 install.sh