diff options
Diffstat (limited to 'install.sh')
| -rwxr-xr-x | install.sh | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -70,10 +70,8 @@ drive_bytes=$(blockdev --getsize64 "${drive}") drive_size="$(bc <<< "${drive_bytes} / 1000000000")G" # Get a list of options -[[ $encrypt == true ]] && options+="encrypt " -[[ $arch_support == true ]] && options+="arch_support " -[[ $enable_aur == true ]] && options+="enable_aur " -[[ $autologin == true ]] && options+="autologin " +[[ $encrypt == true ]] && config_options+="encrypt " +[[ $autologin == true ]] && config_options+="autologin " echo " ================ CONFIRM INSTALLATION ================ @@ -82,14 +80,14 @@ BOOT Partition: ${boot}, Size: ${boot_size} ROOT Partition: ${root}, Size: MAX SWAP Size: ${swap_size} ------------------------------------------------------" -if [[ $options != "" ]]; then - echo "Options: ${options} +if [[ $config_options != "" ]]; then + echo "Options: ${config_options} ------------------------------------------------------" fi echo "CAUTION: ALL data from ${drive} will be erased !!! ------------------------------------------------------" -echo "Are you sure you want install?" +echo "Are you sure you want continue?" unset input read -rp "Type YES (in uppercase letters) to begin installation: " input [[ "${input}" != "YES" ]] && exit @@ -128,10 +126,8 @@ if [[ $encrypt == true ]]; then root="/dev/mapper/cryptroot" fi -# Make BOOT filesystem +# Make filesystem mkfs.fat -n BOOT -F 32 "${boot}" - -# Make BTRFS ROOT filesystem mkfs.btrfs -qfL ROOT "${root}" # Mount btrfs ROOT drive |