root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add ... to messages

Browse source
This commit is contained in:
Tobias Powalowski 2022-11-29 14:55:34 +01:00
parent 989cfe4b90
commit 2621bdf0e4
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/lib/archboot/installer/autoprepare.sh
View file

@ -48,7 +48,7 @@ autoprepare() {
fi fi
if [[ "${UEFISYS_MOUNTPOINT}" == "/boot" ]]; then if [[ "${UEFISYS_MOUNTPOINT}" == "/boot" ]]; then
DIALOG --msgbox "You have chosen to use /boot as the UEFISYS Mountpoint. The minimum partition size is 260 MiB and only FAT32 FS is supported" 0 0 DIALOG --msgbox "You have chosen to use /boot as the UEFISYS Mountpoint. The minimum partition size is 260 MiB and only FAT32 FS is supported." 0 0
_UEFISYS_BOOTPART="1" _UEFISYS_BOOTPART="1"
fi fi
@ -203,13 +203,13 @@ autoprepare() {
# validate DEVICE # validate DEVICE
if [[ ! -b "${DEVICE}" ]]; then if [[ ! -b "${DEVICE}" ]]; then
DIALOG --msgbox "Device '${DEVICE}' is not valid" 0 0 DIALOG --msgbox "Error: Device '${DEVICE}' is not valid." 0 0
return 1 return 1
fi fi
# validate DEST # validate DEST
if [[ ! -d "${DESTDIR}" ]]; then if [[ ! -d "${DESTDIR}" ]]; then
DIALOG --msgbox "Destination directory '${DESTDIR}' is not valid" 0 0 DIALOG --msgbox "Error: Destination directory '${DESTDIR}' is not valid." 0 0
return 1 return 1
fi fi
@ -269,7 +269,7 @@ autoprepare() {
fi fi
#shellcheck disable=SC2181 #shellcheck disable=SC2181
if [[ $? -gt 0 ]]; then if [[ $? -gt 0 ]]; then
DIALOG --msgbox "Error partitioning ${DEVICE} (see ${LOG} for details)" 0 0 DIALOG --msgbox "Error: Partitioning ${DEVICE} (see ${LOG} for details)." 0 0
printk on printk on
return 1 return 1
fi fi
@ -332,9 +332,9 @@ autoprepare() {
fi fi
BTRFS_LEVEL="NONE" BTRFS_LEVEL="NONE"
if ! [[ "${FSTYPE}" = "swap" ]]; then if ! [[ "${FSTYPE}" = "swap" ]]; then
DIALOG --infobox "Creating ${FSTYPE} on ${PART}\nwith FSLABEL ${LABEL_NAME} ,\nmounting to ${DESTDIR}${MP}" 0 0 DIALOG --infobox "Creating ${FSTYPE} on ${PART}\nwith FSLABEL ${LABEL_NAME} ,\nmounting to ${DESTDIR}${MP} ..." 0 0
else else
DIALOG --infobox "Creating and activating swapspace on ${PART}" 0 0 DIALOG --infobox "Creating and activating swapspace on ${PART} ..." 0 0
fi fi
_mkfs "${DOMKFS}" "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1 _mkfs "${DOMKFS}" "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" ${BTRFS_LEVEL} ${BTRFS_SUBVOLUME} ${DOSUBVOLUME} ${BTRFS_COMPRESS} || return 1
sleep 1 sleep 1

8
usr/lib/archboot/installer/mountpoints.sh
View file

@ -234,16 +234,16 @@ 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 swapspace on ${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
_mkfs yes "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" "${BTRFS_LEVEL}" "${BTRFS_SUBVOLUME}" "${DOSUBVOLUME}" "${BTRFS_COMPRESS}" || return 1 _mkfs yes "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" "${BTRFS_LEVEL}" "${BTRFS_SUBVOLUME}" "${DOSUBVOLUME}" "${BTRFS_COMPRESS}" || return 1
else else
if [[ "${FSTYPE}" = "swap" ]]; then if [[ "${FSTYPE}" = "swap" ]]; then
DIALOG --infobox "Activating swapspace on ${PART}" 0 0 DIALOG --infobox "Activating swapspace on ${PART} ..." 0 0
else else
DIALOG --infobox "Mounting ${FSTYPE} on ${PART} to ${DESTDIR}${MP}" 0 0 DIALOG --infobox "Mounting ${FSTYPE} on ${PART} to ${DESTDIR}${MP} ..." 0 0
fi fi
_mkfs no "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" "${BTRFS_LEVEL}" "${BTRFS_SUBVOLUME}" "${DOSUBVOLUME}" "${BTRFS_COMPRESS}" || return 1 _mkfs no "${PART}" "${FSTYPE}" "${DESTDIR}" "${MP}" "${LABEL_NAME}" "${FS_OPTIONS}" "${BTRFS_DEVICES}" "${BTRFS_LEVEL}" "${BTRFS_SUBVOLUME}" "${DOSUBVOLUME}" "${BTRFS_COMPRESS}" || return 1
fi fi