Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/i386/floppies Fix the previous in another way:
details: https://anonhg.NetBSD.org/src/rev/0dce2c31efe2
branches: trunk
changeset: 487764:0dce2c31efe2
user: he <he%NetBSD.org@localhost>
date: Mon Jun 12 18:51:14 2000 +0000
description:
Fix the previous in another way:
o Wave goodbye to INSTALL_SMALL-based boot image (it was originally
built for 5.25" media, but isn't anymore).
o Make a separate ramdisk image for the INSTALL_TINY image,
using the old script-based installer (not fixed/checked at the moment).
However, at least tweak the profile scripts to start it instead of sysinst.
Also remove ping6 and rtsol from ramdisk compared to original; the
INSTALL_TINY image doesn't have INET6.
o Add dump/restore back into both ramdisk images.
o Add scsictl and chio to the normal ramdisk image (INSTALL-based fdset)
o With dump/restore reinstated, remove the rescue-* and ramdisk-rescue
directories.
So, we're now back to having the recovery tools on the same image as
the boot media images.
diffstat:
distrib/i386/floppies/Makefile | 7 +-
distrib/i386/floppies/bootfloppy-small/Makefile | 16 -
distrib/i386/floppies/ramdisk-kernel/Makefile | 21 +-
distrib/i386/floppies/ramdisk-rescue/Makefile | 78 --
distrib/i386/floppies/ramdisk-rescue/Makefile.inc | 53 -
distrib/i386/floppies/ramdisk-rescue/dot.profile | 72 --
distrib/i386/floppies/ramdisk-rescue/list | 104 ---
distrib/i386/floppies/ramdisk-rescue/mtree.conf | 82 --
distrib/i386/floppies/ramdisk-rescue/ramdiskbin.conf | 45 -
distrib/i386/floppies/ramdisk-rescue/termcap.mini | 61 --
distrib/i386/floppies/ramdisk-tiny/Makefile | 90 +++
distrib/i386/floppies/ramdisk-tiny/Makefile.inc | 53 +
distrib/i386/floppies/ramdisk-tiny/disktab.preinstall | 31 +
distrib/i386/floppies/ramdisk-tiny/dot.hdprofile | 64 ++
distrib/i386/floppies/ramdisk-tiny/dot.profile | 71 ++
distrib/i386/floppies/ramdisk-tiny/install.tmpl | 513 ++++++++++++++++++
distrib/i386/floppies/ramdisk-tiny/list | 112 +++
distrib/i386/floppies/ramdisk-tiny/mtree.conf | 82 ++
distrib/i386/floppies/ramdisk-tiny/ramdiskbin.conf | 46 +
distrib/i386/floppies/ramdisk-tiny/start.tmpl | 49 +
distrib/i386/floppies/ramdisk-tiny/termcap.mini | 61 ++
distrib/i386/floppies/ramdisk-tiny/upgrade.tmpl | 257 +++++++++
distrib/i386/floppies/ramdisk/list | 4 +-
distrib/i386/floppies/ramdisk/ramdiskbin.conf | 6 +-
distrib/i386/floppies/rescue-fdset/Makefile | 17 -
distrib/i386/floppies/rescue-kernel/Makefile | 40 -
distrib/i386/floppies/rescue-small/Makefile | 21 -
distrib/i386/floppies/rescue-tiny/Makefile | 21 -
28 files changed, 1451 insertions(+), 626 deletions(-)
diffs (truncated from 2242 to 300 lines):
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/Makefile
--- a/distrib/i386/floppies/Makefile Mon Jun 12 17:43:26 2000 +0000
+++ b/distrib/i386/floppies/Makefile Mon Jun 12 18:51:14 2000 +0000
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2000/06/10 18:56:47 he Exp $
+# $NetBSD: Makefile,v 1.18 2000/06/12 18:51:14 he Exp $
SUBDIR= ramdisk
SUBDIR+= ramdisk-kernel
SUBDIR+= fdset
SUBDIR+= bootfloppy-big
-SUBDIR+= bootfloppy-small
SUBDIR+= bootfloppy-tiny
-SUBDIR+= ramdisk-rescue
-SUBDIR+= rescue-kernel
-SUBDIR+= rescue-fdset rescue-small rescue-tiny
-
TARGETS+=release
.include <bsd.subdir.mk>
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/bootfloppy-small/Makefile
--- a/distrib/i386/floppies/bootfloppy-small/Makefile Mon Jun 12 17:43:26 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2000/05/06 05:32:29 mycroft Exp $
-
-TOP= ${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
-
-IMAGE= boot-small.fs
-KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
- printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL_SMALL.gz\n" | \
- ${MAKE} -s -f-
-
-DISKTYPE= floppy3
-DISKSIZE= 2880
-BLOCK8K= 179
-
-.include "${TOP}/bootfloppy-common/Makefile.inc"
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/ramdisk-kernel/Makefile
--- a/distrib/i386/floppies/ramdisk-kernel/Makefile Mon Jun 12 17:43:26 2000 +0000
+++ b/distrib/i386/floppies/ramdisk-kernel/Makefile Mon Jun 12 18:51:14 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/05/31 17:14:01 matt Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/12 18:51:15 he Exp $
TOP= ${.CURDIR}/..
@@ -14,16 +14,25 @@
RAMDISK!= cd $(.CURDIR)/../ramdisk/; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
${MAKE} -s -f-
+RAMDISK_T!= cd ${.CURDIR}/../ramdisk-tiny/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk-tiny.fs\n" | \
+ ${MAKE} -s -f-
-.for kernel in INSTALL INSTALL_SMALL INSTALL_TINY
-netbsd.${kernel}.gz: .NOTMAIN ${KERNOBJDIR}/${kernel}/netbsd ${RAMDISK}
- cp ${KERNOBJDIR}/${kernel}/netbsd netbsd.tmp
+netbsd.INSTALL.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL/netbsd ${RAMDISK}
+ cp ${KERNOBJDIR}/INSTALL/netbsd netbsd.tmp
${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
${STRIP} netbsd.tmp
gzip -9 netbsd.tmp
mv netbsd.tmp.gz ${.TARGET}
-KERNELS+= netbsd.${kernel}.gz
-.endfor
+
+netbsd.INSTALL_TINY.gz: .NOTMAIN ${KERNOBJDIR}/INSTALL_TINY/netbsd ${RAMDISK_T}
+ cp ${KERNOBJDIR}/INSTALL_TINY/netbsd netbsd.tmp
+ ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK_T}
+ ${STRIP} netbsd.tmp
+ gzip -9 netbsd.tmp
+ mv netbsd.tmp.gz ${.TARGET}
+
+KERNELS=netbsd.INSTALL.gz netbsd.INSTALL_TINY.gz
all: ${KERNELS}
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/ramdisk-rescue/Makefile
--- a/distrib/i386/floppies/ramdisk-rescue/Makefile Mon Jun 12 17:43:26 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2000/06/10 18:56:48 he Exp $
-
-TOP= ${.CURDIR}/..
-WARNS=1
-
-.include "${TOP}/Makefile.inc"
-IMAGE= ramdisk.fs
-
-AUXDEPENDS= dot.profile termcap.mini
-
-CBIN= ramdiskbin
-
-MOUNT_POINT?= /mnt
-# DEV/RDEV file system device, CDEV/RDEV vnconfig device
-VND?= vnd0
-VND_DEV= /dev/${VND}a
-VND_RDEV= /dev/r${VND}a
-VND_CDEV= /dev/${VND}d
-VND_CRDEV= /dev/r${VND}d
-IMAGE?= xxx.fs
-MDEC= ${DESTDIR}/usr/mdec
-
-LISTS= list
-CRUNCHCONF= ${CBIN}.conf
-MTREE= mtree.conf
-
-RAMDISKSPC= 128
-RAMDISKCYLS= 24
-RAMDISKSIZE!= expr ${RAMDISKSPC} \* ${RAMDISKCYLS}
-
-realall: ${IMAGE}
-
-${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
- dd if=/dev/zero of=${IMAGE} count=${RAMDISKSIZE}
- vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
- -disklabel ${VND_CDEV} >tmplabel
- disklabel -r -R ${VND_CDEV} tmplabel
- newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV}
- mount ${VND_DEV} ${MOUNT_POINT}
- mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -U
- TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${.CURDIR}/${LISTS}
- @echo ""
- @df -i ${MOUNT_POINT}
- @echo ""
- umount ${MOUNT_POINT}
- vnconfig -u ${VND_CDEV}
-
-unconfig:
- -umount -f ${MOUNT_POINT}
- -vnconfig -u ${VND_DEV}
- -/bin/rm -f ${IMAGE}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
- make -f ${CBIN}.mk all
-
-# This is listed in ramdiskbin.conf but is built here.
-${CBIN}: libhack.o
-
-# Use stubs to eliminate some large stuff from libc
-HACKSRC=${TOP}/../../utils/libhack
-.include "${HACKSRC}/Makefile.inc"
-
-# turn off small gethostby*
-HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o setlocale.o yplib.o
-
-release:
-
-clean cleandir distclean:
- /bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
-
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
-.include <bsd.sys.mk>
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/ramdisk-rescue/Makefile.inc
--- a/distrib/i386/floppies/ramdisk-rescue/Makefile.inc Mon Jun 12 17:43:26 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.1 2000/06/10 18:56:48 he Exp $
-
-# TOP is assumed to be defined by Makefile including this one.
-
-CBIN= ramdiskbin
-COMMONDIR= ${TOP}/ramdisk-common
-
-MOUNT_POINT?= /mnt
-VND?= vnd0
-VND_DEV= /dev/${VND}a
-VND_RDEV= /dev/r${VND}a
-VND_CDEV= /dev/${VND}d
-VND_CRDEV= /dev/r${VND}d
-IMAGE?= xxx.fs
-MDEC= ${DESTDIR}/usr/mdec
-
-LISTS= ${COMMONDIR}/list ${.CURDIR}/list
-CRUNCHCONF= ${COMMONDIR}/${CBIN}.conf
-MTREE= ${COMMONDIR}/mtree.conf
-
-DISKTYPE= floppy3
-
-realall: ${AUXTARGETS} ${CBIN}
- dd if=/dev/zero of=${IMAGE} count=3072
- vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
- disklabel -rw ${VND_CDEV} ${DISKTYPE}
- newfs -B le -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE}
- mount ${VND_DEV} ${MOUNT_POINT}
- mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
- TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
- @echo ""
- @df -i ${MOUNT_POINT}
- @echo ""
- umount ${MOUNT_POINT}
- vnconfig -u ${VND_CDEV}
-
-unconfig:
- -umount -f ${MOUNT_POINT}
- -vnconfig -u ${VND_DEV}
- -/bin/rm -f ${IMAGE}
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
- make -f ${CBIN}.mk all
-
-clean cleandir distclean:
- /bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/ramdisk-rescue/dot.profile
--- a/distrib/i386/floppies/ramdisk-rescue/dot.profile Mon Jun 12 17:43:26 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-# $NetBSD: dot.profile,v 1.1 2000/06/10 18:56:48 he Exp $
-#
-# Copyright (c) 1994 Christopher G. Demetriou
-# Copyright (c) 1997 Perry E. Metzger
-# 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 by Christopher G. Demetriou.
-# 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.
-#
-
-PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-export PATH
-TERM=pc3
-export TERM
-HOME=/
-export HOME
-BLOCKSIZE=1k
-export BLOCKSIZE
-EDITOR=ed
-export EDITOR
-
-umask 022
-
-ROOTDEV=/dev/md0a
-
-if [ "X${DONEPROFILE}" = "X" ]; then
- DONEPROFILE=YES
- export DONEPROFILE
-
- # set up some sane defaults
- echo 'erase ^?, werase ^W, kill ^U, intr ^C'
- stty newcrt werase ^W intr ^C kill ^U erase ^? 9600
- echo ''
-
- # mount the ramdisk read write
- mount -u $ROOTDEV /
-
- # mount the kern_fs so that we can examine the dmesg state
- mount -t kernfs /kern /kern
-
- # pull in the functions that people will use from the shell prompt.
- # . /.commonutils
- # . /.instutils
- dmesg() cat /kern/msgbuf
- grep() sed -n "/$1/p"
-
- echo "This image contains utilities which may be needed"
- echo "to get you out of a pinch."
-
-fi
diff -r cea3aca874a1 -r 0dce2c31efe2 distrib/i386/floppies/ramdisk-rescue/list
--- a/distrib/i386/floppies/ramdisk-rescue/list Mon Jun 12 17:43:26 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
Home |
Main Index |
Thread Index |
Old Index