Remove check for BootX broken device-trees

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 4c4ceaa20b537e3b707b659485e238af3447d828..5cc33f2a481f9b3b90a72621b50914569a8e364d 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.6-pre2
+VERSION=1.0.7
 DEBUG=0
 export LC_COLLATE=C
 
@@ -314,7 +314,7 @@ scsi_ofpath()
 ide_ofpath()
 {
     if [ ! -L "/proc/ide/$DEVNODE" ] ; then
-       echo 2>&1 "$PRG: /dev/$DEVNODE: Device not configured"
+       echo 1>&2 "$PRG: /dev/$DEVNODE: Device not configured"
        return 1
     fi
 
@@ -326,7 +326,7 @@ ide_ofpath()
 
     case "$(uname -r)" in
        2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*)
-           echo "$PRG: Linux kernel `uname -r` is not supported"
+           echo 1>&2 "$PRG: Linux kernel `uname -r` is not supported"
            return 1
            ;;
        2.6.*|2.7.*)
@@ -336,7 +336,7 @@ ide_ofpath()
            fi
            local SYS="$(m=`grep '.* .* sysfs ' /proc/mounts | head -n 1` ; echo `d=${m#* };echo ${d%% *}`)"
            if [ -z "$SYS" -o ! -d "$SYS" ] ; then
-               echo 2>&1 "$PRG: Unable to determine sysfs mountpoint"
+               echo 1>&2 "$PRG: Unable to determine sysfs mountpoint"
                return 1
            fi
            local OF1275IDE="${SYS}/block/${DEVNODE}/device/../../devspec"
@@ -348,7 +348,7 @@ ide_ofpath()
 
     if [ ! -f "$OF1275IDE" ] ; then
        case "$(cat /proc/device-tree/model)" in
-           PowerMac3*|PowerMac4*|PowerMac5*|PowerMac6*|PowerMac7*|X*)
+           PowerMac3*|PowerMac4*|PowerMac5*|PowerMac6*|PowerMac7*|RackMac*)
                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."
@@ -397,7 +397,7 @@ ide_ofpath()
                local SLAVE="/@$(($(cat /proc/ide/${IDEBUS}/channel) * 2 + 1))"
                ;;
            *)
-               echo 2>&1 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
+               echo 1>&2 "$PRG: Unsupported IDE device type: \"$(cat /proc/device-tree${DEVSPEC}/device_type 2> /dev/null)\""
                return 1
                ;;
        esac
@@ -425,14 +425,6 @@ newworld()
 {
     case "$DEVNODE" in
        sd*)
-           if ls -l /proc/device-tree | grep -q ^lr ; then
-               true
-           else
-               echo 1>&2 "$PRG: /proc/device-tree is broken.  Do not use BootX to boot, use yaboot."
-               echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
-               return 1
-           fi
-
            ## use common scsiinfo function to get info we need.
            scsiinfo || return 1