mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 12:00:37 +02:00
ask for name scheme earlier
This commit is contained in:
parent
4dde925bf1
commit
8e3dddb12e
2 changed files with 4 additions and 5 deletions
|
@ -41,7 +41,9 @@ autoprepare() {
|
||||||
DIALOG --msgbox "ERROR: Setup cannot detect size of your device, please use normal installation routine for partitioning and mounting devices." 0 0
|
DIALOG --msgbox "ERROR: Setup cannot detect size of your device, please use normal installation routine for partitioning and mounting devices." 0 0
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
if [[ "${NAME_SCHEME_PARAMETER_RUN}" == "" ]]; then
|
||||||
|
set_device_name_scheme || return 1
|
||||||
|
fi
|
||||||
if [[ "${GUIDPARAMETER}" = "yes" ]]; then
|
if [[ "${GUIDPARAMETER}" = "yes" ]]; then
|
||||||
DIALOG --inputbox "Enter the mountpoint of your UEFI SYSTEM PARTITION (Default is /boot) : " 10 60 "/boot" 2>"${ANSWER}" || return 1
|
DIALOG --inputbox "Enter the mountpoint of your UEFI SYSTEM PARTITION (Default is /boot) : " 10 60 "/boot" 2>"${ANSWER}" || return 1
|
||||||
UEFISYS_MOUNTPOINT="$(cat "${ANSWER}")"
|
UEFISYS_MOUNTPOINT="$(cat "${ANSWER}")"
|
||||||
|
@ -279,9 +281,6 @@ autoprepare() {
|
||||||
## wait until /dev initialized correct devices
|
## wait until /dev initialized correct devices
|
||||||
udevadm settle
|
udevadm settle
|
||||||
|
|
||||||
if [[ "${NAME_SCHEME_PARAMETER_RUN}" == "" ]]; then
|
|
||||||
set_device_name_scheme || return 1
|
|
||||||
fi
|
|
||||||
## FSSPECS - default filesystem specs (the + is bootable flag)
|
## FSSPECS - default filesystem specs (the + is bootable flag)
|
||||||
## <partnum>:<mountpoint>:<partsize>:<fstype>[:<fsoptions>][:+]:labelname
|
## <partnum>:<mountpoint>:<partsize>:<fstype>[:<fsoptions>][:+]:labelname
|
||||||
## The partitions in FSSPECS list should be listed in the "mountpoint" order.
|
## The partitions in FSSPECS list should be listed in the "mountpoint" order.
|
||||||
|
|
|
@ -234,7 +234,7 @@ mountpoints() {
|
||||||
BTRFS_COMPRESS=$(echo "${line}" | cut -d: -f 11)
|
BTRFS_COMPRESS=$(echo "${line}" | cut -d: -f 11)
|
||||||
if [[ "${DOMKFS}" = "yes" ]]; then
|
if [[ "${DOMKFS}" = "yes" ]]; then
|
||||||
if [[ "${FSTYPE}" = "swap" ]]; then
|
if [[ "${FSTYPE}" = "swap" ]]; then
|
||||||
DIALOG --infobox "Creating and activating swapspace on ${PART} ..." 0 0
|
DIALOG --infobox "Creating and activating \nswapspace on \n${PART} ..." 0 0
|
||||||
else
|
else
|
||||||
DIALOG --infobox "Creating ${FSTYPE} on ${PART},\nmounting to ${DESTDIR}${MP} ..." 0 0
|
DIALOG --infobox "Creating ${FSTYPE} on ${PART},\nmounting to ${DESTDIR}${MP} ..." 0 0
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue