[src/trunk]: src/distrib/alpha migrate to /usr/sbin/installboot or ${INSTALLB...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/396abaef49c7
branches:  trunk
changeset: 526666:396abaef49c7
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue May 07 14:47:45 2002 +0000

description:
migrate to /usr/sbin/installboot or ${INSTALLBOOT} as appropriate

diffstat:

 distrib/alpha/instkernel/ramdisk/install.sh |  4 ++--
 distrib/alpha/instkernel/ramdisk/list       |  9 ++-------
 distrib/alpha/instkernel/ramdisk/upgrade.sh |  4 ++--
 distrib/alpha/rz25dist/Makefile             |  5 ++---
 4 files changed, 8 insertions(+), 14 deletions(-)

diffs (89 lines):

diff -r dc31ab18eeb5 -r 396abaef49c7 distrib/alpha/instkernel/ramdisk/install.sh
--- a/distrib/alpha/instkernel/ramdisk/install.sh       Tue May 07 14:44:06 2002 +0000
+++ b/distrib/alpha/instkernel/ramdisk/install.sh       Tue May 07 14:47:45 2002 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: install.sh,v 1.1 2002/05/02 18:02:21 lukem Exp $
+# $NetBSD: install.sh,v 1.2 2002/05/07 14:47:45 lukem Exp $
 #
 # Copyright (c) 1997 Perry E. Metzger
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -503,7 +503,7 @@
 echo -n        "Installing boot blocks on $drivename..."
 $DONTDOIT rm -f /mnt/boot
 $DONTDOIT cp /usr/mdec/boot /mnt/boot
-$DONTDOIT /usr/mdec/installboot /dev/r${drivename}c /usr/mdec/bootxx_ffs
+$DONTDOIT /usr/sbin/installboot /dev/r${drivename}c /usr/mdec/bootxx_ffs
 echo   " done."
 
 
diff -r dc31ab18eeb5 -r 396abaef49c7 distrib/alpha/instkernel/ramdisk/list
--- a/distrib/alpha/instkernel/ramdisk/list     Tue May 07 14:44:06 2002 +0000
+++ b/distrib/alpha/instkernel/ramdisk/list     Tue May 07 14:47:45 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.19 2002/05/02 18:02:21 lukem Exp $
+#      $NetBSD: list,v 1.20 2002/05/07 14:47:45 lukem Exp $
 
 SRCDIRS        bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
@@ -49,21 +49,16 @@
 PROG   usr/bin/tip
 PROG   usr/bin/tset
 
-PROG   usr/mdec/installboot
-
 PROG   usr/sbin/bad144
 PROG   usr/sbin/chown  usr/bin/chgrp
 PROG   usr/sbin/chroot
+PROG   usr/sbin/installboot
 
 # init invokes the shell as -sh
 ARGVLN sh -sh
 
 SPECIAL        ping            srcdir  distrib/utils/x_ping
 
-# we have not switched to MI usr.sbin/installboot yet.
-SPECIAL        installboot     srcdir  sys/arch/${MACHINE}/stand/installboot
-
-
 LIBS   -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm
 
 # we need the boot blocks /usr/mdec
diff -r dc31ab18eeb5 -r 396abaef49c7 distrib/alpha/instkernel/ramdisk/upgrade.sh
--- a/distrib/alpha/instkernel/ramdisk/upgrade.sh       Tue May 07 14:44:06 2002 +0000
+++ b/distrib/alpha/instkernel/ramdisk/upgrade.sh       Tue May 07 14:47:45 2002 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upgrade.sh,v 1.1 2002/05/02 18:02:21 lukem Exp $
+# $NetBSD: upgrade.sh,v 1.2 2002/05/07 14:47:45 lukem Exp $
 #
 # Copyright (c) 1997 Perry E. Metzger
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -227,7 +227,7 @@
 # shouldn't be needed, but...
 $DONTDOIT rm -f /mnt/boot
 $DONTDOIT cp /usr/mdec/boot /mnt/boot
-$DONTDOIT /usr/mdec/installboot /dev/r${drivename}c /usr/mdec/bootxx_ffs
+$DONTDOIT /usr/sbin/installboot /dev/r${drivename}c /usr/mdec/bootxx_ffs
 if [ $? != 0 ]; then
        echo    "FATAL ERROR: UPDATE OF DISK LABEL FAILED."
        echo    "It in unclear why this error would occur.  It looks"
diff -r dc31ab18eeb5 -r 396abaef49c7 distrib/alpha/rz25dist/Makefile
--- a/distrib/alpha/rz25dist/Makefile   Tue May 07 14:44:06 2002 +0000
+++ b/distrib/alpha/rz25dist/Makefile   Tue May 07 14:47:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/02/06 23:29:42 ross Exp $
+# $NetBSD: Makefile,v 1.27 2002/05/07 14:47:45 lukem Exp $
 
 .include "../../../Makefile.inc"
 
@@ -60,8 +60,7 @@
        ln -s ../local/bin/strip ${DESTDIR}/usr/bin
        cp -p ${DESTDIR}/usr/mdec/boot ${DESTDIR}/
        sync; sleep 1; sync; sleep 1
-       ${DESTDIR}/usr/mdec/installboot -v /dev/r${DESTDISK}c \
-           ${DESTDIR}/usr/mdec/bootxx_ffs
+       ${INSTALLBOOT} -v /dev/r${DESTDISK}c ${DESTDIR}/usr/mdec/bootxx_ffs
 
 unmount-fs:
        umount ${DESTDIR}/usr ${DESTDIR}