Pull md_install_sets() changes down from release branch.

This commit is contained in:
thorpej 1996-08-26 02:34:37 +00:00
parent b86b695240
commit 25507ee843
4 changed files with 20 additions and 68 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: install.md,v 1.6 1996/08/22 03:24:15 mrg Exp $
# $NetBSD: install.md,v 1.7 1996/08/26 02:34:37 thorpej Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -40,6 +40,9 @@
# machine dependent section of installation/upgrade script.
#
# Machine-dependent install sets
MDSETS=""
__mount_kernfs() {
#
# Mount root rw for convenience of the tester ;-)
@ -349,5 +352,3 @@ __md_copy_kernel_1
done
umount -f /mnt2 > /dev/null 2>&1
}
md_install_sets() {}

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: install.md,v 1.3 1996/08/22 03:24:17 mrg Exp $
# $NetBSD: install.md,v 1.4 1996/08/26 02:34:40 thorpej Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@ -41,6 +41,9 @@
# machine dependent section of installation/upgrade script
#
# Machine-dependent install sets
MDSETS=""
md_set_term() {
if [ ! -z "$TERM" ]; then
return
@ -485,6 +488,10 @@ you boot from the root disk.
__congratulations_1
}
md_native_fstype() {}
md_native_fsopts() {}
md_install_sets() {}
md_native_fstype() {
# Nothing to do.
}
md_native_fsopts() {
# Nothing to do.
}

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $NetBSD: install.sh,v 1.12 1996/08/25 14:59:00 pk Exp $
# $NetBSD: install.sh,v 1.13 1996/08/26 02:34:42 thorpej Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@ -62,7 +62,6 @@ MODE="install"
# md_congrats() - display friendly message
# md_native_fstype() - native filesystem type for disk installs
# md_native_fsopts() - native filesystem options for disk installs
# md_install_sets() - any MD install sets go in `MDSETS'
# include machine dependent subroutines
. install.md
@ -355,7 +354,6 @@ mount | while read line; do
fi
done
md_install_sets
install_sets $ALLSETS $MDSETS
# Copy in configuration information and make devices in target root.

View File

@ -1,4 +1,4 @@
# $NetBSD: install.md,v 1.7 1996/08/22 03:24:24 mrg Exp $
# $NetBSD: install.md,v 1.8 1996/08/26 02:34:44 thorpej Exp $
#
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -40,6 +40,9 @@
# machine dependent section of installation/upgrade script.
#
# Machine-dependent install sets
MDSETS="xbin xman xinc xcon"
md_set_term() {
if [ ! -z "$TERM" ]; then
return
@ -227,60 +230,3 @@ system has halted, reset the machine and boot from the disk.
__congratulations_1
}
md_install_sets() {
MDSETS='xbin xman xinc xcon'
}
md_install_sets() {
cat << __want_x_1;
Version ${VERSION} of NetBSD/sparc includes an X11R6.1 binary set. Sources
are, of course, also available. You must now decide whether or not
to install X11R6.1 into the /usr/X11R6 directory. The installation
takes:
23M for binary and library set (necessary)
3M for manual pages (recommended)
2M for X11 include files (recommended)
__want_x_1
echo -n "Install X11R6.1? [y] "
getresp "y"
case "$resp" in
y*|Y*)
MDSETS="X11R6.bin"
tar -C/mnt -zxf X11R6.bin.tar.gz
cat << __want_x_2
Mandatory X11R6.1 binaries and libraries installed.
__wait_x_2
echo -n "Do you want to install the X11R6.1 manual pages? [y] "
getresp "y"
case "$resp" in
y*|Y*)
nresp=y
MDSETS="${MDSETS} X11R6.man"
;;
*)
nresp=n
;;
esac
echo -n "Do you want to install the X11R6.1 include files? [$nresp] "
getresp $nresp
case "$resp" in
y*|Y*)
MDSETS="${MDSETS} X11R6.include.tar.gz"
;;
*)
;;
esac
;;
*)
MDSETS=
echo "Not installing X11R6.1."
echo ""
;;
esac
}