Bump version to unsupported non-release status

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index c0d1cb12a923c291e29a7ee53ba519717f90be50..387bf900659cd9570d271f5eeff84285223fe904 100755 (executable)
--- a/ybin/ofpath
+++ b/ybin/ofpath
@@ -3,7 +3,7 @@
 ###############################################################################
 ##
 ## ofpath: determine OpenFirmware path from unix device node
-## Copyright (C) 2000, 2001, 2002 Ethan Benson
+## Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson
 ##
 ## Portions based on show_of_path.sh:
 ##
@@ -27,7 +27,7 @@
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 PRG="${0##*/}"
-VERSION=1.0.3-rc3
+VERSION=1.0.4
 DEBUG=0
 export LC_COLLATE=C
 
@@ -39,7 +39,7 @@ echo \
 Written by Ethan Benson
 Portions based on show_of_path.sh written by Olaf Hering
 
-Copyright (C) 2000, 2001, 2002 Ethan Benson
+Copyright (C) 2000, 2001, 2002, 2003 Ethan Benson
 Portions Copyright (C) 2000 Olaf Hering
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -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
@@ -313,6 +313,7 @@ ide_ofpath()
            "PowerMac3,6")
                local CDROM="$(grep "^drive name:" /proc/sys/dev/cdrom/info 2> /dev/null | grep $DEVNODE)"
                if [ -z "$CDROM" ] ; then
+                   echo 1>&2 "$PRG: WARNING: Your kernel is too old for proper support, device may be innaccurate."
                    echo "ultra2:$PARTITION"
                else
                    echo "cd:$PARTITION"
@@ -345,11 +346,11 @@ ide_ofpath()
        fi
 
        case "$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)" in
-           ata)
+           ide|ata)
                local MASTER="/disk@0"
                local SLAVE="/disk@1"
                ;;
-           pci-ata)
+           pci-ide|pci-ata)
                local MASTER="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@0"
                local SLAVE="/@$(cat /proc/ide/${IDEBUS}/channel)/disk@1"
                ;;