|
|
|
@ -10,20 +10,6 @@ umount_partitions() {
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Revised to deal with partion sizes now being displayed to the user
|
|
|
|
|
confirm_mount() {
|
|
|
|
|
if [[ $(mount | grep $1) ]]; then
|
|
|
|
|
DIALOG " $_MntStatusTitle " --infobox "$_MntStatusSucc" 0 0
|
|
|
|
|
sleep 2
|
|
|
|
|
PARTITIONS=$(echo $PARTITIONS | sed "s~${PARTITION} [0-9]*[G-M]~~" | sed "s~${PARTITION} [0-9]*\.[0-9]*[G-M]~~" | sed s~${PARTITION}$' -'~~)
|
|
|
|
|
NUMBER_PARTITIONS=$(( NUMBER_PARTITIONS - 1 ))
|
|
|
|
|
else
|
|
|
|
|
DIALOG " $_MntStatusTitle " --infobox "$_MntStatusFail" 0 0
|
|
|
|
|
sleep 2
|
|
|
|
|
prep_menu
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# This function does not assume that the formatted device is the Root installation device as
|
|
|
|
|
# more than one device may be formatted. Root is set in the mount_partitions function.
|
|
|
|
|
select_device() {
|
|
|
|
@ -38,92 +24,31 @@ select_device() {
|
|
|
|
|
DEVICE=$(cat ${ANSWER})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
## List partitions to be hidden from the mounting menu
|
|
|
|
|
list_mounted()
|
|
|
|
|
{
|
|
|
|
|
lsblk -l | awk '$7 ~ /mnt/ {print $1}' > /tmp/.mounted
|
|
|
|
|
echo /dev/* /dev/mapper/* | xargs -n1 | grep -f /tmp/.mounted
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list_containing_crypt()
|
|
|
|
|
{
|
|
|
|
|
blkid | awk '/TYPE="crypto_LUKS"/{print $1}' | sed 's/.$//'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# delete partition in list $PARTITIONS
|
|
|
|
|
# param : partition to delete
|
|
|
|
|
delete_partition_in_list() {
|
|
|
|
|
[ -z "$1" ] && return 127
|
|
|
|
|
local parts=($PARTITIONS)
|
|
|
|
|
for i in ${!parts[@]}; do
|
|
|
|
|
(( $i % 2 == 0 )) || continue
|
|
|
|
|
if [[ "${parts[i]}" = "$1" ]]; then
|
|
|
|
|
local j=$((i+1))
|
|
|
|
|
unset parts[$j]
|
|
|
|
|
unset parts[$i]
|
|
|
|
|
check_for_error "in partitions delete item $1 no: $i / $j"
|
|
|
|
|
PARTITIONS="${parts[*]}"
|
|
|
|
|
check_for_error "partitions: $PARTITIONS"
|
|
|
|
|
NUMBER_PARTITIONS=$(( "${#parts[*]}" / 2 ))
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Finds all available partitions according to type(s) specified and generates a list
|
|
|
|
|
# of them. This also includes partitions on different devices.
|
|
|
|
|
find_partitions() {
|
|
|
|
|
PARTITIONS=""
|
|
|
|
|
NUMBER_PARTITIONS=0
|
|
|
|
|
partition_list=$(lsblk -lno NAME,SIZE,TYPE | grep $INCLUDE_PART | sed 's/part$/\/dev\//g' | sed 's/lvm$\|crypt$/\/dev\/mapper\//g' | \
|
|
|
|
|
awk '{print $3$1 " " $2}' | awk '!/mapper/{a[++i]=$0;next}1;END{while(x<length(a))print a[++x]}')
|
|
|
|
|
|
|
|
|
|
for i in ${partition_list}; do
|
|
|
|
|
PARTITIONS="${PARTITIONS} ${i}"
|
|
|
|
|
NUMBER_PARTITIONS=$(( NUMBER_PARTITIONS + 1 ))
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Double-partitions will be counted due to counting sizes, so fix
|
|
|
|
|
NUMBER_PARTITIONS=$(( NUMBER_PARTITIONS / 2 ))
|
|
|
|
|
|
|
|
|
|
check_for_error "--------- [lsblk] ------------"
|
|
|
|
|
local parts=($PARTITIONS)
|
|
|
|
|
for i in ${!parts[@]}; do
|
|
|
|
|
(( $i % 2 == 0 )) || continue
|
|
|
|
|
local j=$((i+1))
|
|
|
|
|
check_for_error "${parts[i]} ${parts[j]}"
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
#for test delete /dev:sda8
|
|
|
|
|
#delete_partition_in_list "/dev/sda8"
|
|
|
|
|
create_partitions() {
|
|
|
|
|
# Partitioning Menu
|
|
|
|
|
DIALOG " $_PrepPartDisk " --menu "$_PartToolBody" 0 0 7 \
|
|
|
|
|
"$_PartOptWipe" "BIOS & UEFI" \
|
|
|
|
|
"$_PartOptAuto" "BIOS & UEFI" \
|
|
|
|
|
"cfdisk" "BIOS" \
|
|
|
|
|
"cgdisk" "UEFI" \
|
|
|
|
|
"fdisk" "BIOS & UEFI" \
|
|
|
|
|
"gdisk" "UEFI" \
|
|
|
|
|
"parted" "BIOS & UEFI" 2>${ANSWER}
|
|
|
|
|
|
|
|
|
|
# Deal with partitioning schemes appropriate to mounting, lvm, and/or luks.
|
|
|
|
|
case $INCLUDE_PART in
|
|
|
|
|
'part\|lvm\|crypt')
|
|
|
|
|
# Deal with incorrect partitioning for main mounting function
|
|
|
|
|
if ([[ $SYSTEM == "UEFI" ]] && [[ $NUMBER_PARTITIONS -lt 2 ]]) || ([[ $SYSTEM == "BIOS" ]] && [[ $NUMBER_PARTITIONS -eq 0 ]]); then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_PartErrBody" 0 0
|
|
|
|
|
create_partitions
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
'part\|crypt')
|
|
|
|
|
# Ensure there is at least one partition for LVM
|
|
|
|
|
if [[ $NUMBER_PARTITIONS -eq 0 ]]; then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_LvmPartErrBody" 0 0
|
|
|
|
|
create_partitions
|
|
|
|
|
clear
|
|
|
|
|
# If something selected
|
|
|
|
|
if [[ $(cat ${ANSWER}) != "" ]]; then
|
|
|
|
|
if ([[ $(cat ${ANSWER}) != "$_PartOptWipe" ]] && [[ $(cat ${ANSWER}) != "$_PartOptAuto" ]]); then
|
|
|
|
|
$(cat ${ANSWER}) ${DEVICE}
|
|
|
|
|
else
|
|
|
|
|
[[ $(cat ${ANSWER}) == "$_PartOptWipe" ]] && secure_wipe && create_partitions
|
|
|
|
|
[[ $(cat ${ANSWER}) == "$_PartOptAuto" ]] && auto_partition
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
'part\|lvm') # Ensure there are at least two partitions for LUKS
|
|
|
|
|
if [[ $NUMBER_PARTITIONS -lt 2 ]]; then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_LuksPartErrBody" 0 0
|
|
|
|
|
create_partitions
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
prep_menu
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
create_partitions() {
|
|
|
|
|
# Securely destroy all data on a given device.
|
|
|
|
|
secure_wipe() {
|
|
|
|
|
# Warn the user. If they proceed, wipe the selected device.
|
|
|
|
@ -194,29 +119,101 @@ create_partitions() {
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Partitioning Menu
|
|
|
|
|
DIALOG " $_PrepPartDisk " --menu "$_PartToolBody" 0 0 7 \
|
|
|
|
|
"$_PartOptWipe" "BIOS & UEFI" \
|
|
|
|
|
"$_PartOptAuto" "BIOS & UEFI" \
|
|
|
|
|
"cfdisk" "BIOS" \
|
|
|
|
|
"cgdisk" "UEFI" \
|
|
|
|
|
"fdisk" "BIOS & UEFI" \
|
|
|
|
|
"gdisk" "UEFI" \
|
|
|
|
|
"parted" "BIOS & UEFI" 2>${ANSWER}
|
|
|
|
|
# Finds all available partitions according to type(s) specified and generates a list
|
|
|
|
|
# of them. This also includes partitions on different devices.
|
|
|
|
|
find_partitions() {
|
|
|
|
|
PARTITIONS=""
|
|
|
|
|
NUMBER_PARTITIONS=0
|
|
|
|
|
partition_list=$(lsblk -lno NAME,SIZE,TYPE | grep $INCLUDE_PART | sed 's/part$/\/dev\//g' | sed 's/lvm$\|crypt$/\/dev\/mapper\//g' | \
|
|
|
|
|
awk '{print $3$1 " " $2}' | awk '!/mapper/{a[++i]=$0;next}1;END{while(x<length(a))print a[++x]}')
|
|
|
|
|
|
|
|
|
|
clear
|
|
|
|
|
# If something selected
|
|
|
|
|
if [[ $(cat ${ANSWER}) != "" ]]; then
|
|
|
|
|
if ([[ $(cat ${ANSWER}) != "$_PartOptWipe" ]] && [[ $(cat ${ANSWER}) != "$_PartOptAuto" ]]); then
|
|
|
|
|
$(cat ${ANSWER}) ${DEVICE}
|
|
|
|
|
else
|
|
|
|
|
[[ $(cat ${ANSWER}) == "$_PartOptWipe" ]] && secure_wipe && create_partitions
|
|
|
|
|
[[ $(cat ${ANSWER}) == "$_PartOptAuto" ]] && auto_partition
|
|
|
|
|
for i in ${partition_list}; do
|
|
|
|
|
PARTITIONS="${PARTITIONS} ${i}"
|
|
|
|
|
NUMBER_PARTITIONS=$(( NUMBER_PARTITIONS + 1 ))
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Double-partitions will be counted due to counting sizes, so fix
|
|
|
|
|
NUMBER_PARTITIONS=$(( NUMBER_PARTITIONS / 2 ))
|
|
|
|
|
|
|
|
|
|
check_for_error "--------- [lsblk] ------------"
|
|
|
|
|
local parts=($PARTITIONS)
|
|
|
|
|
for i in ${!parts[@]}; do
|
|
|
|
|
(( $i % 2 == 0 )) || continue
|
|
|
|
|
local j=$((i+1))
|
|
|
|
|
check_for_error "${parts[i]} ${parts[j]}"
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
#for test delete /dev:sda8
|
|
|
|
|
#delete_partition_in_list "/dev/sda8"
|
|
|
|
|
|
|
|
|
|
# Deal with partitioning schemes appropriate to mounting, lvm, and/or luks.
|
|
|
|
|
case $INCLUDE_PART in
|
|
|
|
|
'part\|lvm\|crypt')
|
|
|
|
|
# Deal with incorrect partitioning for main mounting function
|
|
|
|
|
if ([[ $SYSTEM == "UEFI" ]] && [[ $NUMBER_PARTITIONS -lt 2 ]]) || ([[ $SYSTEM == "BIOS" ]] && [[ $NUMBER_PARTITIONS -eq 0 ]]); then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_PartErrBody" 0 0
|
|
|
|
|
create_partitions
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
'part\|crypt')
|
|
|
|
|
# Ensure there is at least one partition for LVM
|
|
|
|
|
if [[ $NUMBER_PARTITIONS -eq 0 ]]; then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_LvmPartErrBody" 0 0
|
|
|
|
|
create_partitions
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
'part\|lvm') # Ensure there are at least two partitions for LUKS
|
|
|
|
|
if [[ $NUMBER_PARTITIONS -lt 2 ]]; then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_LuksPartErrBody" 0 0
|
|
|
|
|
create_partitions
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prep_menu
|
|
|
|
|
## List partitions to be hidden from the mounting menu
|
|
|
|
|
list_mounted() {
|
|
|
|
|
lsblk -l | awk '$7 ~ /mnt/ {print $1}' > /tmp/.mounted
|
|
|
|
|
echo /dev/* /dev/mapper/* | xargs -n1 | grep -f /tmp/.mounted
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list_containing_crypt() {
|
|
|
|
|
blkid | awk '/TYPE="crypto_LUKS"/{print $1}' | sed 's/.$//'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# delete partition in list $PARTITIONS
|
|
|
|
|
# param: partition to delete
|
|
|
|
|
delete_partition_in_list() {
|
|
|
|
|
[ -z "$1" ] && return 127
|
|
|
|
|
local parts=($PARTITIONS)
|
|
|
|
|
for i in ${!parts[@]}; do
|
|
|
|
|
(( $i % 2 == 0 )) || continue
|
|
|
|
|
if [[ "${parts[i]}" = "$1" ]]; then
|
|
|
|
|
local j=$((i+1))
|
|
|
|
|
unset parts[$j]
|
|
|
|
|
unset parts[$i]
|
|
|
|
|
check_for_error "in partitions delete item $1 no: $i / $j"
|
|
|
|
|
PARTITIONS="${parts[*]}"
|
|
|
|
|
check_for_error "partitions: $PARTITIONS"
|
|
|
|
|
NUMBER_PARTITIONS=$(( "${#parts[*]}" / 2 ))
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Revised to deal with partion sizes now being displayed to the user
|
|
|
|
|
confirm_mount() {
|
|
|
|
|
if [[ $(mount | grep $1) ]]; then
|
|
|
|
|
DIALOG " $_MntStatusTitle " --infobox "$_MntStatusSucc" 0 0
|
|
|
|
|
sleep 2
|
|
|
|
|
PARTITIONS=$(echo $PARTITIONS | sed "s~${PARTITION} [0-9]*[G-M]~~" | sed "s~${PARTITION} [0-9]*\.[0-9]*[G-M]~~" | sed s~${PARTITION}$' -'~~)
|
|
|
|
|
NUMBER_PARTITIONS=$(( NUMBER_PARTITIONS - 1 ))
|
|
|
|
|
else
|
|
|
|
|
DIALOG " $_MntStatusTitle " --infobox "$_MntStatusFail" 0 0
|
|
|
|
|
sleep 2
|
|
|
|
|
prep_menu
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Set static list of filesystems rather than on-the-fly. Partially as most require additional flags, and
|
|
|
|
@ -300,7 +297,6 @@ select_filesystem() {
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mount_partitions() {
|
|
|
|
|
# This subfunction allows for special mounting options to be applied for relevant fs's.
|
|
|
|
|
# Seperate subfunction for neatness.
|
|
|
|
|
mount_opts() {
|
|
|
|
@ -449,129 +445,30 @@ mount_partitions() {
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Warn users that they CAN mount partitions without formatting them!
|
|
|
|
|
DIALOG " $_PrepMntPart " --msgbox "$_WarnMount1 '$_FSSkip' $_WarnMount2" 0 0
|
|
|
|
|
# Had to write it in this way due to (bash?) bug(?), as if/then statements in a single
|
|
|
|
|
# "create LUKS" function for default and "advanced" modes were interpreted as commands,
|
|
|
|
|
# not mere string statements. Not happy with it, but it works...
|
|
|
|
|
luks_password() {
|
|
|
|
|
DIALOG " $_PrepLUKS " --clear --insecure --passwordbox "$_LuksPassBody" 0 0 2> ${ANSWER} || prep_menu
|
|
|
|
|
PASSWD=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
# LVM Detection. If detected, activate.
|
|
|
|
|
lvm_detect
|
|
|
|
|
DIALOG " $_PrepLUKS " --clear --insecure --passwordbox "$_PassReEntBody" 0 0 2> ${ANSWER} || prep_menu
|
|
|
|
|
PASSWD2=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
# Ensure partitions are unmounted (i.e. where mounted previously), and then list available partitions
|
|
|
|
|
INCLUDE_PART='part\|lvm\|crypt'
|
|
|
|
|
if [[ $PASSWD != $PASSWD2 ]]; then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_PassErrBody" 0 0
|
|
|
|
|
luks_password
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
luks_open() {
|
|
|
|
|
LUKS_ROOT_NAME=""
|
|
|
|
|
INCLUDE_PART='part\|crypt\|lvm'
|
|
|
|
|
umount_partitions
|
|
|
|
|
find_partitions
|
|
|
|
|
# Filter out partitions that have already been mounted and partitions that just contain crypt device
|
|
|
|
|
list_mounted > /tmp/.ignore_part
|
|
|
|
|
list_containing_crypt >> /tmp/.ignore_part
|
|
|
|
|
|
|
|
|
|
for part in $(cat /tmp/.ignore_part); do
|
|
|
|
|
delete_partition_in_list $part
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Identify and mount root
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_SelRootBody" 0 0 12 ${PARTITIONS} 2>${ANSWER} || prep_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
ROOT_PART=${PARTITION}
|
|
|
|
|
|
|
|
|
|
# Format with FS (or skip)
|
|
|
|
|
select_filesystem
|
|
|
|
|
|
|
|
|
|
# Make the directory and mount. Also identify LUKS and/or LVM
|
|
|
|
|
mount_current_partition
|
|
|
|
|
|
|
|
|
|
# Identify and create swap, if applicable
|
|
|
|
|
make_swap
|
|
|
|
|
|
|
|
|
|
# Extra Step for VFAT UEFI Partition. This cannot be in an LVM container.
|
|
|
|
|
if [[ $SYSTEM == "UEFI" ]]; then
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_SelUefiBody" 0 0 12 ${PARTITIONS} 2>${ANSWER} || prep_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
UEFI_PART=${PARTITION}
|
|
|
|
|
|
|
|
|
|
# If it is already a fat/vfat partition...
|
|
|
|
|
if [[ $(fsck -N $PARTITION | grep fat) ]]; then
|
|
|
|
|
DIALOG " $_PrepMntPart " --yesno "$_FormUefiBody $PARTITION $_FormUefiBody2" 0 0 && {
|
|
|
|
|
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
|
|
|
|
|
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
|
|
|
|
|
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Inform users of the mountpoint options and consequences
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_MntUefiBody" 0 0 2 \
|
|
|
|
|
"/boot" "systemd-boot"\
|
|
|
|
|
"/boot/efi" "-" 2>${ANSWER}
|
|
|
|
|
|
|
|
|
|
[[ $(cat ${ANSWER}) != "" ]] && UEFI_MOUNT=$(cat ${ANSWER}) || prep_menu
|
|
|
|
|
|
|
|
|
|
mkdir -p ${MOUNTPOINT}${UEFI_MOUNT} 2>$ERR
|
|
|
|
|
mount ${PARTITION} ${MOUNTPOINT}${UEFI_MOUNT} 2>$ERR
|
|
|
|
|
check_for_error "mount ${PARTITION} ${MOUNTPOINT}${UEFI_MOUNT}" "$?"
|
|
|
|
|
confirm_mount ${MOUNTPOINT}${UEFI_MOUNT}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# All other partitions
|
|
|
|
|
while [[ $NUMBER_PARTITIONS > 0 ]]; do
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_ExtPartBody" 0 0 12 "$_Done" $"-" ${PARTITIONS} 2>${ANSWER} || prep_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
if [[ $PARTITION == $_Done ]]; then
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
MOUNT=""
|
|
|
|
|
select_filesystem
|
|
|
|
|
|
|
|
|
|
# Ask user for mountpoint. Don't give /boot as an example for UEFI systems!
|
|
|
|
|
[[ $SYSTEM == "UEFI" ]] && MNT_EXAMPLES="/home\n/var" || MNT_EXAMPLES="/boot\n/home\n/var"
|
|
|
|
|
DIALOG " $_PrepMntPart $PARTITON " --inputbox "$_ExtPartBody1$MNT_EXAMPLES\n" 0 0 "/" 2>${ANSWER} || prep_menu
|
|
|
|
|
MOUNT=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
# loop while the mountpoint specified is incorrect (is only '/', is blank, or has spaces).
|
|
|
|
|
while [[ ${MOUNT:0:1} != "/" ]] || [[ ${#MOUNT} -le 1 ]] || [[ $MOUNT =~ \ |\' ]]; do
|
|
|
|
|
# Warn user about naming convention
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_ExtErrBody" 0 0
|
|
|
|
|
# Ask user for mountpoint again
|
|
|
|
|
DIALOG " $_PrepMntPart $PARTITON " --inputbox "$_ExtPartBody1$MNT_EXAMPLES\n" 0 0 "/" 2>${ANSWER} || prep_menu
|
|
|
|
|
MOUNT=$(cat ${ANSWER})
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Create directory and mount.
|
|
|
|
|
mount_current_partition
|
|
|
|
|
|
|
|
|
|
# Determine if a seperate /boot is used. 0 = no seperate boot, 1 = seperate non-lvm boot,
|
|
|
|
|
# 2 = seperate lvm boot. For Grub configuration
|
|
|
|
|
if [[ $MOUNT == "/boot" ]]; then
|
|
|
|
|
[[ $(lsblk -lno TYPE ${PARTITION} | grep "lvm") != "" ]] && LVM_SEP_BOOT=2 || LVM_SEP_BOOT=1
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Had to write it in this way due to (bash?) bug(?), as if/then statements in a single
|
|
|
|
|
# "create LUKS" function for default and "advanced" modes were interpreted as commands,
|
|
|
|
|
# not mere string statements. Not happy with it, but it works...
|
|
|
|
|
luks_password() {
|
|
|
|
|
DIALOG " $_PrepLUKS " --clear --insecure --passwordbox "$_LuksPassBody" 0 0 2> ${ANSWER} || prep_menu
|
|
|
|
|
PASSWD=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
DIALOG " $_PrepLUKS " --clear --insecure --passwordbox "$_PassReEntBody" 0 0 2> ${ANSWER} || prep_menu
|
|
|
|
|
PASSWD2=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
if [[ $PASSWD != $PASSWD2 ]]; then
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_PassErrBody" 0 0
|
|
|
|
|
luks_password
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
luks_open() {
|
|
|
|
|
LUKS_ROOT_NAME=""
|
|
|
|
|
INCLUDE_PART='part\|crypt\|lvm'
|
|
|
|
|
umount_partitions
|
|
|
|
|
find_partitions
|
|
|
|
|
|
|
|
|
|
# Select encrypted partition to open
|
|
|
|
|
DIALOG " $_LuksOpen " --menu "$_LuksMenuBody" 0 0 12 ${PARTITIONS} 2>${ANSWER} || luks_menu
|
|
|
|
|
# Select encrypted partition to open
|
|
|
|
|
DIALOG " $_LuksOpen " --menu "$_LuksMenuBody" 0 0 12 ${PARTITIONS} 2>${ANSWER} || luks_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
# Enter name of the Luks partition and get password to open it
|
|
|
|
@ -703,57 +600,6 @@ lvm_show_vg() {
|
|
|
|
|
|
|
|
|
|
# Create Volume Group and Logical Volumes
|
|
|
|
|
lvm_create() {
|
|
|
|
|
check_lv_size() {
|
|
|
|
|
LV_SIZE_INVALID=0
|
|
|
|
|
chars=0
|
|
|
|
|
|
|
|
|
|
# Check to see if anything was actually entered and if first character is '0'
|
|
|
|
|
([[ ${#LVM_LV_SIZE} -eq 0 ]] || [[ ${LVM_LV_SIZE:0:1} -eq "0" ]]) && LV_SIZE_INVALID=1
|
|
|
|
|
|
|
|
|
|
# If not invalid so far, check for non numberic characters other than the last character
|
|
|
|
|
if [[ $LV_SIZE_INVALID -eq 0 ]]; then
|
|
|
|
|
while [[ $chars -lt $(( ${#LVM_LV_SIZE} - 1 )) ]]; do
|
|
|
|
|
[[ ${LVM_LV_SIZE:chars:1} != [0-9] ]] && LV_SIZE_INVALID=1 && break;
|
|
|
|
|
chars=$(( chars + 1 ))
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# If not invalid so far, check that last character is a M/m or G/g
|
|
|
|
|
if [[ $LV_SIZE_INVALID -eq 0 ]]; then
|
|
|
|
|
LV_SIZE_TYPE=$(echo ${LVM_LV_SIZE:$(( ${#LVM_LV_SIZE} - 1 )):1})
|
|
|
|
|
|
|
|
|
|
case $LV_SIZE_TYPE in
|
|
|
|
|
"m"|"M"|"g"|"G") LV_SIZE_INVALID=0 ;;
|
|
|
|
|
*) LV_SIZE_INVALID=1 ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# If not invalid so far, check whether the value is greater than or equal to the LV remaining Size.
|
|
|
|
|
# If not, convert into MB for VG space remaining.
|
|
|
|
|
if [[ ${LV_SIZE_INVALID} -eq 0 ]]; then
|
|
|
|
|
case ${LV_SIZE_TYPE} in
|
|
|
|
|
"G"|"g")
|
|
|
|
|
if [[ $(( $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) * 1000 )) -ge ${LVM_VG_MB} ]]; then
|
|
|
|
|
LV_SIZE_INVALID=1
|
|
|
|
|
else
|
|
|
|
|
LVM_VG_MB=$(( LVM_VG_MB - $(( $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) * 1000 )) ))
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
"M"|"m")
|
|
|
|
|
if [[ $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) -ge ${LVM_VG_MB} ]]; then
|
|
|
|
|
LV_SIZE_INVALID=1
|
|
|
|
|
else
|
|
|
|
|
LVM_VG_MB=$(( LVM_VG_MB - $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) ))
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
*) LV_SIZE_INVALID=1
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Find LVM appropriate partitions.
|
|
|
|
|
INCLUDE_PART='part\|crypt'
|
|
|
|
|
umount_partitions
|
|
|
|
@ -860,6 +706,57 @@ lvm_create() {
|
|
|
|
|
DIALOG " $_LvmCreateVG " --yesno "$_LvmCompBody" 0 0 && show_devices || lvm_menu
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
check_lv_size() {
|
|
|
|
|
LV_SIZE_INVALID=0
|
|
|
|
|
chars=0
|
|
|
|
|
|
|
|
|
|
# Check to see if anything was actually entered and if first character is '0'
|
|
|
|
|
([[ ${#LVM_LV_SIZE} -eq 0 ]] || [[ ${LVM_LV_SIZE:0:1} -eq "0" ]]) && LV_SIZE_INVALID=1
|
|
|
|
|
|
|
|
|
|
# If not invalid so far, check for non numberic characters other than the last character
|
|
|
|
|
if [[ $LV_SIZE_INVALID -eq 0 ]]; then
|
|
|
|
|
while [[ $chars -lt $(( ${#LVM_LV_SIZE} - 1 )) ]]; do
|
|
|
|
|
[[ ${LVM_LV_SIZE:chars:1} != [0-9] ]] && LV_SIZE_INVALID=1 && break;
|
|
|
|
|
chars=$(( chars + 1 ))
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# If not invalid so far, check that last character is a M/m or G/g
|
|
|
|
|
if [[ $LV_SIZE_INVALID -eq 0 ]]; then
|
|
|
|
|
LV_SIZE_TYPE=$(echo ${LVM_LV_SIZE:$(( ${#LVM_LV_SIZE} - 1 )):1})
|
|
|
|
|
|
|
|
|
|
case $LV_SIZE_TYPE in
|
|
|
|
|
"m"|"M"|"g"|"G") LV_SIZE_INVALID=0 ;;
|
|
|
|
|
*) LV_SIZE_INVALID=1 ;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# If not invalid so far, check whether the value is greater than or equal to the LV remaining Size.
|
|
|
|
|
# If not, convert into MB for VG space remaining.
|
|
|
|
|
if [[ ${LV_SIZE_INVALID} -eq 0 ]]; then
|
|
|
|
|
case ${LV_SIZE_TYPE} in
|
|
|
|
|
"G"|"g")
|
|
|
|
|
if [[ $(( $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) * 1000 )) -ge ${LVM_VG_MB} ]]; then
|
|
|
|
|
LV_SIZE_INVALID=1
|
|
|
|
|
else
|
|
|
|
|
LVM_VG_MB=$(( LVM_VG_MB - $(( $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) * 1000 )) ))
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
"M"|"m")
|
|
|
|
|
if [[ $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) -ge ${LVM_VG_MB} ]]; then
|
|
|
|
|
LV_SIZE_INVALID=1
|
|
|
|
|
else
|
|
|
|
|
LVM_VG_MB=$(( LVM_VG_MB - $(echo ${LVM_LV_SIZE:0:$(( ${#LVM_LV_SIZE} - 1 ))}) ))
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
*) LV_SIZE_INVALID=1
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lvm_del_vg() {
|
|
|
|
|
# Generate list of VGs for selection
|
|
|
|
|
lvm_show_vg
|
|
|
|
@ -919,3 +816,103 @@ lvm_menu() {
|
|
|
|
|
*) prep_menu ;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mount_partitions() {
|
|
|
|
|
# Warn users that they CAN mount partitions without formatting them!
|
|
|
|
|
DIALOG " $_PrepMntPart " --msgbox "$_WarnMount1 '$_FSSkip' $_WarnMount2" 0 0
|
|
|
|
|
|
|
|
|
|
# LVM Detection. If detected, activate.
|
|
|
|
|
lvm_detect
|
|
|
|
|
|
|
|
|
|
# Ensure partitions are unmounted (i.e. where mounted previously), and then list available partitions
|
|
|
|
|
INCLUDE_PART='part\|lvm\|crypt'
|
|
|
|
|
umount_partitions
|
|
|
|
|
find_partitions
|
|
|
|
|
# Filter out partitions that have already been mounted and partitions that just contain crypt device
|
|
|
|
|
list_mounted > /tmp/.ignore_part
|
|
|
|
|
list_containing_crypt >> /tmp/.ignore_part
|
|
|
|
|
|
|
|
|
|
for part in $(cat /tmp/.ignore_part); do
|
|
|
|
|
delete_partition_in_list $part
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Identify and mount root
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_SelRootBody" 0 0 12 ${PARTITIONS} 2>${ANSWER} || prep_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
ROOT_PART=${PARTITION}
|
|
|
|
|
|
|
|
|
|
# Format with FS (or skip)
|
|
|
|
|
select_filesystem
|
|
|
|
|
|
|
|
|
|
# Make the directory and mount. Also identify LUKS and/or LVM
|
|
|
|
|
mount_current_partition
|
|
|
|
|
|
|
|
|
|
# Identify and create swap, if applicable
|
|
|
|
|
make_swap
|
|
|
|
|
|
|
|
|
|
# Extra Step for VFAT UEFI Partition. This cannot be in an LVM container.
|
|
|
|
|
if [[ $SYSTEM == "UEFI" ]]; then
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_SelUefiBody" 0 0 12 ${PARTITIONS} 2>${ANSWER} || prep_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
UEFI_PART=${PARTITION}
|
|
|
|
|
|
|
|
|
|
# If it is already a fat/vfat partition...
|
|
|
|
|
if [[ $(fsck -N $PARTITION | grep fat) ]]; then
|
|
|
|
|
DIALOG " $_PrepMntPart " --yesno "$_FormUefiBody $PARTITION $_FormUefiBody2" 0 0 && {
|
|
|
|
|
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
|
|
|
|
|
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
|
|
|
|
|
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Inform users of the mountpoint options and consequences
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_MntUefiBody" 0 0 2 \
|
|
|
|
|
"/boot" "systemd-boot"\
|
|
|
|
|
"/boot/efi" "-" 2>${ANSWER}
|
|
|
|
|
|
|
|
|
|
[[ $(cat ${ANSWER}) != "" ]] && UEFI_MOUNT=$(cat ${ANSWER}) || prep_menu
|
|
|
|
|
|
|
|
|
|
mkdir -p ${MOUNTPOINT}${UEFI_MOUNT} 2>$ERR
|
|
|
|
|
mount ${PARTITION} ${MOUNTPOINT}${UEFI_MOUNT} 2>$ERR
|
|
|
|
|
check_for_error "mount ${PARTITION} ${MOUNTPOINT}${UEFI_MOUNT}" "$?"
|
|
|
|
|
confirm_mount ${MOUNTPOINT}${UEFI_MOUNT}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# All other partitions
|
|
|
|
|
while [[ $NUMBER_PARTITIONS > 0 ]]; do
|
|
|
|
|
DIALOG " $_PrepMntPart " --menu "$_ExtPartBody" 0 0 12 "$_Done" $"-" ${PARTITIONS} 2>${ANSWER} || prep_menu
|
|
|
|
|
PARTITION=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
if [[ $PARTITION == $_Done ]]; then
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
MOUNT=""
|
|
|
|
|
select_filesystem
|
|
|
|
|
|
|
|
|
|
# Ask user for mountpoint. Don't give /boot as an example for UEFI systems!
|
|
|
|
|
[[ $SYSTEM == "UEFI" ]] && MNT_EXAMPLES="/home\n/var" || MNT_EXAMPLES="/boot\n/home\n/var"
|
|
|
|
|
DIALOG " $_PrepMntPart $PARTITON " --inputbox "$_ExtPartBody1$MNT_EXAMPLES\n" 0 0 "/" 2>${ANSWER} || prep_menu
|
|
|
|
|
MOUNT=$(cat ${ANSWER})
|
|
|
|
|
|
|
|
|
|
# loop while the mountpoint specified is incorrect (is only '/', is blank, or has spaces).
|
|
|
|
|
while [[ ${MOUNT:0:1} != "/" ]] || [[ ${#MOUNT} -le 1 ]] || [[ $MOUNT =~ \ |\' ]]; do
|
|
|
|
|
# Warn user about naming convention
|
|
|
|
|
DIALOG " $_ErrTitle " --msgbox "$_ExtErrBody" 0 0
|
|
|
|
|
# Ask user for mountpoint again
|
|
|
|
|
DIALOG " $_PrepMntPart $PARTITON " --inputbox "$_ExtPartBody1$MNT_EXAMPLES\n" 0 0 "/" 2>${ANSWER} || prep_menu
|
|
|
|
|
MOUNT=$(cat ${ANSWER})
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Create directory and mount.
|
|
|
|
|
mount_current_partition
|
|
|
|
|
|
|
|
|
|
# Determine if a seperate /boot is used. 0 = no seperate boot, 1 = seperate non-lvm boot,
|
|
|
|
|
# 2 = seperate lvm boot. For Grub configuration
|
|
|
|
|
if [[ $MOUNT == "/boot" ]]; then
|
|
|
|
|
[[ $(lsblk -lno TYPE ${PARTITION} | grep "lvm") != "" ]] && LVM_SEP_BOOT=2 || LVM_SEP_BOOT=1
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|