Tomster/Arch-Setup-Script
1
0
Fork 0
mirror of https://github.com/tommytran732/Arch-Setup-Script synced 2024-11-21 17:11:34 -05:00
Code

Rename luks_password to luks_passphrase

Browse Source
This commit is contained in:
Tommy 2024-10-25 00:35:02 -07:00 committed by GitHub
parent 013417d7f4
commit 15a1502a64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
install.sh
View File

@ -65,21 +65,21 @@ luks_prompt(){
fi fi
} }
luks_password_prompt () { luks_passphrase_prompt () {
if [ "${use_luks}" = '1' ]; then if [ "${use_luks}" = '1' ]; then
output 'Enter your encryption password (the password will not be shown on the screen):' output 'Enter your encryption passphrase (the password will not be shown on the screen):'
read -r -s luks_password read -r -s luks_passphrase
if [ -z "${luks_password}" ]; then if [ -z "${luks_passphrase}" ]; then
output 'You need to enter a password.' output 'You need to enter a passphrase.'
luks_password_prompt luks_passphrase_prompt
fi fi
output 'Confirm your encryption password (the password will not be shown on the screen):' output 'Confirm your encryption passphrase (the passphrase will not be shown on the screen):'
read -r -s luks_password2 read -r -s luks_passphrase2
if [ "${luks_password}" != "${luks_password2}" ]; then if [ "${luks_passphrase}" != "${luks_passphrase2}" ]; then
output 'Passwords do not match, please try again.' output 'Passphrases do not match, please try again.'
luks_password_prompt luks_passphrase_prompt
fi fi
fi fi
} }
@ -176,7 +176,7 @@ clear
# Initial prompts # Initial prompts
install_mode_selector install_mode_selector
luks_prompt luks_prompt
luks_password_prompt luks_passphrase_prompt
disk_prompt disk_prompt
username_prompt username_prompt
fullname_prompt fullname_prompt
@ -218,8 +218,8 @@ mkfs.fat -F 32 -s 2 "${ESP}"
## Creating a LUKS Container for the root partition. ## Creating a LUKS Container for the root partition.
if [ "${use_luks}" = '1' ]; then if [ "${use_luks}" = '1' ]; then
output 'Creating LUKS Container for the root partition.' output 'Creating LUKS Container for the root partition.'
echo -n "${luks_password}" | cryptsetup luksFormat --pbkdf pbkdf2 "${cryptroot}" -d - echo -n "${luks_passphrase}" | cryptsetup luksFormat --pbkdf pbkdf2 "${cryptroot}" -d -
echo -n "${luks_password}" | cryptsetup open "${cryptroot}" cryptroot -d - echo -n "${luks_passphrase}" | cryptsetup open "${cryptroot}" cryptroot -d -
BTRFS='/dev/mapper/cryptroot' BTRFS='/dev/mapper/cryptroot'
else else
BTRFS='/dev/disk/by-partlabel/rootfs' BTRFS='/dev/disk/by-partlabel/rootfs'
@ -443,7 +443,7 @@ fi
if [ "${use_luks}" = '1' ]; then if [ "${use_luks}" = '1' ]; then
dd bs=512 count=4 if=/dev/random of=/mnt/cryptkey/.root.key iflag=fullblock dd bs=512 count=4 if=/dev/random of=/mnt/cryptkey/.root.key iflag=fullblock
chmod 000 /mnt/cryptkey/.root.key chmod 000 /mnt/cryptkey/.root.key
echo -n "${luks_password}" | cryptsetup luksAddKey /dev/disk/by-partlabel/rootfs /mnt/cryptkey/.root.key -d - echo -n "${luks_passphrase}" | cryptsetup luksAddKey /dev/disk/by-partlabel/rootfs /mnt/cryptkey/.root.key -d -
sed -i 's#FILES=()#FILES=(/cryptkey/.root.key)#g' /mnt/etc/mkinitcpio.conf sed -i 's#FILES=()#FILES=(/cryptkey/.root.key)#g' /mnt/etc/mkinitcpio.conf
sed -i "s#module\.sig_enforce=1#module.sig_enforce=1 rd.luks.key=/cryptkey/.root.key#g" /mnt/etc/default/grub sed -i "s#module\.sig_enforce=1#module.sig_enforce=1 rd.luks.key=/cryptkey/.root.key#g" /mnt/etc/default/grub
fi fi