Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/x68k/floppies Reorganize (again) the installation sy...
details: https://anonhg.NetBSD.org/src/rev/7b60de7cffb2
branches: trunk
changeset: 499735:7b60de7cffb2
user: minoura <minoura%NetBSD.org@localhost>
date: Tue Nov 28 03:03:26 2000 +0000
description:
Reorganize (again) the installation system.
- Remove historical `script' installer, which was provided for
4MB RAM systems.
- Instead we provide `floppy-root' installer, which is composed
of 2 floppies just like the installation system used in the netbsd-1-2
days; one floppy contains (GENERIC) kernel and the other contains
the miniroot.
- The miniroots for both `ramdisk-root' installation system and
`floppy-root' installation system are identical.
diffstat:
distrib/x68k/floppies/Makefile | 4 +-
distrib/x68k/floppies/bootfloppy-common/Makefile.inc | 11 +-
distrib/x68k/floppies/bootfloppy.generic/Makefile | 15 +
distrib/x68k/floppies/bootfloppy/Makefile | 14 -
distrib/x68k/floppies/inst/Makefile | 24 +
distrib/x68k/floppies/ramdisk.sysinst/Makefile | 8 +-
distrib/x68k/floppies/ramdisk.sysinst/dot.profile | 19 +-
distrib/x68k/floppies/ramdisk/Makefile | 35 -
distrib/x68k/floppies/ramdisk/dot.hdprofile | 65 --
distrib/x68k/floppies/ramdisk/dot.profile | 65 --
distrib/x68k/floppies/ramdisk/install.tmpl | 516 -------------------
distrib/x68k/floppies/ramdisk/list | 100 ---
distrib/x68k/floppies/ramdisk/mtree.conf | 72 --
distrib/x68k/floppies/ramdisk/ramdiskbin.conf | 39 -
distrib/x68k/floppies/ramdisk/start.tmpl | 45 -
distrib/x68k/floppies/ramdisk/upgrade.tmpl | 282 ----------
16 files changed, 68 insertions(+), 1246 deletions(-)
diffs (truncated from 1445 to 300 lines):
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/Makefile
--- a/distrib/x68k/floppies/Makefile Tue Nov 28 02:46:13 2000 +0000
+++ b/distrib/x68k/floppies/Makefile Tue Nov 28 03:03:26 2000 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 1999/12/24 17:02:14 minoura Exp $
+# $NetBSD: Makefile,v 1.7 2000/11/28 03:03:26 minoura Exp $
-SUBDIR= ramdisk bootfloppy ramdisk.sysinst bootfloppy.sysinst
+SUBDIR= ramdisk.sysinst bootfloppy.sysinst bootfloppy.generic inst
.PHONY: release
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/x68k/floppies/bootfloppy-common/Makefile.inc Tue Nov 28 02:46:13 2000 +0000
+++ b/distrib/x68k/floppies/bootfloppy-common/Makefile.inc Tue Nov 28 03:03:26 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2000/06/18 10:33:18 minoura Exp $
+# $NetBSD: Makefile.inc,v 1.16 2000/11/28 03:03:26 minoura Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -20,7 +20,9 @@
MDEC= ${DESTDIR}/usr/mdec
LISTS= ${COMMONDIR}/list
+.if ${RAMDISKDIR} != ""
RAMDISK !=cd ${RAMDISKDIR}; ${MAKE} echoimage
+.endif
DISKTYPE= floppy5
@@ -55,11 +57,16 @@
-vnconfig -u ${VND_DEV}
-/bin/rm -f ${IMAGE}
+.if defined(RAMDISK)
${KERNNAME}: ${KERN} ${RAMDISK}
-/bin/rm -f netbsd.tmp*
cp ${KERN} netbsd.tmp
mdsetimage -v netbsd.tmp ${RAMDISK}
mv -f netbsd.tmp ${.TARGET}
+.else
+${KERNNAME}: ${KERN}
+ cp ${KERN} ${.TARGET}
+.endif
${GZNAME}: ${KERNNAME}
gzip -cv9 ${KERNNAME} > ${.TARGET}
@@ -71,8 +78,10 @@
-mkdir -p ${RELEASEDIR}/installation/misc
cp -p ${IMAGE} ${RELEASEDIR}/installation/floppy
gzip <${IMAGE} >${RELEASEDIR}/installation/floppy/${IMAGE}.gz
+.ifndef NOKERNCOPY
cp -p ${KERNNAME} ${RELEASEDIR}/installation/misc
cp -p ${GZNAME} ${RELEASEDIR}/installation/misc
+.endif
clean cleandir distclean:
/bin/rm -f *.core ${IMAGE} ${CLEANFILES}
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/bootfloppy.generic/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/x68k/floppies/bootfloppy.generic/Makefile Tue Nov 28 03:03:26 2000 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2000/11/28 03:03:27 minoura Exp $
+
+TOP= ${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+.include <bsd.kernobj.mk>
+.include <bsd.own.mk>
+
+IMAGE= kern.fs
+KERNDIR= ${KERNOBJDIR}/GENERIC
+KERN= ${KERNDIR}/netbsd
+RAMDISKDIR=
+NOKERNCOPY= YES
+
+.include "${TOP}/bootfloppy-common/Makefile.inc"
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/bootfloppy/Makefile
--- a/distrib/x68k/floppies/bootfloppy/Makefile Tue Nov 28 02:46:13 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2000/06/16 16:07:09 minoura Exp $
-
-TOP= ${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-.include <bsd.kernobj.mk>
-.include <bsd.own.mk>
-
-IMAGE= boot.fs
-KERNDIR= ${KERNOBJDIR}/INSTALL_SMALL
-KERN= ${KERNDIR}/netbsd
-KERNNAME= netbsd
-
-.include "${TOP}/bootfloppy-common/Makefile.inc"
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/inst/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/distrib/x68k/floppies/inst/Makefile Tue Nov 28 03:03:26 2000 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.5 2000/11/28 03:03:27 minoura Exp $
+
+PROG= inst.fs.gz
+SRCS=
+MKMAN= no
+
+RAMDISKDIR!= cd ${.CURDIR}/../ramdisk.sysinst ; make print-objdir
+
+inst.fs.gz: inst.fs
+ gzip -9vc inst.fs > ${.TARGET}
+CLEANFILES+= inst.fs.gz
+
+inst.fs: ${RAMDISKDIR}/ramdisk.fs
+ cp ${RAMDISKDIR}/ramdisk.fs ${.TARGET}
+CLEANFILES+= inst.fs
+
+${RAMDISKDIR}/ramdisk.fs:
+ cd ${.CURDIR}/../ramdisk.sysinst ; make
+
+release:
+ -mkdir -p ${RELEASEDIR}/installation/floppy
+ cp -p inst.fs inst.fs.gz ${RELEASEDIR}/installation/floppy
+
+.include <bsd.prog.mk>
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/ramdisk.sysinst/Makefile
--- a/distrib/x68k/floppies/ramdisk.sysinst/Makefile Tue Nov 28 02:46:13 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/Makefile Tue Nov 28 03:03:26 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/09/12 17:07:44 minoura Exp $
+# $NetBSD: Makefile,v 1.12 2000/11/28 03:03:29 minoura Exp $
TOP= ${.CURDIR}/..
COMMONDIR= ${TOP}/ramdisk-common
@@ -13,10 +13,10 @@
CBIN= ramdiskbin
-RAMDISKSPT= 22
-RAMDISKCYLS= 50
+RAMDISKSPT= 15
+RAMDISKCYLS= 80
RAMDISKHEADS= 2
-RAMDISKCPG= 56
+RAMDISKCPG= 32
RAMDISKBPI= 4096
passwd:
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/ramdisk.sysinst/dot.profile
--- a/distrib/x68k/floppies/ramdisk.sysinst/dot.profile Tue Nov 28 02:46:13 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk.sysinst/dot.profile Tue Nov 28 03:03:26 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.6 2000/07/05 16:13:30 minoura Exp $
+# $NetBSD: dot.profile,v 1.7 2000/11/28 03:03:29 minoura Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -46,7 +46,7 @@
umask 022
-ROOTDEV=/dev/md0a
+ROOTDEVS="/dev/md0a /dev/fd0c /dev/fd1c /dev/fd2c /Dummy"
if [ "X${DONEPROFILE}" = "X" ]; then
DONEPROFILE=YES
@@ -57,13 +57,20 @@
stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
echo ''
- # mount the ramdisk read write
- mount -u $ROOTDEV /
+ # mount the miniroot read write
+ # our miniroot can be either on ramdisk or on floppy.
+ for $ROOTDEV in $ROOTDEVS; do
+ ( mount -u $ROOTDEV / > /dev/null 2>&1 ) && break
+ done
# pull in the functions that people will use from the shell prompt.
# . /.commonutils
# . /.instutils
- # run sysinst.
- sysinst
+ if [ "$ROOTDEV" = "/Dummy" ]; then
+ echo "Could not determine root device."
+ else
+ # run sysinst.
+ sysinst
+ fi
fi
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/ramdisk/Makefile
--- a/distrib/x68k/floppies/ramdisk/Makefile Tue Nov 28 02:46:13 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2000/09/12 17:07:44 minoura Exp $
-
-TOP= ${.CURDIR}/..
-COMMONDIR= ${TOP}/ramdisk-common
-
-IMAGE= ramdisk.fs
-
-AUXTARGETS= install.sh upgrade.sh start.sh
-AUXDEPENDS= ${AUXTARGETS} \
- ${COMMONDIR}/termcap.vt ${COMMONDIR}/disktab.preinstall \
- ${COMMONDIR}/installboot.sh
-AUXCLEAN= ${AUXTARGETS}
-
-CBIN= ramdiskbin
-
-RAMDISKSPT= 23
-RAMDISKCYLS= 50
-RAMDISKHEADS= 2
-RAMDISKCPG= 80
-RAMDISKBPI= 4096
-
-install.sh: install.tmpl
- sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
-
-upgrade.sh: upgrade.tmpl
- sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
-
-start.sh: start.tmpl
- sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET}
-
-.include "${COMMONDIR}/Makefile.inc"
-
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.sys.mk>
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/ramdisk/dot.hdprofile
--- a/distrib/x68k/floppies/ramdisk/dot.hdprofile Tue Nov 28 02:46:13 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-# $NetBSD: dot.hdprofile,v 1.8 2000/09/12 15:40:00 minoura Exp $
-#
-# Copyright (c) 1994 Christopher G. Demetriou
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed for the
-# NetBSD Project. See http://www.netbsd.org/ for
-# information about NetBSD.
-# 4. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-export PATH
-TERM=x68k
-export TERM
-HOME=/
-export HOME
-
-umask 022
-
-if [ "X${DONEPROFILE}" = "X" ]; then
- DONEPROFILE=YES
- export DONEPROFILE
-
- echo "Checking filesystems..."
- fsck -y
-
- echo "Mounting filesystems..."
- mount -a
-
- # set up some sane defaults
- echo 'erase ^?, werase ^W, kill ^U, intr ^C'
- stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
- echo ''
-
- # pull in the functions that people will use from the shell prompt.
- . /.commonutils
- . /.instutils
-
- echo "Follow the installation directions to install the NetBSD"
- echo "distribution sets."
-fi
diff -r 32e6fa92eedf -r 7b60de7cffb2 distrib/x68k/floppies/ramdisk/dot.profile
--- a/distrib/x68k/floppies/ramdisk/dot.profile Tue Nov 28 02:46:13 2000 +0000
Home |
Main Index |
Thread Index |
Old Index