Skip to content

Commit

Permalink
refactor(dracut-init.sh): remove redundant "dracut" from "dracut modu…
Browse files Browse the repository at this point in the history
…le" prints

In a similar fashion than "Including module" prints.
  • Loading branch information
aafeijoo-suse committed Oct 27, 2022
1 parent fdf1a4e commit 7ce34b3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions dracut-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7ce34b3

Please sign in to comment.