diff options
Diffstat (limited to 'distrib/hp300/ramdisk/install.md')
-rw-r--r-- | distrib/hp300/ramdisk/install.md | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index 271aadca727..9d021888e8c 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.3 1997/02/23 19:10:52 downsj Exp $ +# $OpenBSD: install.md,v 1.4 1997/04/21 07:32:11 downsj Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -275,7 +275,7 @@ __scsi_label_1 getresp "" disklabel -W ${1} - if ! disklabel -e /dev/r${1}a; then + if ! disklabel -r -e /dev/r${1}a; then echo "" echo "ERROR: can't fixup geometry!" rval="1" @@ -371,7 +371,7 @@ md_labeldisk() { 0) # Go ahead and just edit the disklabel. disklabel -W $1 - disklabel -e $1 + disklabel -r -e $1 ;; *) @@ -406,7 +406,7 @@ md_labeldisk() { # We have some defaults installed. Pop into # the disklabel editor. disklabel -W $1 - if ! disklabel -e $1; then + if ! disklabel -r -e $1; then echo "" echo "ERROR: couldn't set partition map for $1" echo "" @@ -467,43 +467,10 @@ __md_prep_disklabel_1 echo -n "Press [Enter] to continue " getresp "" disklabel -W ${_disk} - disklabel -e ${_disk} + disklabel -r -e ${_disk} } md_copy_kernel() { - if [ -d "$SETSDIR" ]; then - # `bsd' is prefered over `bsd.gz' - if [ -f "$SETSDIR/bsd" ]; then - kernfile="$SETSDIR/bsd" - dogzip="" - elif [ -f "$SETSDIR/bsd.gz" ]; then - kernfile="$SETSDIR/bsd.gz" - dogzip="yes" - elif [ -f "$SETSDIR/bsd-gen" ]; then - kernfile="$SETSDIR/bsd-gen" - dogzip="" - elif [ -f "$SETSDIR/bsd-gen.gz" ]; then - kernfile="$SETSDIR/bsd-gen.gz" - dogzip="yes" - else - echo "Couldn't find a kernel file in $SETSDIR." - echo "You will have to copy a kernel by hand." - return - fi - - # Copy in the kernel. - echo -n "Copying kernel $kernfile..." - if [ "$dogzip" ]; then - gzip -d < $kernfile > /mnt/bsd - else - cp $kernfile /mnt/bsd - fi - chmod 755 /mnt/bsd - echo " done." - else - echo "Couldn't find $SETSDIR." - echo "You will have to copy a kernel by hand." - fi } # Note, while they might not seem machine-dependent, the |