From 7ce34b3ab8fc5ceb2f7dee6a62f732438174dac0 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 27 Oct 2022 11:56:54 +0200 Subject: [PATCH] refactor(dracut-init.sh): remove redundant "dracut" from "dracut module" prints In a similar fashion than "Including module" prints. --- dracut-init.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dracut-init.sh b/dracut-init.sh index aba42bb31b..285ab6341a 100755 --- a/dracut-init.sh +++ b/dracut-init.sh @@ -119,7 +119,7 @@ require_binaries() { for cmd in "$@"; do if ! find_binary "$cmd" &> /dev/null; then - dinfo "dracut module '${_module_name#[0-9][0-9]}' will not be installed, because command '$cmd' could not be found!" + dinfo "Module '${_module_name#[0-9][0-9]}' will not be installed, because command '$cmd' could not be found!" ((_ret++)) fi done @@ -946,7 +946,7 @@ check_mount() { && force_add_dracutmodules+=" $_moddep " # if a module we depend on fail, fail also if ! check_module "$_moddep"; then - derror "dracut module '$_mod' depends on '$_moddep', which can't be installed" + derror "Module '$_mod' depends on '$_moddep', which can't be installed" return 1 fi done @@ -978,7 +978,7 @@ check_module() { [[ $2 ]] || mods_checked_as_dep+=" $_mod " if [[ " $omit_dracutmodules " == *\ $_mod\ * ]]; then - ddebug "dracut module '$_mod' will not be installed, because it's in the list to be omitted!" + ddebug "Module '$_mod' will not be installed, because it's in the list to be omitted!" return 1 fi @@ -1021,7 +1021,7 @@ check_module() { && force_add_dracutmodules+=" $_moddep " # if a module we depend on fail, fail also if ! check_module "$_moddep"; then - derror "dracut module '$_mod' depends on '$_moddep', which can't be installed" + derror "Module '$_mod' depends on '$_moddep', which can't be installed" return 1 fi done @@ -1060,7 +1060,7 @@ for_each_module_dir() { && [[ " $omit_dracutmodules " == *\ $_mod\ * ]] \ && continue - derror "dracut module '$_mod' cannot be found or installed." + derror "Module '$_mod' cannot be found or installed." [[ " $force_add_dracutmodules " == *\ $_mod\ * ]] && exit 1 [[ " $dracutmodules " == *\ $_mod\ * ]] && exit 1 [[ " $add_dracutmodules " == *\ $_mod\ * ]] && exit 1