mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 11:30:37 +02:00
replace sed with sd
This commit is contained in:
parent
fa24b6b917
commit
1c611c4c8b
5 changed files with 7 additions and 7 deletions
|
@ -88,10 +88,10 @@ _bootloader_kernel_parameters() {
|
||||||
[[ "${_NAME_SCHEME_PARAMETER}" == "FSLABEL" ]] && _getrootfslabel
|
[[ "${_NAME_SCHEME_PARAMETER}" == "FSLABEL" ]] && _getrootfslabel
|
||||||
if [[ "${_NAME_SCHEME_PARAMETER}" == "SD_GPT_AUTO_GENERATOR" ]]; then
|
if [[ "${_NAME_SCHEME_PARAMETER}" == "SD_GPT_AUTO_GENERATOR" ]]; then
|
||||||
_KERNEL_PARAMS_COMMON_UNMOD="${_RAIDARRAYS} ${_LUKSSETUP}"
|
_KERNEL_PARAMS_COMMON_UNMOD="${_RAIDARRAYS} ${_LUKSSETUP}"
|
||||||
_KERNEL_PARAMS_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')"
|
_KERNEL_PARAMS_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sd ' +' ' ')"
|
||||||
else
|
else
|
||||||
_KERNEL_PARAMS_COMMON_UNMOD="root=${_ROOTDEV} rootfstype=${_ROOTFS} rw ${_ROOTFLAGS} ${_RAIDARRAYS} ${_LUKSSETUP}"
|
_KERNEL_PARAMS_COMMON_UNMOD="root=${_ROOTDEV} rootfstype=${_ROOTFS} rw ${_ROOTFLAGS} ${_RAIDARRAYS} ${_LUKSSETUP}"
|
||||||
_KERNEL_PARAMS_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')"
|
_KERNEL_PARAMS_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sd ' +' ' ')"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ _uefi_efibootmgr() {
|
||||||
efibootmgr --quiet -b "${_bootnum}" -B >> "${_LOG}"
|
efibootmgr --quiet -b "${_bootnum}" -B >> "${_LOG}"
|
||||||
done
|
done
|
||||||
_BOOTMGRDEV=$(${_LSBLK} PKNAME "${_UEFISYSDEV}" 2>"${_NO_LOG}")
|
_BOOTMGRDEV=$(${_LSBLK} PKNAME "${_UEFISYSDEV}" 2>"${_NO_LOG}")
|
||||||
_BOOTMGRNUM=$(echo "${_UEFISYSDEV}" | sed -e "s#${_BOOTMGRDEV}##g" | sed -e 's#p##g')
|
_BOOTMGRNUM=$(echo "${_UEFISYSDEV}" | sd "${_BOOTMGRDEV}" '' | sd 'p' '')
|
||||||
efibootmgr --quiet --create --disk "${_BOOTMGRDEV}" --part "${_BOOTMGRNUM}" --loader "${_BOOTMGR_LOADER_PATH}" --label "${_BOOTMGR_LABEL}" >> "${_LOG}"
|
efibootmgr --quiet --create --disk "${_BOOTMGRDEV}" --part "${_BOOTMGRNUM}" --loader "${_BOOTMGR_LOADER_PATH}" --label "${_BOOTMGR_LABEL}" >> "${_LOG}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -158,7 +158,7 @@ EOF
|
||||||
else
|
else
|
||||||
_LINUX_UNMOD_COMMAND="linux ${_SUBDIR}/${_VMLINUZ} ${_KERNEL_PARAMS_MOD}"
|
_LINUX_UNMOD_COMMAND="linux ${_SUBDIR}/${_VMLINUZ} ${_KERNEL_PARAMS_MOD}"
|
||||||
fi
|
fi
|
||||||
_LINUX_MOD_COMMAND=$(echo "${_LINUX_UNMOD_COMMAND}" | sed -e 's# # #g' | sed -e 's# # #g')
|
_LINUX_MOD_COMMAND=$(echo "${_LINUX_UNMOD_COMMAND}" | sd ' +' ' ')
|
||||||
## create default kernel entry
|
## create default kernel entry
|
||||||
_NUMBER=0
|
_NUMBER=0
|
||||||
cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"
|
cat << EOF >> "${_DESTDIR}/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"
|
||||||
|
|
|
@ -9,7 +9,7 @@ _secureboot_keys() {
|
||||||
_dialog --title " Setup Keys " --no-cancel --inputbox "Enter the directory to store the keys on ${_DESTDIR}." 8 65 "/etc/secureboot/keys" 2>"${_ANSWER}" || return 1
|
_dialog --title " Setup Keys " --no-cancel --inputbox "Enter the directory to store the keys on ${_DESTDIR}." 8 65 "/etc/secureboot/keys" 2>"${_ANSWER}" || return 1
|
||||||
_KEYDIR=$(cat "${_ANSWER}")
|
_KEYDIR=$(cat "${_ANSWER}")
|
||||||
#shellcheck disable=SC2086,SC2001
|
#shellcheck disable=SC2086,SC2001
|
||||||
_KEYDIR="$(echo ${_KEYDIR} | sed -e 's#^/##g')"
|
_KEYDIR="$(echo ${_KEYDIR} | sd '^/' '')"
|
||||||
done
|
done
|
||||||
if [[ ! -d "${_DESTDIR}/${_KEYDIR}" ]]; then
|
if [[ ! -d "${_DESTDIR}/${_KEYDIR}" ]]; then
|
||||||
while [[ -z "${_CN}" ]]; do
|
while [[ -z "${_CN}" ]]; do
|
||||||
|
|
|
@ -7,7 +7,7 @@ _uboot() {
|
||||||
_abort_uboot
|
_abort_uboot
|
||||||
[[ -d "${_DESTDIR}/boot/extlinux" ]] || mkdir -p "${_DESTDIR}/boot/extlinux"
|
[[ -d "${_DESTDIR}/boot/extlinux" ]] || mkdir -p "${_DESTDIR}/boot/extlinux"
|
||||||
_KERNEL_PARAMS_COMMON_UNMOD="root=${_ROOTDEV} rootfstype=${_ROOTFS} rw ${_ROOTFLAGS} ${_RAIDARRAYS} ${_LUKSSETUP}"
|
_KERNEL_PARAMS_COMMON_UNMOD="root=${_ROOTDEV} rootfstype=${_ROOTFS} rw ${_ROOTFLAGS} ${_RAIDARRAYS} ${_LUKSSETUP}"
|
||||||
_KERNEL_PARAMS_COMMON_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')"
|
_KERNEL_PARAMS_COMMON_MOD="$(echo "${_KERNEL_PARAMS_COMMON_UNMOD}" | sd ' +' ' ')"
|
||||||
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _TITLE="ARM 64"
|
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _TITLE="ARM 64"
|
||||||
[[ "${_RUNNING_ARCH}" == "riscv64" ]] && _TITLE="RISC-V 64"
|
[[ "${_RUNNING_ARCH}" == "riscv64" ]] && _TITLE="RISC-V 64"
|
||||||
# write extlinux.conf
|
# write extlinux.conf
|
||||||
|
|
|
@ -44,7 +44,7 @@ _marvell_firmware() {
|
||||||
_MARVELL=""
|
_MARVELL=""
|
||||||
_PACKAGES="${_PACKAGES// linux-firmware-marvell / }"
|
_PACKAGES="${_PACKAGES// linux-firmware-marvell / }"
|
||||||
for i in $(fd -t f . /lib/modules/"${_RUNNING_KERNEL}" | rg -w 'wireless/marvell'); do
|
for i in $(fd -t f . /lib/modules/"${_RUNNING_KERNEL}" | rg -w 'wireless/marvell'); do
|
||||||
_MARVELL="${_MARVELL} $(basename "${i}" | sed -e 's#\..*$##g')"
|
_MARVELL="${_MARVELL} $(basename "${i}" | sd '.ko.*$' '')"
|
||||||
done
|
done
|
||||||
# check marvell modules if already loaded
|
# check marvell modules if already loaded
|
||||||
for i in ${_MARVELL}; do
|
for i in ${_MARVELL}; do
|
||||||
|
|
Loading…
Reference in a new issue