X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ybin%2Fybin;h=70c0bcbea48112aae077acb7eebc2385725af2a2;hb=0e48da7ef41c6fc36f80f44e5e4a329000412f88;hp=44e63f4468090698d9b62b22f9c76f00561e7850;hpb=e7532e2d520fc84bf9c68fd6b94cf0d3b20cf2b1;p=yaboot.git

diff --git a/ybin/ybin b/ybin/ybin
index 44e63f4..70c0bcb 100755
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -29,7 +29,7 @@ fi
 PRG="${0##*/}"
 ABSPRG="$0"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.16
+VERSION=1.3.17
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"
@@ -73,7 +73,9 @@ fi
 
 ## defaults
 usemount=no
-if (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
+if (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'pSeries') ; then
+    fstype=raw
+elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'PowerNV') ; then
     fstype=raw
 else
     fstype=hfs
@@ -504,7 +506,11 @@ checkconf()
 	echo 1>&2
 	[ "$nonvram" = 0 ] && echo 1>&2 "$PRG: OldWorld PowerMac, nvram will not be updated"
 	nonvram=1
-    elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
+    elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'pSeries') ; then
+	## IBM hardware does not need nvram update AFAICT
+	nonvram=1
+	ADDNOTE=yes
+    elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'PowerNV') ; then
 	## IBM hardware does not need nvram update AFAICT
 	nonvram=1
 	ADDNOTE=yes