Add LABEL/UUID support to yabootconfig

[yaboot.git] / ybin / ofpath

diff --git a/ybin/ofpath b/ybin/ofpath
index 0625c387c6c25873fcd1e4f2ff0fc0b38a068a93..d596b8b226eb14c4ed7ea997203ce7ea67b77911 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-pre1
+VERSION=1.0.6
 DEBUG=0
 export LC_COLLATE=C
 
@@ -297,7 +297,7 @@ scsi_ofpath()
            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
            echo "${DEVICE_PATH##*device-tree}/@$DEVICE_ID:$PARTITION"
            ;;
-       ata_k2)
+       ata_k2|sata_svw)
            HOST_LIST="$(for i in `find /proc/device-tree -name compatible` ; do
                        lgrep "$i" "k2-s-ata" ; done)"
            DEVICE_PATH="$(printhost $SCSI_HOSTNUMBER $HOST_LIST)"
@@ -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
 
@@ -325,18 +325,18 @@ ide_ofpath()
     fi
 
     case "$(uname -r)" in
-       2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*|2.6.3|2.6.3-*)
-           echo "$PRG: Linux kernel `uname -r` is not supported"
+       2.5.*|2.6.0*|2.6.1|2.6.1-*|2.6.2|2.6.2-*)
+           echo 1>&2 "$PRG: Linux kernel `uname -r` is not supported"
            return 1
            ;;
        2.6.*|2.7.*)
-           if ! (grep -q ^sysfs /proc/mounts 2> /dev/null) ; then
+           if ! (grep -q '.* .* sysfs ' /proc/mounts 2> /dev/null) ; then
                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%% *}`)"
+           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