Skip to content

Commit 626a792

Browse files
nabijaczlewelibehlendorf
authored andcommitted
contrib/dracut: 02: don't spill device names across multiple lines
Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #11898
1 parent a9c93ac commit 626a792

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/dracut/02zfsexpandknowledge/module-setup.sh.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ if [[ $hostonly ]]; then
100100
mountpoint "$mp" >/dev/null 2>&1 || continue
101101
blockdevs=$(find_zfs_block_devices "$mp")
102102
if [ -z "$blockdevs" ] ; then continue ; fi
103-
dinfo "zfsexpandknowledge: block devices backing ZFS dataset $mp: $blockdevs"
103+
dinfo "zfsexpandknowledge: block devices backing ZFS dataset $mp: ${blockdevs//$'\n'/ }"
104104
for dev in $blockdevs
105105
do
106106
array_contains "$dev" "${host_devs[@]}" || host_devs+=("$dev")
@@ -114,7 +114,7 @@ if [[ $hostonly ]]; then
114114
_depdevname=$(udevadm info --query=property --name="$_depdev" | grep "^DEVNAME=" | sed 's|^DEVNAME=||')
115115
_depdevtype=$(get_devtype "$_depdevname")
116116
_depmajmin=$(get_maj_min "$_depdevname")
117-
dinfo "zfsexpandknowledge: underlying block device backing ZFS dataset $mp: $_depdevname"
117+
dinfo "zfsexpandknowledge: underlying block device backing ZFS dataset $mp: ${_depdevname//$'\n'/ }"
118118
array_contains "$_depdevname" "${host_devs[@]}" || host_devs+=("$_depdevname")
119119
host_fs_types["$_depdevname"]="$_depdevtype"
120120
done

0 commit comments

Comments
 (0)