Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

contrib/dracut: 02: don't spill device names across multiple lines 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #11898
This commit is contained in:
наб 2021-04-13 22:31:26 +02:00 committed by Brian Behlendorf
parent a9c93ac533
commit 626a792bb3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
View File

@ -100,7 +100,7 @@ if [[ $hostonly ]]; then
mountpoint "$mp" >/dev/null 2>&1 || continue mountpoint "$mp" >/dev/null 2>&1 || continue
blockdevs=$(find_zfs_block_devices "$mp") blockdevs=$(find_zfs_block_devices "$mp")
if [ -z "$blockdevs" ] ; then continue ; fi 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 for dev in $blockdevs
do do
array_contains "$dev" "${host_devs[@]}" || host_devs+=("$dev") 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=||') _depdevname=$(udevadm info --query=property --name="$_depdev" | grep "^DEVNAME=" | sed 's|^DEVNAME=||')
_depdevtype=$(get_devtype "$_depdevname") _depdevtype=$(get_devtype "$_depdevname")
_depmajmin=$(get_maj_min "$_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") array_contains "$_depdevname" "${host_devs[@]}" || host_devs+=("$_depdevname")
host_fs_types["$_depdevname"]="$_depdevtype" host_fs_types["$_depdevname"]="$_depdevtype"
done done