Attachment 485399 Details for Bug 630434

[patch] My setup-iscsi.sh patch for initrd

setup-iscsi.sh.patch (text/plain), 6.26 KB, created by Lee Duncan on 2012-04-10 01:08:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lee Duncan

Created: 2012-04-10 01:08:38 UTC

Size: 6.26 KB

patch

obsolete

>--- setup-iscsi.sh.orig	2012-02-06 07:44:00.000000000 -0800
>+++ setup-iscsi.sh	2012-04-09 17:28:51.000000000 -0700
>@@ -2,77 +2,133 @@
> #
> #%stage: device
> #
>-check_iscsi_root() {
>-    local devname=$1
>-    local sysfs_path
>-
>-    sysfs_path=$(/sbin/udevadm info -q path -n $devname 2> /dev/null)
>-    if [ -z "$sysfs_path" ] ; then
>-	sysfs_path="/block${devname##/dev}"
>-    fi
>-    if [ ! -d /sys$sysfs_path ] ; then
>-	return;
>+function verify_path()
>+{
>+    local devname="$1" path="$2"
>+
>+    if [[ ! -d "${path}" ]]
>+    then
>+	if [[ "${path}" =~ .+\ .+ ]]
>+	then
>+	    error 2 "iSCSI device ${devname} is connected to more than one iSCSI target!"
>+	    # NEVER REACHED!!
>+	else
>+	    # Does not seem to be an iSCSI attached device
>+	    return 1
>+	fi
>     fi
>+    return 0
>+}
> 
>-    pushd /sys$sysfs_path > /dev/null
>-    if [ ! -d device ] ; then
>-	cd ..
>-    fi
> 
>-    if [ ! -d device ] ; then
>-	# no device link; return
>-	popd > /dev/null
>-	return;
>+function check_iscsi()
>+{
>+    local devname="$1" retval=1
>+    local sysfs_path=$(/sbin/udevadm info -q path -n "${devname}" 2>/dev/null) ip target startup
>+
>+    # Do we have a valid device?
>+    [[ -z "${sysfs_path}" ]] && sysfs_path="/block${devname##/dev}"
>+    sysfs_path="/sys${sysfs_path}"
>+    [[ ! -d "${sysfs_path}" ]] && return 1		# Nope, return false
>+
>+    # Do we have a valid device link?
>+    [[ ! -d "${sysfs_path}/device" ]] && sysfs_path="${sysfs_path%/*}"
>+    [[ ! -d "${sysfs_path}/device" ]] && return 1	# Nope, return false
>+
>+    # Is device an iSCSI device?
>+    sysfs_path="${sysfs_path}/device/../.."
>+
>+    ip="$(echo ${sysfs_path}/connection*)"
>+    verify_path "${devname}" "${ip}" || return 1	# Nope, return false
>+
>+    ip="${ip}/iscsi_connection/${ip##*/}/persistent_"
>+    [[ ! -r "${ip}address" || ! -r "${ip}port" ]] &&
>+	error 2 "iSCSI device ${devname} connected to iSCSI target without any persistent_{address,port}!"
>+    ip="$(cat "${ip}address"):$(cat "${ip}port")"
>+
>+    target=$(echo ${sysfs_path}/iscsi_session/*)
>+    verify_path "${devname}" "${target}" || return 1	# Nope, return false
>+
>+    target="${target}/targetname"
>+    [[ ! -r "${target}" ]] &&
>+	error 2 "iSCSI device ${devname} connected to iSCSI target without any targetname!"
>+    target="$(cat ${target})"
>+
>+    # Yes, figure out whether it has been correctly configured!
>+    [[ ! -x "${_iadm_}" ]] &&
>+	error 2 "iSCSI device ${devname} connected to iSCSI target, but no ${_iadm_} command available!"
>+
>+    startup="$(
>+	${_iadm_} -m node -p "${ip}" -T "${target}" 2>/dev/null | grep 'node.conn\[0\].startup'
>+    )"
>+    startup="${startup##* }"
>+    startup="${startup%% *}"
>+    if [[ "${startup}" != "onboot" ]]
>+    then
>+	[[ -z "${startup}" ]] && return 1	# Oops, no parameter - not an iSCSI, return false
>+
>+	## Either:
>+	#echo >&2 "WARNING: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}',"
>+	#echo >&2 "WARNING: setting it to 'onboot' instead."
>+	#${_iadm_} -m node -p "${ip}" -T "${target}" -o update -n 'node.conn[0].startup' -v onboot
>+
>+	## or:
>+	echo >&2 "WARNING: iSCSI device ${devname} is using 'node.conn[0].startup = ${startup}'!"
>+	echo >&2 "WARNING: System not bootable with this setting, need to be set to 'onboot' instead, using:"
>+	echo >&2 "
>+	${_iadm_} -m node -p '${ip}' -T '${target}' -o update -n 'node.conn[0].startup' -v onboot"
>     fi
> 
>-    cd -P device
>-    cd ../..
>-
>-    if [ -d connection* ]; then
>-	cd -P connection*
>-	cid=${PWD#*connection}
>-	sid=${cid%%:*}
>-	if [ -d /sys/class/iscsi_session/session$sid ]; then
>-	    cd -P /sys/class/iscsi_session/session$sid
>-	    echo $(basename $PWD)
>-	fi
>-    fi
>-    popd > /dev/null
>+    # Yes, is attached to an iSCSI device
>+    return 0
> }
> 
>-for bd in $blockdev; do
>+_iadm_="/sbin/iscsiadm"
>+
>+# Are system device(s) attached to iSCSI devices?
>+# In case they are, ensure
>+#	(1) that the iSCSI gets included in the "initrd"
>+# and
>+#	(2) that the iSCSI sessions have been configured with "node.conn[0].startup = onboot".
>+for bd in $blockdev
>+do
>     update_blockdev $bd
>-    sid=$(check_iscsi_root $bd)
>-    if [ "$sid" ]; then
>-    	root_iscsi=1
>-    	iscsi_sessions="$iscsi_sessions ${sid#session}"
>-    fi
>+    check_iscsi $bd && root_iscsi=1
> done
> 
>+# Are any of the defined file partitions to be mounted at system boot attached to iSCSI devices?
>+# In case they are, ensure
>+#	(1) that the iSCSI gets included in the "initrd"
>+# and
>+#	(2) that the iSCSI sessions have been configured with "node.conn[0].startup = onboot".
>+for bd in $(awk '/^[[:space:]]*(\/dev\/|(LABEL|UUID)=)/ { print $1 }' /etc/fstab)
>+do
>+    bd="${bd/LABEL=//dev/disk/by-label/}"
>+    bd="${bd/UUID=//dev/disk/by-uuid/}"
>+    update_blockdev $bd
>+    check_iscsi $bd && root_iscsi=1
>+done
>+
>+# Include the iSCSI stack, when at least one active iSCSI session has been configured with
>+# "node.conn[0].startup = onboot", even if it was not used for a system device or mounted
>+# partition.
>+if [[ -x "${_iadm_}" ]] ; then
>+    for node in $(${_iadm_} -m node 2>/dev/null | sed -e 's/ /,/g') ; do
>+	[[ "$(
>+		${_iadm_} -m node -T "${node##*,}" -p "${node%%,*}" 2>/dev/null |
>+		grep "node.conn\[0\].startup"
>+	    )" =~ [[:space:]]*=[[:space:]]*onboot ]] && root_iscsi=1
>+    done
>+fi
>+
>+unset _iadm_
>+
> save_var root_iscsi
>-save_var iscsi_sessions
> 
> if [ "${root_iscsi}" ]; then
>-    for session in $iscsi_sessions; do
>-	read TargetName${session} </sys/class/iscsi_session/session${session}/targetname
>-	read TargetAddress${session} </sys/class/iscsi_connection/connection${session}:0/address
>-        TargetAddress=$(< /sys/class/iscsi_connection/connection${session}:0/address)
>-	read TargetPort${session} </sys/class/iscsi_connection/connection${session}:0/port
>-
>-	save_var TargetName${session}
>-	save_var TargetAddress${session}
>-	save_var TargetPort${session}
>-
>-        cmd=ip
>-        case "$TargetAddress" in
>-        *:*)
>-            cmd="ip -6"
>-        esac
>-        interface="$interface $($cmd route get "$TargetAddress" | sed -rn 's/.*\<dev ([^ ]*)\>.*/\1/p; T; q')"
>-        unset TargetAddress cmd
>-    done
>-    # copy the iscsi configuration
>+    # Copy the iscsi configuration
>     cp -rp /etc/iscsi etc/
> 
>-    save_var TargetPort 3260 # in case the port was not defined via command line we assign a default port
>+    # In case target port was not defined via command line, assign default port
>+    save_var TargetPort 3260
> fi

Actions: View | Diff

Attachments on bug 630434: 386537 | 386539 | 450674 | 450695 | 450697 | 450703 | 485398 | 485399 | 485400