Fix readlink fallback

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 426285d8729b79314a3c791d144ff4dc4a52f6a0..0a52ba8f6863e2b3efe23c19c6171fd34063d02b 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-rc3
 DEBUG=0
 export LC_COLLATE=C
 
@@ -149,7 +149,7 @@ if (command -v readlink > /dev/null 2>&1) ; then
 else
     readlink()
     {
-        local SYMTARGET="$(v=`ls -l "$2" 2>/dev/null` ; echo ${v##*> })"
+        local SYMTARGET="$(v=`ls -l "$1" 2>/dev/null` ; echo ${v##*> })"
         if [ -n "$SYMTARGET" ] ; then
             echo "$SYMTARGET"
             return 0
@@ -296,7 +296,17 @@ 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%%/*} )"
+    if [ -z "$IDEBUS" ] ; then
+       echo 1>&2 "$PRG: BUG: IDEBUS == NULL"
+       return 1
+    fi
+    local OF1275IDE="/proc/ide/$IDEBUS/devspec"
 
     if [ ! -f "$OF1275IDE" ] ; then
        case "$(cat /proc/device-tree/model)" in
@@ -309,10 +319,6 @@ ide_ofpath()
                fi
                ;;
            *)
-               if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-                   echo "$PRG: /dev/$DEVNODE: Device not configured"
-                   return 1
-               fi
                local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
                if [ -z "$CDROM" ] ; then
                    if [ "$DEVNODE" = hda ] ; then
@@ -326,34 +332,44 @@ ide_ofpath()
                ;;
        esac
     else
-       if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-           echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured"
+       local DEVSPEC="$(cat $OF1275IDE)"
+       [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"
+       if [ -z "$DEVSPEC" ] ; then
+           echo 1>&2 "$PRG: KERNEL BUG: $OF1275IDE exists, but is empty"
            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"
+       if [ ! -f "/proc/ide/${IDEBUS}/channel" ] ; then
+           echo 1>&2 "$PRG: KERNEL BUG: /proc/ide/${IDEBUS}/channel does not exist"
            return 1
        fi
-       local DEVSPEC="$(v=`echo "$IDEDEV" | grep devspec` ; echo ${v##*:})"
-       [ "$DEBUG" = 1 ] && echo 1>&2 "$PRG: DEBUG: DEVSPEC=$DEVSPEC"
+
+       case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
+           ata)
+               local MASTER="/disk@0"
+               local SLAVE="/disk@1"
+               ;;
+           pci-ata)
+               local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
+               local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
+               ;;
+           scsi) ## some lame controllers pretend they are scsi, hopefully all kludges are created equal.
+               local MASTER="/$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 0)),0"
+               local SLAVE="/$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1)),0"
+               ;;
+           *)
+               echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+               return 1
+               ;;
+       esac
+
        case "$DEVNODE" in
-           hda|hdc|hde|hdg)
-               echo "${DEVSPEC}/disk@0:$PARTITION"
+           hda|hdc|hde|hdg|hdi|hdk|hdm|hdo)
+               echo "${DEVSPEC}${MASTER}:$PARTITION"
                return 0
                ;;
-           hdb|hdd|hdf|hdh)
-               echo "${DEVSPEC}/disk@1:$PARTITION"
+           hdb|hdd|hdf|hdh|hdj|hdl|hdn|hdp)
+               echo "${DEVSPEC}${SLAVE}:$PARTITION"
                return 0
                ;;
            *)