diff options
| author | наб <[email protected]> | 2021-04-13 22:31:26 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-04-16 15:23:35 -0700 |
| commit | 626a792bb37231d1257e5948efa69466f9840f60 (patch) | |
| tree | 7342bdbbd651fb13827db972d0d0fd66cfdddaae | |
| parent | a9c93ac533488b78262e86821f04a22cac8be76d (diff) | |
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
| -rwxr-xr-x | contrib/dracut/02zfsexpandknowledge/module-setup.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in index 8429bd109..f4b7b8cdc 100755 --- a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in +++ b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in @@ -100,7 +100,7 @@ if [[ $hostonly ]]; then mountpoint "$mp" >/dev/null 2>&1 || continue blockdevs=$(find_zfs_block_devices "$mp") if [ -z "$blockdevs" ] ; then continue ; fi - dinfo "zfsexpandknowledge: block devices backing ZFS dataset $mp: $blockdevs" + dinfo "zfsexpandknowledge: block devices backing ZFS dataset $mp: ${blockdevs//$'\n'/ }" for dev in $blockdevs do array_contains "$dev" "${host_devs[@]}" || host_devs+=("$dev") @@ -114,7 +114,7 @@ if [[ $hostonly ]]; then _depdevname=$(udevadm info --query=property --name="$_depdev" | grep "^DEVNAME=" | sed 's|^DEVNAME=||') _depdevtype=$(get_devtype "$_depdevname") _depmajmin=$(get_maj_min "$_depdevname") - dinfo "zfsexpandknowledge: underlying block device backing ZFS dataset $mp: $_depdevname" + dinfo "zfsexpandknowledge: underlying block device backing ZFS dataset $mp: ${_depdevname//$'\n'/ }" array_contains "$_depdevname" "${host_devs[@]}" || host_devs+=("$_depdevname") host_fs_types["$_depdevname"]="$_depdevtype" done |