X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ybin%2Fofpath;h=ea1a7fa81d3b7cefdfbc96ef3410f949e8689cd6;hb=5a1d6ab9e290804deea3bfd4f888709a732b3f58;hp=287cdb1b5374eea65ec28814d14514469dbfa312;hpb=c8468c1549669e3f06387ab6a162e5d6498c6de7;p=tonyb-yaboot.git diff --git a/ybin/ofpath b/ybin/ofpath index 287cdb1..ea1a7fa 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.3-rc2 +VERSION=1.0.3-rc4 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 @@ -349,7 +349,7 @@ ide_ofpath() 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" ;; @@ -364,11 +364,11 @@ ide_ofpath() esac case "$DEVNODE" in - hda|hdc|hde|hdg|hdi) + hda|hdc|hde|hdg|hdi|hdk|hdm|hdo) echo "${DEVSPEC}${MASTER}:$PARTITION" return 0 ;; - hdb|hdd|hdf|hdh|hdj) + hdb|hdd|hdf|hdh|hdj|hdl|hdn|hdp) echo "${DEVSPEC}${SLAVE}:$PARTITION" return 0 ;;