diff --git a/installer/disko-config.nix b/installer/disko-config.nix index 7388018..eb183a0 100644 --- a/installer/disko-config.nix +++ b/installer/disko-config.nix @@ -19,6 +19,7 @@ # function arguments are the right shape. { mainDrive , extraDrives ? [] +, ... }: let diff --git a/installer/install.sh b/installer/install.sh index bd54f0a..449472a 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -841,7 +841,7 @@ confirm_form_factor() { if [[ $rc -eq 0 ]]; then FORM_FACTOR="$default" else - if [[ $rc -eq 130 || $rc -eq 1 ]]; then return 130; fi + if [[ $rc -eq 130 ]]; then return 130; fi FORM_FACTOR=$([[ "$default" == "laptop" ]] && echo desktop || echo laptop) fi success "Form factor: $FORM_FACTOR" @@ -875,7 +875,8 @@ configure_impermanence() { ENABLE_IMPERMANENCE="true" success "Impermanence enabled" else - if [[ $rc -eq 130 || $rc -eq 1 ]]; then return 130; fi + if [[ $rc -eq 130 ]]; then return 130; fi + ENABLE_IMPERMANENCE="false" info "Impermanence disabled (traditional persistent root)" fi save_state @@ -1093,7 +1094,7 @@ run_disko_with_retry() { while true; do local rc=0 set +e - disko --mode disko \ + disko --mode destroy,format,mount \ --argstr mainDrive "$main_drive" \ --arg extraDrives "$extras_nix" \ "$disko_file" 2>&1 | tee "$log"