Merge pull request #13 from b333z/fix-pooldev

Use new -P to get list of zpool devices

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

@@ -17,27 +17,22 @@ get_pool_devices() {
   local prefix
   local resolved
   poolconfigtemp=`mktemp`
-  @sbindir@/zpool list -v -H "$1" > "$poolconfigtemp" 2>&1
+  @sbindir@/zpool list -v -H -P "$1" > "$poolconfigtemp" 2>&1
   if [ "$?" != "0" ] ; then
     poolconfigoutput=$(cat "$poolconfigtemp")
     dinfo "zfsexpandknowledge: pool $1 cannot be listed: $poolconfigoutput"
   else
     while read pooldev ; do
-      for prefix in /dev/sd* /dev/hd* /dev/disk/* /dev/mapper ; do
-        if [ -n "$pooldev" -a -e "$prefix"/"$pooldev" ] ; then
-          if [   -d "$prefix/$pooldev" ] ; then
-              continue
-          elif [ -h "$prefix/$pooldev" ] ; then
-              resolved=`readlink -f "$prefix"/"$pooldev"`
+        if [ -n "$pooldev" -a -e "$pooldev" ] ; then
+          if [ -h "$pooldev" ] ; then
+              resolved=`readlink -f "$pooldev"`
           else
               resolved="$pooldev"
           fi
-          dinfo "zfsexpandknowledge: pool $1 has device $prefix/$pooldev (which resolves to $resolved)"
+          dinfo "zfsexpandknowledge: pool $1 has device $pooldev (which resolves to $resolved)"
           echo "$resolved"
-          break
         fi
-      done
-    done < <(cat "$poolconfigtemp" | awk -F '\t' 'NR>1 { print $2 }')
+    done < <(cat "$poolconfigtemp" |  awk -F '\t' '/\t\/dev/ { print $2 }')
   fi
   rm -f "$poolconfigtemp"
 }