Allow setting root and boot partitions before running
This commit is contained in:
parent
5c0ea2c6a3
commit
5f48915a32
@ -1007,6 +1007,7 @@ select_mountpoint()
|
|||||||
EXMNT=''
|
EXMNT=''
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
msg "Mount Extra" "\nMounting Finished\n\n\nNo extra partitions available to mount, returning to main menu.\n" 2
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1033,6 +1034,7 @@ select_filesystem()
|
|||||||
|
|
||||||
select_efi_partition()
|
select_efi_partition()
|
||||||
{
|
{
|
||||||
|
if [[ -z $BOOT_PART ]]; then
|
||||||
if [[ $AUTO_BOOT_PART ]]; then
|
if [[ $AUTO_BOOT_PART ]]; then
|
||||||
BOOT_PART="$AUTO_BOOT_PART"
|
BOOT_PART="$AUTO_BOOT_PART"
|
||||||
return 0 # were done here
|
return 0 # were done here
|
||||||
@ -1054,6 +1056,7 @@ select_efi_partition()
|
|||||||
dlg BOOT_PART menu "EFI Partition" "$_uefi" $pts
|
dlg BOOT_PART menu "EFI Partition" "$_uefi" $pts
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z $BOOT_PART ]]; then
|
if [[ -z $BOOT_PART ]]; then
|
||||||
return 1
|
return 1
|
||||||
@ -1071,6 +1074,7 @@ select_efi_partition()
|
|||||||
|
|
||||||
select_boot_partition()
|
select_boot_partition()
|
||||||
{
|
{
|
||||||
|
if [[ -z $BOOT_PART ]]; then
|
||||||
if [[ $AUTO_BOOT_PART && ! $LVM ]]; then
|
if [[ $AUTO_BOOT_PART && ! $LVM ]]; then
|
||||||
BOOT_PART="$AUTO_BOOT_PART"
|
BOOT_PART="$AUTO_BOOT_PART"
|
||||||
return 0 # were done here
|
return 0 # were done here
|
||||||
@ -1093,6 +1097,7 @@ select_boot_partition()
|
|||||||
[[ -z $BOOT_PART || $BOOT_PART == "skip" ]] && { BOOT_PART=''; return 0; }
|
[[ -z $BOOT_PART || $BOOT_PART == "skip" ]] && { BOOT_PART=''; return 0; }
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if grep -q 'ext[34]' <<< "$(fsck -N "$BOOT_PART")"; then
|
if grep -q 'ext[34]' <<< "$(fsck -N "$BOOT_PART")"; then
|
||||||
local txt="\nIMPORTANT:\n\nThe boot partition $BOOT_PART $_format"
|
local txt="\nIMPORTANT:\n\nThe boot partition $BOOT_PART $_format"
|
||||||
@ -1107,6 +1112,7 @@ select_boot_partition()
|
|||||||
|
|
||||||
select_root_partition()
|
select_root_partition()
|
||||||
{
|
{
|
||||||
|
if [[ -z $ROOT_PART ]]; then
|
||||||
if [[ $AUTO_ROOT_PART && -z $LVM && -z $LUKS ]]; then
|
if [[ $AUTO_ROOT_PART && -z $LVM && -z $LUKS ]]; then
|
||||||
ROOT_PART="$AUTO_ROOT_PART"
|
ROOT_PART="$AUTO_ROOT_PART"
|
||||||
msg "Mount Menu" "\nUsing partitions created during automatic format.\n" 2
|
msg "Mount Menu" "\nUsing partitions created during automatic format.\n" 2
|
||||||
@ -1130,12 +1136,12 @@ select_root_partition()
|
|||||||
dlg ROOT_PART menu "Mount Root" "\nSelect the root (/) partition, this is where $DIST will be installed.\n\nDevices smaller than 8G will not be shown here." $pts
|
dlg ROOT_PART menu "Mount Root" "\nSelect the root (/) partition, this is where $DIST will be installed.\n\nDevices smaller than 8G will not be shown here." $pts
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -z $ROOT_PART ]] || ! select_filesystem "$ROOT_PART" || ! part_mount "$ROOT_PART"; then
|
if [[ -z $ROOT_PART ]] || ! select_filesystem "$ROOT_PART" || ! part_mount "$ROOT_PART"; then
|
||||||
ROOT_PART=''
|
ROOT_PART=''
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2189,7 +2195,7 @@ usage()
|
|||||||
options:
|
options:
|
||||||
-h, --help print this message and exit
|
-h, --help print this message and exit
|
||||||
-l, --live install and setup a live session
|
-l, --live install and setup a live session
|
||||||
-d, --debug enable debugging and log output to $DBG
|
-d, --debug enable xtrace and log output to $DBG
|
||||||
|
|
||||||
sessions:
|
sessions:
|
||||||
i3-gaps - A fork of i3wm with more features including gaps
|
i3-gaps - A fork of i3wm with more features including gaps
|
||||||
@ -2203,6 +2209,18 @@ usage()
|
|||||||
plasma - A kde software project currently comprising a full desktop environment
|
plasma - A kde software project currently comprising a full desktop environment
|
||||||
xfce4 - A lightweight and modular desktop environment based on gtk+2/3
|
xfce4 - A lightweight and modular desktop environment based on gtk+2/3
|
||||||
|
|
||||||
|
distro name:
|
||||||
|
|
||||||
|
set the DIST environment variable before launching the installer eg.
|
||||||
|
|
||||||
|
DIST='MyDistro' $1
|
||||||
|
|
||||||
|
editor used:
|
||||||
|
|
||||||
|
set the EDITOR environment variable before launching the installer eg.
|
||||||
|
|
||||||
|
EDITOR='nano' $1
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user