freya/dotfiles-guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix crypt script (matching and passwd chk)

Browse source
This commit is contained in:
Freya Murphy 2023-10-07 15:51:00 -04:00
parent d78d5fe4b3
commit 1c5c24cd96
No known key found for this signature in database
GPG key ID: 988032A5638EE799
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
guix-strap/guix-crypt
View file

@ -10,10 +10,10 @@ PASSWORD_CONFIRM=""
EVENT "Setting up disk encryption with luks" EVENT "Setting up disk encryption with luks"
if [[ $DISK == sd* ]]; then if [[ $DISK == "/dev/sd"* ]]; then
CRYPT_PARTITION="$DISK""2" CRYPT_PARTITION="$DISK""2"
EFI_PARTITION="$DISK""1" EFI_PARTITION="$DISK""1"
elif [[ $DISK == nvme** ]]; then elif [[ $DISK == "/dev/nvme"* ]]; then
CRYPT_PARTITION="$DISK""p2" CRYPT_PARTITION="$DISK""p2"
EFI_PARTITION="$DISK""p1" EFI_PARTITION="$DISK""p1"
else else
@ -24,7 +24,7 @@ fi
get_password() { get_password() {
read -s -p "LUKS password: " PASSWORD read -s -p "LUKS password: " PASSWORD
read -s -p "Confirm password: " PASSWORD_CONFIRM read -s -p "Confirm password: " PASSWORD_CONFIRM
if [ "$PASSWORD" == "$CONFIRM_PASSWORD" ]; then if [ "$PASSWORD" == "$PASSWORD_CONFIRM" ]; then
exit 0 exit 0
else else
ERROR "Passwords do not match" ERROR "Passwords do not match"
@ -39,7 +39,7 @@ EVENT "Setting up luks"
cryptsetup luksFormat --type luks1 "$CRYPT_PARTITION" <<EOF cryptsetup luksFormat --type luks1 "$CRYPT_PARTITION" <<EOF
YES YES
$PASSWORD $PASSWORD
$CONFIRM_PASSWORD $PASSWORD_CONFIRM
EOF EOF
EVENT "Opening cryptroot" EVENT "Opening cryptroot"
@ -58,5 +58,5 @@ mkfs.vfat "-F32" "$EFI_PARTITION"
EVENT "Successfully setup efi vfat and luks" EVENT "Successfully setup efi vfat and luks"
echo "CRYPT_PARTITION=\"$CRYPT_PARTITION\"" > ./guix-env echo "CRYPT_PARTITION=\"$CRYPT_PARTITION\"" >> ./guix-env
echo "EFI_PARTITION=\"$EFI_PARTITION\"" > ./guix-env echo "EFI_PARTITION=\"$EFI_PARTITION\"" >> ./guix-env