summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/kernel-install/kernel-install.in11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index fa2c0d5276..9cfcd4dbb9 100755
--- a/src/kernel-install/kernel-install.in
+++ b/src/kernel-install/kernel-install.in
@@ -215,7 +215,7 @@ for pref in $BOOT_ROOT_SEARCH; do
log_verbose "$pref/$suff exists, using BOOT_ROOT=$BOOT_ROOT, ENTRY_TOKEN=$ENTRY_TOKEN"
break 2
else
- [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "$pref/$suff not found…"
+ log_verbose "$pref/$suff not found…"
fi
if [ -d "$pref/loader/entries" ]; then
@@ -240,14 +240,12 @@ done
if [ -z "$BOOT_ROOT" ]; then
BOOT_ROOT="/boot"
- [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
- echo "KERNEL_INSTALL_BOOT_ROOT autodection yielded no candidates, using \"$BOOT_ROOT\""
+ log_verbose "KERNEL_INSTALL_BOOT_ROOT autodetection yielded no candidates, using \"$BOOT_ROOT\""
fi
if [ -z "$ENTRY_TOKEN" ]; then
ENTRY_TOKEN="$MACHINE_ID"
- [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
- echo "No entry-token candidate matched, using \"$ENTRY_TOKEN\" from machine-id"
+ log_verbose "No entry-token candidate matched, using \"$ENTRY_TOKEN\" from machine-id"
fi
if [ -z "$layout" ]; then
@@ -266,8 +264,7 @@ if [ -z "$layout" ]; then
# have no idea what that means, let's stay away from it by default.
layout="other"
fi
- [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
- echo "$BOOT_ROOT/loader/entries.srel with '$ENTRIES_SREL' found, using layout=$layout"
+ log_verbose "$BOOT_ROOT/loader/entries.srel with '$ENTRIES_SREL' found, using layout=$layout"
elif [ -d "$BOOT_ROOT/$ENTRY_TOKEN" ]; then
# If the metadata in $BOOT_ROOT doesn't tell us anything, then check if