kpartx_id: Generate persistent symlinks for 'wwn'

Newer udev versions generate /dev/disk/by-id/wwn-* symlinks.
We should be adjusting those for multipathing, too.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules
index 8640094..b96ec89 100644 (file)
--- a/kpartx/kpartx.rules
+++ b/kpartx/kpartx.rules
@@ -20,12 +20,16 @@ ENV{DM_UUID}=="mpath-*", \
        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
 ENV{DM_MPATH}=="?*", ENV{DM_PART}!="?*", \
        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_MPATH}"
        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}"
 ENV{DM_MPATH}=="?*", ENV{DM_PART}!="?*", \
        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_MPATH}"

+ENV{DM_WWN}=="?*", ENV{DM_PART}!="?*", \
+       SYMLINK+="disk/by-id/wwn-$env{DM_WWN}"

 
 # Create persistent links for partitions
 ENV{DM_PART}=="?*", \
         SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}-part$env{DM_PART}"
 ENV{DM_MPATH}=="?*", ENV{DM_PART}=="?*", \
        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_MPATH}-part$env{DM_PART}"
 
 # Create persistent links for partitions
 ENV{DM_PART}=="?*", \
         SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_NAME}-part$env{DM_PART}"
 ENV{DM_MPATH}=="?*", ENV{DM_PART}=="?*", \
        SYMLINK+="disk/by-id/$env{DM_TYPE}-$env{DM_MPATH}-part$env{DM_PART}"

+ENV{DM_WWN}=="?*", ENV{DM_PART}=="?*", \
+       SYMLINK+="disk/by-id/wwn-$env{DM_WWN}-part$env{DM_PART}"

 
 # Create dm tables for partitions
 ENV{DM_STATE}!="SUSPENDED", ENV{DM_UUID}=="mpath-*", \
 
 # Create dm tables for partitions
 ENV{DM_STATE}!="SUSPENDED", ENV{DM_UUID}=="mpath-*", \

diff --git a/kpartx/kpartx_id b/kpartx/kpartx_id
index afb589c..47fab1a 100644 (file)
--- a/kpartx/kpartx_id
+++ b/kpartx/kpartx_id
@@ -69,6 +69,7 @@ elif [ "$dmtbl" = "mpath" ] ; then
     if [ -n "$DM_NAME" -a "$DM_NAME" != "$dmuuid" ] ; then
        echo "DM_MPATH=$dmuuid"
     fi
     if [ -n "$DM_NAME" -a "$DM_NAME" != "$dmuuid" ] ; then
        echo "DM_MPATH=$dmuuid"
     fi

+    dmname="$dmuuid"

     # We need the dependencies of the table to figure out the type
     dmdeps=$($DMSETUP deps -u $UUID)
 elif [ "$dmtbl" = "dmraid" ] ; then
     # We need the dependencies of the table to figure out the type
     dmdeps=$($DMSETUP deps -u $UUID)
 elif [ "$dmtbl" = "dmraid" ] ; then


@@ -92,6 +93,7 @@ if [ -n "$dmdeps" ] ; then
            ;;
        *)
             echo "DM_TYPE=scsi"
            ;;
        *)
             echo "DM_TYPE=scsi"

+           echo "DM_WWN=0x${dmname#?}"

            ;;
     esac
 else
            ;;
     esac
 else