X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fofpath;h=4c4ceaa20b537e3b707b659485e238af3447d828;hp=0625c387c6c25873fcd1e4f2ff0fc0b38a068a93;hb=eb8b0d5d9f4823a7033ef2baa1cababd4b5574e1;hpb=53695b2ef3f2fbf757b26c66ad3fa45ccb6b93e6

diff --git a/ybin/ofpath b/ybin/ofpath
index 0625c38..4c4ceaa 100755
--- 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-pre2
 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)"
@@ -325,16 +325,16 @@ 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-*)
+	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"
 	    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"
 		return 1