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

replace sed

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 11:43:21 +01:00
parent 846906128e
commit 0de654ff47
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,8 +168,7 @@ _mountpoints() {
fi fi
if [[ "${_DEV}" != "NONE" ]]; then if [[ "${_DEV}" != "NONE" ]]; then
_check_mkfs_values _check_mkfs_values
#shellcheck disable=SC2001,SC2086 _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
_DEVS="$(echo ${_DEVS} | sed -e "s#$(${_LSBLK} NAME,SIZE -d "${_DEV}")##g")"
echo "${_DEV}:swap:swap:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts echo "${_DEV}:swap:swap:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts
fi fi
# #
@ -192,12 +191,19 @@ _mountpoints() {
# clear values first! # clear values first!
_clear_fs_values _clear_fs_values
_check_btrfs_filesystem_creation _check_btrfs_filesystem_creation
# allow other format on already swap partition format # reformat device, if already swap partition format
if [[ -n "${_ASK_MOUNTPOINTS}" && "${_FSTYPE}" == "swap" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && "${_FSTYPE}" == "swap" ]]; then
_FSTYPE="" _FSTYPE=""
_DOMKFS=1 _DOMKFS=1
fi fi
# don't format ESP if already vfat format # reformat vfat, root cannot be vfat format
if [[ -n "${_ASK_MOUNTPOINTS}" && -n "${_DO_ROOT}" ]]; then
if [[ "${_FSTYPE}" == "vfat" ]]; then
_FSTYPE=""
_DOMKFS=1
fi
fi
# don't format ESP, if already vfat format
if [[ "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then if [[ "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
_SKIP_FILESYSTEM="1" _SKIP_FILESYSTEM="1"
fi fi
@ -206,17 +212,10 @@ _mountpoints() {
_FSTYPE="vfat" _FSTYPE="vfat"
_DOMKFS=1 _DOMKFS=1
fi fi
# allow reformat of vfat formatted device # allow reformat. if already vfat format
if [[ -z "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then if [[ -z "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
[[ "${_FSTYPE}" == "vfat" ]] && _FSTYPE="" [[ "${_FSTYPE}" == "vfat" ]] && _FSTYPE=""
fi fi
# root cannot be vfat format
if [[ -n "${_ASK_MOUNTPOINTS}" && -n "${_DO_ROOT}" ]]; then
if [[ "${_FSTYPE}" == "vfat" ]]; then
_FSTYPE=""
_DOMKFS=1
fi
fi
# _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem # _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
_enter_mountpoint || return 1 _enter_mountpoint || return 1
@ -233,7 +232,7 @@ _mountpoints() {
_check_mkfs_values _check_mkfs_values
echo "${_DEV}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts echo "${_DEV}:${_FSTYPE}:${_MP}:${_DOMKFS}:${_LABEL_NAME}:${_FS_OPTIONS}:${_BTRFS_DEVS}:${_BTRFS_LEVEL}:${_BTRFS_SUBVOLUME}:${_BTRFS_COMPRESS}" >>/tmp/.parts
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
! [[ "${_FSTYPE}" == "btrfs" ]] || [[ -n ${_DO_ROOT} ]] && _DEVS="$(echo ${_DEVS} | sed -e "s#$(${_LSBLK} NAME,SIZE -d "${_DEV}")##g")" ! [[ "${_FSTYPE}" == "btrfs" ]] || [[ -n ${_DO_ROOT} ]] && _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
fi fi
_DO_ROOT="" _DO_ROOT=""
done done