use iscsi-iname to generate the initiator name, if not specified

diff --git a/modules.d/95iscsi/check b/modules.d/95iscsi/check
index d5f0912311ff26ad3b75724a75b1fad36f3b05cb..274a49b9559cb2cef691a286b3024bc9d9b44b36 100755 (executable)
--- a/modules.d/95iscsi/check
+++ b/modules.d/95iscsi/check
@@ -7,5 +7,5 @@
 #[ "$1" = "-h" ] && ! egrep -q '/ /dev/nbd[0-9]*' /proc/mounts && exit 1
 
 # If our prerequisites are not met, fail anyways.
-which iscsistart hostname >/dev/null 2>&1 || exit 1
+which iscsistart hostname iscsi-iname >/dev/null 2>&1 || exit 1
 exit 0

diff --git a/modules.d/95iscsi/install b/modules.d/95iscsi/install
index 4f93c628e9c1faad1dd87ddcf5d9bfc90f0ce7d7..cd4a3ca0227c358429a4cdfa41d845b5618d5f26 100755 (executable)
--- a/modules.d/95iscsi/install
+++ b/modules.d/95iscsi/install
@@ -2,6 +2,7 @@
 
 inst iscsistart 
 inst hostname
+inst iscsi-iname
 inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
 inst_hook netroot 90 "$moddir/iscsi-netroot.sh"
 inst "$moddir/iscsiroot" "/sbin/iscsiroot"

diff --git a/modules.d/95iscsi/iscsiroot b/modules.d/95iscsi/iscsiroot
index dd7416fe550f5e9f2335543e33b5178da6b249cf..2fdc281ed56989c5d56c18ec2d9873701eebac9b 100755 (executable)
--- a/modules.d/95iscsi/iscsiroot
+++ b/modules.d/95iscsi/iscsiroot
@@ -87,17 +87,7 @@ else
        fi
 
        if [ -z $iscsi_initiator ]; then
-               [ -f /tmp/net.$netif.dhcpopts ] && . /tmp/net.$netif.dhcpopts
-               hostname=$new_host_name
-               [ -z "$hostname" ] && hostname=arpa.in-addr.$new_ip_address
-               OLDIFS="$IFS"
-               IFS=.
-               unset revname
-               for i in $hostname; do 
-                       revname=${i}${revname+.$revname}
-               done
-               IFS="$OLDIFS"
-               iscsi_initiator=iqn.2009-01.$revname
+               iscsi_initiator=$(iscsi-iname)
        fi
 
        echo "InitiatorName='$iscsi_initiator'" > /dev/.initiatorname.iscsi