From fdcf9ca1a2c0c9d57d38981c05d349016cbaa4d6 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 27 Oct 2023 22:29:03 +0200 Subject: [PATCH] remove sed --- usr/lib/archboot/cpio/cpio.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/lib/archboot/cpio/cpio.sh b/usr/lib/archboot/cpio/cpio.sh index a49e218c2..6117a8da8 100644 --- a/usr/lib/archboot/cpio/cpio.sh +++ b/usr/lib/archboot/cpio/cpio.sh @@ -172,15 +172,15 @@ _install_mods() { # Checking kernel module dependencies: # first try, pull in the easy modules #shellcheck disable=SC2086 - _MOD_DEPS="$(modinfo -k "${_KERNELVERSION}" -F depends ${_MODS} 2>"${_NO_LOG}" | sed -e 's#,# #g' | tr " " "\n" | sort -u) \ - $(modinfo -k "${_KERNELVERSION}" -F softdep ${_MODS} 2>"${_NO_LOG}" | sed -e 's#.*: # #g' | tr " " "\n" | sort -u)" + _MOD_DEPS="$(modinfo -k "${_KERNELVERSION}" -F depends ${_MODS} 2>"${_NO_LOG}" | tr "," "\n" | sort -u) \ + $(modinfo -k "${_KERNELVERSION}" -F softdep ${_MODS} 2>"${_NO_LOG}" | tr ".*: " "\n" | sort -u)" _DEP_COUNT=0 # next tries, ensure to catch all modules with depends while true; do #shellcheck disable=SC2046,SC2086 _MOD_DEPS="$(echo ${_MOD_DEPS} \ - $(modinfo -k "${_KERNELVERSION}" -F depends ${_MOD_DEPS} 2>"${_NO_LOG}" | sed -e 's#,# #g' | tr " " "\n" | sort -u) \ - $(modinfo -k "${_KERNELVERSION}" -F softdep ${_MOD_DEPS} 2>"${_NO_LOG}" | sed -e 's#.*: # #g' | tr " " "\n" | sort -u) \ + $(modinfo -k "${_KERNELVERSION}" -F depends ${_MOD_DEPS} 2>"${_NO_LOG}" | tr "," "\n" | sort -u) \ + $(modinfo -k "${_KERNELVERSION}" -F softdep ${_MOD_DEPS} 2>"${_NO_LOG}" | tr ".*: " "\n" | sort -u) \ | tr " " "\n" | sort -u)" _DEP_COUNT2="$(wc -w <<< "${_MOD_DEPS}")" [[ "${_DEP_COUNT}" == "${_DEP_COUNT2}" ]] && break