X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fybin;h=b333e9186920c912187b9a1fc0567c0eddd04f0e;hp=241d2419739ba228dd91a1a6789adf3c997b8db3;hb=2ad0d7649e5042cad43a16b4a03bf53f39948316;hpb=0ef1539b6f680ba09c88be5bb94a821fd2599931

diff --git a/ybin/ybin b/ybin/ybin
index 241d241..b333e91 100755
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -28,7 +28,7 @@ if [ -n "$PATH_PREFIX" ] ; then
 fi
 PRG="${0##*/}"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.4
+VERSION=1.3.6
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"
@@ -65,7 +65,11 @@ fi
 
 ## defaults
 usemount=no
-fstype=hfs
+if (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
+    fstype=raw
+else
+    fstype=hfs
+fi
 hfstype=tbxi
 hfscreator=UNIX
 bless=yes
@@ -166,19 +170,6 @@ Update/install bootloader onto a bootstrap partition.
                                this is useful of you don't want them to be
                                visible from MacOS.
       --nonvram              do not update the boot-device variable in nvram.
-      --device               yaboot auto configuration: sets the OF boot device
-			       default: hd:
-      --partition            yaboot auto configuration: sets the partition
-			       number of the root partition. default: 3
-      --timeout              yaboot auto configuration: sets the time yaboot
-			       will wait for user input before booting default
-                               image default: 40 (4 seconds)
-      --image                yaboot auto configuration: sets the path to the
-			       kernel image. default: /vmlinux
-      --label                yaboot auto configuration: sets the image label
-                               default: Linux
-      --root                 yaboot auto configuration: sets the root device
-                               default: /dev/hda3
       --force                don't ever ask for confirmation
   -v, --verbose              make $PRG more verbose
       --debug                print boring junk only useful for debugging
@@ -1440,6 +1431,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    device="$2"
 		    bootconf=auto
+		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1451,6 +1443,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    timeout="$2"
 		    bootconf=auto
+		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1462,6 +1455,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    image="$2"
 		    bootconf=auto
+		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1473,6 +1467,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    label="$2"
 		    bootconf=auto
+		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1484,6 +1479,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    partition="$2"
 		    bootconf=auto
+		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"
@@ -1495,6 +1491,7 @@ if [ $# != 0 ] ; then
 		if [ -n "$2" ] ; then
 		    root="$2"
 		    bootconf=auto
+		    echo 1>&2 "$PRG: WARNING: Deprecated option --device"
 		    shift 2
 		else
 		    echo 1>&2 "$PRG: option requires an argument $1"