Attachment 161107 Details for Bug 251771 – make ofpath not require /proc/ide

[patch] make ofpath not require /proc/ide

ofpath-no-proc-ide.patch (text/plain), 1.70 KB, created by David Woodhouse on 2007-08-11 06:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-08-11 06:13:27 UTC

Size: 1.70 KB

patch

obsolete

>--- /sbin/ofpath	2006-11-16 21:08:34.000000000 +0800
>+++ hacked-ofpath	2007-08-11 13:57:38.000000000 +0800
>@@ -337,15 +337,20 @@ scsi_ofpath()
> 
> ide_ofpath()
> {
>-    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
>+    local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)"
>+
>+    if [ ! -L "/proc/ide/$DEVNODE" -a ! -d "${SYS}/block/$DEVNODE" ] ; then
> 	echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
> 	return 1
>     fi
> 
>     local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
>     if [ -z "$IDEBUS" ] ; then
>-	echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
>-	return 1
>+        local IDEBUS=$(v=`readlink ${SYS}/block/$DEVNODE/device`; w=${v%/*}; echo ${w##*/})
>+	if [ -z "$IDEBUS" ] ; then
>+	    echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
>+	    return 1
>+        fi
>     fi
> 
>     case "$(uname -r)" in
>@@ -358,7 +363,6 @@ ide_ofpath()
> 		echo 1>&2 "$PRG: sysfs must be mounted for ofpath to support this system"
> 		return 1
> 	    fi
>-	    local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)"
> 	    if [ -z "$SYS" -o ! -d "$SYS" ] ; then
> 		echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
> 		return 1
>@@ -402,11 +406,12 @@ ide_ofpath()
> 	    return 1
> 	fi
> 
>-	if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
>+	local DEVTYPE=$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)
>+	if [ "$DEVTYPE" != "ide" -a "$DEVTYPE" != "ata" -a -f "/proc/ide/${IDEBUS}/channel" ] ; then
> 	    echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
> 	    return 1
> 	fi
>-	case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
>+	case "$DEVTYPE" in
> 	    ide|ata)
> 		local MASTER="/disk@0"
> 		local SLAVE="/disk@1"

Actions: View | Diff

Attachments on bug 251771: 161107