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

harmonize cut calls

Browse source
This commit is contained in:
Tobias Powalowski 2024-02-08 20:05:55 +01:00
parent 077844cca7
commit da2c151fac
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
usr/lib/archboot/installer/quicksetup.sh
View file

@ -70,17 +70,17 @@ _auto_create_filesystems() {
_PROGRESS_COUNT=$((100/_MAX_COUNT)) _PROGRESS_COUNT=$((100/_MAX_COUNT))
## make and mount filesystems ## make and mount filesystems
for fsspec in ${_FSSPECS}; do for fsspec in ${_FSSPECS}; do
_DEV="${_DISK}$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d:)" _DEV="${_DISK}$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d '|')"
# Add check on nvme or mmc controller: # Add check on nvme or mmc controller:
# NVME uses /dev/nvme0n1pX name scheme # NVME uses /dev/nvme0n1pX name scheme
# MMC uses /dev/mmcblk0pX # MMC uses /dev/mmcblk0pX
if echo "${_DISK}" | grep -q "nvme" || echo "${_DISK}" | grep -q "mmc"; then if echo "${_DISK}" | grep -q "nvme" || echo "${_DISK}" | grep -q "mmc"; then
_DEV="${_DISK}p$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d:)" _DEV="${_DISK}p$(echo "${fsspec}" | tr -d ' ' | cut -f1 -d '|')"
fi fi
_FSTYPE="$(echo "${fsspec}" | tr -d ' ' | cut -f2 -d:)" _FSTYPE="$(echo "${fsspec}" | tr -d ' ' | cut -f2 -d '|')"
_DOMKFS=1 _DOMKFS=1
_MP="$(echo "${fsspec}" | tr -d ' ' | cut -f3 -d:)" _MP="$(echo "${fsspec}" | tr -d ' ' | cut -f3 -d '|')"
_LABEL_NAME="$(echo "${fsspec}" | tr -d ' ' | cut -f4 -d:)" _LABEL_NAME="$(echo "${fsspec}" | tr -d ' ' | cut -f4 -d '|')"
_FS_OPTIONS="" _FS_OPTIONS=""
_BTRFS_DEVS="" _BTRFS_DEVS=""
_BTRFS_LEVEL="" _BTRFS_LEVEL=""
@ -329,14 +329,14 @@ _autoprepare() {
## wait until /dev initialized correct devices ## wait until /dev initialized correct devices
udevadm settle udevadm settle
## FSSPECS - default filesystem specs ## FSSPECS - default filesystem specs
## <partnum>:<fstype>:<mountpoint>:<labelname> ## <partnum>|<fstype>|<mountpoint>|<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.
## Make sure the "root" partition is defined first in the FSSPECS list ## Make sure the "root" partition is defined first in the FSSPECS list
[[ -z "${_SKIP_SWAP}" ]] && _FSSPEC_SWAPDEV="${_SWAPDEV_NUM}:swap:swap:ARCH_SWAP" [[ -z "${_SKIP_SWAP}" ]] && _FSSPEC_SWAPDEV="${_SWAPDEV_NUM}|swap|swap|ARCH_SWAP"
_FSSPEC_ROOTDEV="${_ROOTDEV_NUM}:${_FSTYPE}:/:ARCH_ROOT" _FSSPEC_ROOTDEV="${_ROOTDEV_NUM}|${_FSTYPE}|/|ARCH_ROOT"
_FSSPEC_BOOTDEV="${_BOOTDEV_NUM}:ext2:/boot:ARCH_BOOT" _FSSPEC_BOOTDEV="${_BOOTDEV_NUM}|ext2|/boot|ARCH_BOOT"
[[ -z "${_SKIP_HOME}" ]] &&_FSSPEC_HOMEDEV="${_HOMEDEV_NUM}:${_FSTYPE}:/home:ARCH_HOME" [[ -z "${_SKIP_HOME}" ]] &&_FSSPEC_HOMEDEV="${_HOMEDEV_NUM}|${_FSTYPE}|/home|ARCH_HOME"
_FSSPEC_UEFISYSDEV="${_UEFISYSDEV_NUM}:vfat:${_UEFISYS_MP}:ESP" _FSSPEC_UEFISYSDEV="${_UEFISYSDEV_NUM}|vfat|${_UEFISYS_MP}|ESP"
if [[ -n "${_GUIDPARAMETER}" && -n "${_UEFI_BOOT}" ]]; then if [[ -n "${_GUIDPARAMETER}" && -n "${_UEFI_BOOT}" ]]; then
if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then if [[ -n "${_UEFISYS_BOOTDEV}" ]]; then
_FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}" _FSSPECS="${_FSSPEC_ROOTDEV} ${_FSSPEC_UEFISYSDEV} ${_FSSPEC_HOMEDEV} ${_FSSPEC_SWAPDEV}"