Skip to content

Commit 9c67b6a

Browse files
contrib/dracut: 90: generator: only log to kmsg if debug set on cmdline
"debug" is also used by systemd itself, and there's really no reason for the generator to write this much garbage by default Signed-off-by: Ahelenia Ziemiańska <[email protected]>
1 parent 24525e7 commit 9c67b6a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

contrib/dracut/90zfs/zfs-generator.sh.in

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/sh
22

3-
echo "zfs-generator: starting" >> /dev/kmsg
3+
grep -wq debug /proc/cmdline && debug=1
4+
[ -n "$debug" ] && echo "zfs-generator: starting" >> /dev/kmsg
45

56
GENERATOR_DIR="$1"
67
[ -n "$GENERATOR_DIR" ] || {
@@ -12,7 +13,7 @@ GENERATOR_DIR="$1"
1213
[ -f /usr/lib/dracut/modules.d/99base/dracut-lib.sh ] && dracutlib=/usr/lib/dracut/modules.d/99base/dracut-lib.sh
1314

1415
command -v getarg >/dev/null 2>&1 || {
15-
echo "zfs-generator: loading Dracut library from $dracutlib" >> /dev/kmsg
16+
[ -n "$debug" ] && echo "zfs-generator: loading Dracut library from $dracutlib" >> /dev/kmsg
1617
. "$dracutlib"
1718
}
1819

@@ -34,7 +35,7 @@ case ",${rootflags}," in
3435
*) rootflags="zfsutil,${rootflags}" ;;
3536
esac
3637

37-
echo "zfs-generator: writing extension for sysroot.mount to $GENERATOR_DIR"/sysroot.mount.d/zfs-enhancement.conf >> /dev/kmsg
38+
[ -n "$debug" ] && echo "zfs-generator: writing extension for sysroot.mount to $GENERATOR_DIR/sysroot.mount.d/zfs-enhancement.conf" >> /dev/kmsg
3839

3940
[ -d "$GENERATOR_DIR" ] || mkdir "$GENERATOR_DIR"
4041
[ -d "$GENERATOR_DIR"/sysroot.mount.d ] || mkdir "$GENERATOR_DIR"/sysroot.mount.d
@@ -67,4 +68,6 @@ ln -s ../sysroot.mount "$GENERATOR_DIR"/initrd-root-fs.target.requires/sysroot.m
6768
echo "After=zfs-import.target"
6869
} > "$GENERATOR_DIR"/dracut-pre-mount.service.d/zfs-enhancement.conf
6970

70-
echo "zfs-generator: finished" >> /dev/kmsg
71+
[ -n "$debug" ] && echo "zfs-generator: finished" >> /dev/kmsg
72+
73+
exit 0

0 commit comments

Comments
 (0)