Attachment 157810 Details for Bug 245645 – Port RHEL5 iscsi boot mkinitrd fixes to fedora.

[patch] Port RHEL5 iscsi boot mkinitrd fixes to fedora.

port-rhel5-iscsi-mkinitrd-fix-to-fc.patch (text/plain), 1.58 KB, created by Mike Christie on 2007-06-25 20:50:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Christie

Created: 2007-06-25 20:50:22 UTC

Size: 1.58 KB

patch

obsolete

>--- mkinitrd.fc7	2007-06-25 15:41:58.000000000 -0500
>+++ mkinitrd.el5	2007-06-25 15:17:06.000000000 -0500
>@@ -526,7 +366,8 @@ iscsi_get_rec_val() {
>     # The open-iscsi 742 release changed to using flat files in
>     # /var/lib/iscsi.
> 
>-    result=$(grep "^${2} = " "$1" |  sed -e s'/.* = //')
>+    result=$(/sbin/iscsiadm --show -m session -r ${1} | grep "^${2} = " | \
>+        sed -e 's/.* = //')
> }
> 
> iscsi_set_parameters() {
>@@ -535,23 +376,20 @@ iscsi_set_parameters() {
> 
>     # Check once before getting explicit values, so we can output a decent
>     # error message.
>-    declare -a iparams=( $(/sbin/iscsiadm -m session 2>/dev/null) )
>-    if [[ -z "${iparams[*]}" ]]; then
>+
>+    if ! /sbin/iscsiadm -m session -r ${path} >/dev/null ; then
>         echo Unable to find iscsi record for $path
>         exit 1
>     fi
>+
>     nit_name=$(grep "^InitiatorName=" /etc/iscsi/initiatorname.iscsi | \
>         sed -e "s/^InitiatorName=//")
> 
>-    tgt_name=${iparams[3]}
>-    # edit ipaddr:port,portalgrp -> ipaddr,port,portalgrp
>-    iportal=${iparams[2]/:/,}
>-    declare -a ipt=( $(echo ${iportal//,/ }) )
>-    tgt_ipaddr=${ipt[0]}
>-    tgt_port=${ipt[1]}
>-    tpgt=${ipt[2]}
> 
>-    path=/var/lib/iscsi/nodes/${tgt_name}/${tgt_ipaddr},${tgt_port}
>+    iscsi_get_rec_val $path "node.name"; tgt_name=${result}
>+    iscsi_get_rec_val $path "node.tpgt"; tpgt=${result}
>+    iscsi_get_rec_val $path "node.conn\[0\].address"; tgt_ipaddr=${result}
>+    iscsi_get_rec_val $path "node.conn\[0\].port"; tgt_port=${result}
> 
>     # Note: we get chap secrets (passwords) in plaintext, and also store
>     # them in the initrd.

Actions: View | Diff

Attachments on bug 245645: 157810