diff options
| author | Tyler Murphy <tylerm@tylerm.dev> | 2023-10-07 15:51:00 -0400 |
|---|---|---|
| committer | Tyler Murphy <tylerm@tylerm.dev> | 2023-10-07 15:51:00 -0400 |
| commit | 1c5c24cd9697e94a8d1c5eb9189e3ac96693051c (patch) | |
| tree | b4d479c0f85096b73f71a3816c81da625378d8d4 | |
| parent | fix schbang (diff) | |
| download | dotfiles-guix-1c5c24cd9697e94a8d1c5eb9189e3ac96693051c.tar.gz dotfiles-guix-1c5c24cd9697e94a8d1c5eb9189e3ac96693051c.tar.bz2 dotfiles-guix-1c5c24cd9697e94a8d1c5eb9189e3ac96693051c.zip | |
fix crypt script (matching and passwd chk)
| -rwxr-xr-x | guix-strap/guix-crypt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/guix-strap/guix-crypt b/guix-strap/guix-crypt index 1f17099..24f6492 100755 --- a/guix-strap/guix-crypt +++ b/guix-strap/guix-crypt @@ -10,10 +10,10 @@ PASSWORD_CONFIRM="" EVENT "Setting up disk encryption with luks" -if [[ $DISK == sd* ]]; then +if [[ $DISK == "/dev/sd"* ]]; then CRYPT_PARTITION="$DISK""2" EFI_PARTITION="$DISK""1" -elif [[ $DISK == nvme** ]]; then +elif [[ $DISK == "/dev/nvme"* ]]; then CRYPT_PARTITION="$DISK""p2" EFI_PARTITION="$DISK""p1" else @@ -24,7 +24,7 @@ fi get_password() { read -s -p "LUKS password: " PASSWORD read -s -p "Confirm password: " PASSWORD_CONFIRM - if [ "$PASSWORD" == "$CONFIRM_PASSWORD" ]; then + if [ "$PASSWORD" == "$PASSWORD_CONFIRM" ]; then exit 0 else ERROR "Passwords do not match" @@ -39,7 +39,7 @@ EVENT "Setting up luks" cryptsetup luksFormat --type luks1 "$CRYPT_PARTITION" <<EOF YES $PASSWORD -$CONFIRM_PASSWORD +$PASSWORD_CONFIRM EOF EVENT "Opening cryptroot" @@ -58,5 +58,5 @@ mkfs.vfat "-F32" "$EFI_PARTITION" EVENT "Successfully setup efi vfat and luks" -echo "CRYPT_PARTITION=\"$CRYPT_PARTITION\"" > ./guix-env -echo "EFI_PARTITION=\"$EFI_PARTITION\"" > ./guix-env +echo "CRYPT_PARTITION=\"$CRYPT_PARTITION\"" >> ./guix-env +echo "EFI_PARTITION=\"$EFI_PARTITION\"" >> ./guix-env |