@@ -280,11 +280,11 @@ can_skip_download_binary() {
280
280
fi
281
281
}
282
282
283
- can_skip_download_selinux () {
284
- if [ " ${INSTALL_K3S_SKIP_DOWNLOAD} " != true ] && [ " ${INSTALL_K3S_SKIP_DOWNLOAD} " != selinux ]; then
285
- return 1
286
- fi
287
- }
283
+ can_skip_download_selinux () {
284
+ if [ " ${INSTALL_K3S_SKIP_DOWNLOAD} " != true ] && [ " ${INSTALL_K3S_SKIP_DOWNLOAD} " != selinux ]; then
285
+ return 1
286
+ fi
287
+ }
288
288
289
289
# --- verify an executable k3s binary is installed ---
290
290
verify_k3s_is_executable () {
@@ -385,7 +385,7 @@ get_release_version() {
385
385
get_k3s_selinux_version () {
386
386
available_version=" k3s-selinux-1.2-2.${rpm_target} .noarch.rpm"
387
387
info " Finding available k3s-selinux versions"
388
-
388
+
389
389
# run verify_downloader in case it binary installation was skipped
390
390
verify_downloader curl || verify_downloader wget || fatal ' Can not find curl or wget for downloading files'
391
391
@@ -552,7 +552,7 @@ setup_binary() {
552
552
553
553
# --- setup selinux policy ---
554
554
setup_selinux () {
555
- case ${INSTALL_K3S_CHANNEL} in
555
+ case ${INSTALL_K3S_CHANNEL} in
556
556
* testing)
557
557
rpm_channel=testing
558
558
;;
@@ -614,7 +614,7 @@ setup_selinux() {
614
614
info " Skipping installation of SELinux RPM"
615
615
return
616
616
fi
617
-
617
+
618
618
get_k3s_selinux_version
619
619
install_selinux_rpm ${rpm_site} ${rpm_channel} ${rpm_target} ${rpm_site_infix}
620
620
683
683
if [ " ${rpm_installer} " = " yum" ] && [ -x /usr/bin/dnf ]; then
684
684
rpm_installer=dnf
685
685
fi
686
- if rpm -q --quiet k3s-selinux; then
686
+ if rpm -q --quiet k3s-selinux; then
687
687
# remove k3s-selinux module before upgrade to allow container-selinux to upgrade safely
688
688
if check_available_upgrades container-selinux ${3} && check_available_upgrades k3s-selinux ${3} ; then
689
689
MODULE_PRIORITY=$( $SUDO semodule --list=full | grep k3s | cut -f1 -d" " )
@@ -1150,4 +1150,3 @@ eval set -- $(escape "${INSTALL_K3S_EXEC}") $(quote "$@")
1150
1150
create_service_file
1151
1151
service_enable_and_start
1152
1152
}
1153
-
0 commit comments