Skip to content

Commit 8410ee2

Browse files
aafeijoo-susejohannbg
authored andcommitted
fix(dracut.sh): remove duplicate "dracut:" string in logger functions
dracut-logger functions already prepend the "dracut:" prefix to the message.
1 parent f082dad commit 8410ee2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

dracut.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2413,7 +2413,7 @@ if dracut_module_included "squash"; then
24132413
if ! mksquashfs "$squash_dir" "$squash_img" \
24142414
-no-xattrs -no-exports -noappend -no-recovery -always-use-fragments \
24152415
-no-progress ${squash_compress_arg:+-comp $squash_compress_arg} 1> /dev/null; then
2416-
dfatal "dracut: Failed making squash image"
2416+
dfatal "Failed making squash image"
24172417
exit 1
24182418
fi
24192419
@@ -2473,7 +2473,7 @@ if [[ $create_early_cpio == yes ]]; then
24732473
| cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null \
24742474
${cpio_owner:+-R "$cpio_owner"} -H newc -o --quiet > "${DRACUT_TMPDIR}/initramfs.img"
24752475
); then
2476-
dfatal "dracut: creation of $outfile failed"
2476+
dfatal "Creation of $outfile failed"
24772477
exit 1
24782478
fi
24792479
fi
@@ -2486,13 +2486,13 @@ else
24862486
fi
24872487
24882488
if [[ $compress == $DRACUT_COMPRESS_ZSTD* && ! $DRACUT_KERNEL_RD_ZSTD ]]; then
2489-
dwarn "dracut: kernel has no zstd support compiled in."
2489+
dwarn "Kernel has no zstd support compiled in."
24902490
compress=
24912491
fi
24922492
24932493
if [[ $compress && $compress != cat ]]; then
24942494
if ! command -v "${compress%% *}" &> /dev/null; then
2495-
derror "dracut: cannot execute compression command '$compress', falling back to default"
2495+
derror "Cannot execute compression command '$compress', falling back to default"
24962496
compress=
24972497
fi
24982498
fi
@@ -2506,9 +2506,9 @@ if ! [[ $compress ]]; then
25062506
break
25072507
done
25082508
if [[ $compress == cat ]]; then
2509-
dwarn "dracut: no compression tool available. Initramfs image is going to be big."
2509+
dwarn "No compression tool available. Initramfs image is going to be big."
25102510
else
2511-
dinfo "dracut: using auto-determined compression method '$compress'"
2511+
dinfo "Using auto-determined compression method '$compress'"
25122512
fi
25132513
fi
25142514
@@ -2579,7 +2579,7 @@ else
25792579
| cpio ${CPIO_REPRODUCIBLE:+--reproducible} --null ${cpio_owner:+-R "$cpio_owner"} -H newc -o --quiet \
25802580
| $compress >> "${DRACUT_TMPDIR}/initramfs.img"
25812581
); then
2582-
dfatal "dracut: creation of $outfile failed"
2582+
dfatal "Creation of $outfile failed"
25832583
exit 1
25842584
fi
25852585
fi
@@ -2655,7 +2655,7 @@ else
26552655
dinfo "*** Creating initramfs image file '$outfile' done ***"
26562656
else
26572657
rm -f -- "$outfile"
2658-
dfatal "dracut: creation of $outfile failed"
2658+
dfatal "Creation of $outfile failed"
26592659
exit 1
26602660
fi
26612661
fi
@@ -2707,15 +2707,15 @@ freeze_ok_for_fstype() {
27072707
# globally. See e.g. https://github.com/ostreedev/ostree/commit/8642ef5ab3fec3ac8eb8f193054852f83a8bc4d0
27082708
if [[ -d $dracutsysrootdir/run/systemd/system ]]; then
27092709
if ! sync "$outfile" 2> /dev/null; then
2710-
dinfo "dracut: sync operation on newly created initramfs $outfile failed"
2710+
dinfo "sync operation on newly created initramfs $outfile failed"
27112711
exit 1
27122712
fi
27132713
27142714
# use fsfreeze only if we're not writing to /
27152715
if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
27162716
FSFROZEN="$(dirname "$outfile")"
27172717
if ! (fsfreeze -f "${FSFROZEN}" 2> /dev/null && fsfreeze -u "${FSFROZEN}" 2> /dev/null); then
2718-
dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
2718+
dwarn "Could not fsfreeze $(dirname "$outfile")"
27192719
fi
27202720
unset FSFROZEN
27212721
fi

0 commit comments

Comments
 (0)