Update ofpath for new devspec export in /proc

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 426285d8729b79314a3c791d144ff4dc4a52f6a0..be3f8cd4d8f55f2281acb9f56ffc802feb799cd1 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-1
+VERSION=1.0.3-DEVEL_DO_NOT_DISTRIBUTE-patch-36
 DEBUG=0
 export LC_COLLATE=C
 
@@ -296,7 +296,13 @@ scsi_ofpath()
 
 ide_ofpath()
 {
-    local OF1275IDE=/proc/ide/of1275
+    if [ ! -L "/proc/ide/$DEVNODE" ] ; then
+       echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured"
+       return 1
+    fi
+
+    local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
+    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
 
     if [ ! -f "$OF1275IDE" ] ; then
        case "$(cat /proc/device-tree/model)" in
@@ -326,33 +332,14 @@ ide_ofpath()
                ;;
        esac
     else
-       if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-           echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured"
-           return 1
-       fi
-
-       local IDEBUS="$(v=`readlink /proc/ide/$DEVNODE` ; echo ${v%%/*} )"
-       [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: IDEBUS=$IDEBUS"
-       local NUMBUSSES="$(($(linecount $OF1275IDE) / 5))"
-       [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: NUMBUSSES=$NUMBUSSES"
-       if [ "$((${IDEBUS##ide} + 1))" -gt "$NUMBUSSES" ] ; then
-           echo 1>&2 "$PRG: /dev/$DEVNODE is not supported"
-           return 1
-       fi
-       local IDEDEV="$(head -n $((5 * $((${IDEBUS##ide} + 1)))) $OF1275IDE | tail -n 5)"
-       [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: IDEDEV=$IDEDEV"
-       if [ "$(echo "$IDEDEV" | head -n 1)" != "$IDEBUS" ] ; then
-           echo "$PRG: /dev/$DEVNODE: is not supported"
-           return 1
-       fi
-       local DEVSPEC="$(v=`echo "$IDEDEV" | grep devspec` ; echo ${v##*:})"
+       local DEVSPEC="$(cat /proc/ide/$IDEBUS/devspec)"
        [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"
        case "$DEVNODE" in
-           hda|hdc|hde|hdg)
+           hda|hdc|hde|hdg|hdi)
                echo "${DEVSPEC}/disk@0:$PARTITION"
                return 0
                ;;
-           hdb|hdd|hdf|hdh)
+           hdb|hdd|hdf|hdh|hdj)
                echo "${DEVSPEC}/disk@1:$PARTITION"
                return 0
                ;;