File tree Expand file tree Collapse file tree 2 files changed +2
-4
lines changed
Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,6 @@ isNixos=$(if test -f /etc/os-release && grep -Eq 'ID(_LIKE)?="?nixos"?' /etc/os-
77cat << FACTS
88isOs=$( uname)
99isArch=$( uname -m)
10- isKexec=$( if test -f /etc/is_kexec; then echo " y" ; else echo " n" ; fi)
1110isNixos=$isNixos
1211isInstaller=$( if [ " $isNixos " = " y" ] && grep -Eq ' VARIANT_ID="?installer"?' /etc/os-release; then echo " y" ; else echo " n" ; fi)
1312isContainer=$( if [ " $( has systemd-detect-virt) " = " y" ]; then systemd-detect-virt --container; else echo " none" ; fi)
Original file line number Diff line number Diff line change @@ -46,7 +46,6 @@ envPassword=n
4646# Facts set by get-facts.sh
4747isOs=
4848isArch=
49- isKexec=
5049isInstaller=
5150isContainer=
5251hasIpv6Only=
@@ -526,7 +525,7 @@ importFacts() {
526525 # shellcheck disable=SC2046
527526 export $( echo " $filteredFacts " | xargs)
528527
529- for var in isOs isArch isKexec isInstaller isContainer hasIpv6Only hasTar hasCpio hasSudo hasDoas hasWget hasCurl hasSetsid; do
528+ for var in isOs isArch isInstaller isContainer hasIpv6Only hasTar hasCpio hasSudo hasDoas hasWget hasCurl hasSetsid; do
530529 if [[ -z ${! var} ]]; then
531530 abort " Failed to retrieve fact $var from host"
532531 fi
@@ -618,7 +617,7 @@ generateHardwareConfig() {
618617}
619618
620619runKexec () {
621- if [[ ${isKexec} == " y " ]] || [[ ${ isInstaller} == " y" ]]; then
620+ if [[ ${isInstaller} == " y" ]]; then
622621 return
623622 fi
624623
You can’t perform that action at this time.
0 commit comments