Skip to content

Commit

Permalink
fix(dracut.sh): remove duplicate "dracut:" string in logger functions
Browse files Browse the repository at this point in the history
dracut-logger functions already prepend the "dracut:" prefix to the message.
  • Loading branch information
aafeijoo-suse authored and johannbg committed Aug 26, 2022
1 parent f082dad commit 8410ee2
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions dracut.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2413,7 +2413,7 @@ if dracut_module_included "squash"; then
if ! mksquashfs "$squash_dir" "$squash_img" \
-no-xattrs -no-exports -noappend -no-recovery -always-use-fragments \
-no-progress ${squash_compress_arg:+-comp $squash_compress_arg} 1> /dev/null; then
dfatal "dracut: Failed making squash image"
dfatal "Failed making squash image"
exit 1
fi
Expand Down Expand Up @@ -2473,7 +2473,7 @@ if [[ $create_early_cpio == yes ]]; then
| cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null \
${cpio_owner:+-R "$cpio_owner"} -H newc -o --quiet > "${DRACUT_TMPDIR}/initramfs.img"
); then
dfatal "dracut: creation of $outfile failed"
dfatal "Creation of $outfile failed"
exit 1
fi
fi
Expand All @@ -2486,13 +2486,13 @@ else
fi
if [[ $compress == $DRACUT_COMPRESS_ZSTD* && ! $DRACUT_KERNEL_RD_ZSTD ]]; then
dwarn "dracut: kernel has no zstd support compiled in."
dwarn "Kernel has no zstd support compiled in."
compress=
fi
if [[ $compress && $compress != cat ]]; then
if ! command -v "${compress%% *}" &> /dev/null; then
derror "dracut: cannot execute compression command '$compress', falling back to default"
derror "Cannot execute compression command '$compress', falling back to default"
compress=
fi
fi
Expand All @@ -2506,9 +2506,9 @@ if ! [[ $compress ]]; then
break
done
if [[ $compress == cat ]]; then
dwarn "dracut: no compression tool available. Initramfs image is going to be big."
dwarn "No compression tool available. Initramfs image is going to be big."
else
dinfo "dracut: using auto-determined compression method '$compress'"
dinfo "Using auto-determined compression method '$compress'"
fi
fi
Expand Down Expand Up @@ -2579,7 +2579,7 @@ else
| cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null ${cpio_owner:+-R "$cpio_owner"} -H newc -o --quiet \
| $compress >> "${DRACUT_TMPDIR}/initramfs.img"
); then
dfatal "dracut: creation of $outfile failed"
dfatal "Creation of $outfile failed"
exit 1
fi
fi
Expand Down Expand Up @@ -2655,7 +2655,7 @@ else
dinfo "*** Creating initramfs image file '$outfile' done ***"
else
rm -f -- "$outfile"
dfatal "dracut: creation of $outfile failed"
dfatal "Creation of $outfile failed"
exit 1
fi
fi
Expand Down Expand Up @@ -2707,15 +2707,15 @@ freeze_ok_for_fstype() {
# globally. See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
if ! sync "$outfile" 2> /dev/null; then
dinfo "dracut: sync operation on newly created initramfs $outfile failed"
dinfo "sync operation on newly created initramfs $outfile failed"
exit 1
fi
# use fsfreeze only if we're not writing to /
if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
FSFROZEN="$(dirname "$outfile")"
if ! (fsfreeze -f "${FSFROZEN}" 2> /dev/null && fsfreeze -u "${FSFROZEN}" 2> /dev/null); then
dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
dwarn "Could not fsfreeze $(dirname "$outfile")"
fi
unset FSFROZEN
fi
Expand Down

0 comments on commit 8410ee2

Please sign in to comment.