Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src Pullup from the trunk; approved by thorpej.
details: https://anonhg.NetBSD.org/src/rev/96661af6ae0e
branches: netbsd-1-5
changeset: 489461:96661af6ae0e
user: minoura <minoura%NetBSD.org@localhost>
date: Thu Sep 14 14:15:23 2000 +0000
description:
Pullup from the trunk; approved by thorpej.
> From: Minoura Makoto <minoura%netbsd.org@localhost>
> Subject: CVS commit: syssrc
> To: source-changes%netbsd.org@localhost
> Date: Tue, 12 Sep 2000 18:40:02 +0300 (EEST)
> Reply-To: minoura%netbsd.org@localhost
>
>
> Module Name: syssrc
> Committed By: minoura
> Date: Tue Sep 12 15:40:01 UTC 2000
>
> Modified Files:
> basesrc/distrib/x68k/floppies/ramdisk: Makefile dot.hdprofile
> dot.profile install.tmpl list ramdiskbin.conf upgrade.tmpl
> syssrc/sys/arch/x68k/conf: INSTALL_SMALL
>
> Log Message:
> Reduce ramdisk size by using hacked commands in distrib/utils.
>
>
> To generate a diff of this commit:
> cvs rdiff -r1.16 -r1.17 basesrc/distrib/x68k/floppies/ramdisk/Makefile
> cvs rdiff -r1.7 -r1.8 basesrc/distrib/x68k/floppies/ramdisk/dot.hdprofile
> cvs rdiff -r1.10 -r1.11 basesrc/distrib/x68k/floppies/ramdisk/dot.profile \
> basesrc/distrib/x68k/floppies/ramdisk/install.tmpl \
> basesrc/distrib/x68k/floppies/ramdisk/upgrade.tmpl
> cvs rdiff -r1.11 -r1.12 basesrc/distrib/x68k/floppies/ramdisk/list
> cvs rdiff -r1.8 -r1.9 basesrc/distrib/x68k/floppies/ramdisk/ramdiskbin.conf
> cvs rdiff -r1.5 -r1.6 syssrc/sys/arch/x68k/conf/INSTALL_SMALL
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
diffstat:
distrib/x68k/floppies/ramdisk/Makefile | 4 ++--
distrib/x68k/floppies/ramdisk/dot.hdprofile | 3 +--
distrib/x68k/floppies/ramdisk/dot.profile | 5 +----
distrib/x68k/floppies/ramdisk/install.tmpl | 13 ++++---------
distrib/x68k/floppies/ramdisk/list | 8 ++++++--
distrib/x68k/floppies/ramdisk/ramdiskbin.conf | 23 ++++++++++++++---------
distrib/x68k/floppies/ramdisk/upgrade.tmpl | 13 +++----------
sys/arch/x68k/conf/INSTALL_SMALL | 6 +++---
8 files changed, 34 insertions(+), 41 deletions(-)
diffs (273 lines):
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/Makefile
--- a/distrib/x68k/floppies/ramdisk/Makefile Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/Makefile Thu Sep 14 14:15:23 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/05/02 16:06:57 sjg Exp $
+# $NetBSD: Makefile,v 1.15.4.1 2000/09/14 14:15:24 minoura Exp $
TOP= ${.CURDIR}/..
@@ -66,7 +66,7 @@
.include "${HACKSRC}/Makefile.inc"
# turn off small gethostby* temporarily
-HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o setlocale.o yplib.o
+HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o localeconv.o perror.o setlocale.o strerror.o strsignal.o utmp.o yplib.o
# Used in building bootfloppy
echoimage:
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/dot.hdprofile
--- a/distrib/x68k/floppies/ramdisk/dot.hdprofile Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/dot.hdprofile Thu Sep 14 14:15:23 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.hdprofile,v 1.7 2000/06/14 17:24:52 cgd Exp $
+# $NetBSD: dot.hdprofile,v 1.7.2.1 2000/09/14 14:15:24 minoura Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -50,7 +50,6 @@
echo "Mounting filesystems..."
mount -a
- mount -t kernfs /kern /kern
# set up some sane defaults
echo 'erase ^?, werase ^W, kill ^U, intr ^C'
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/dot.profile
--- a/distrib/x68k/floppies/ramdisk/dot.profile Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/dot.profile Thu Sep 14 14:15:23 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.10 2000/06/14 22:52:49 cgd Exp $
+# $NetBSD: dot.profile,v 1.10.2.1 2000/09/14 14:15:24 minoura Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -56,9 +56,6 @@
# 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
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/install.tmpl
--- a/distrib/x68k/floppies/ramdisk/install.tmpl Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/install.tmpl Thu Sep 14 14:15:23 2000 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.tmpl,v 1.10 2000/06/14 22:52:49 cgd Exp $
+# $NetBSD: install.tmpl,v 1.10.2.1 2000/09/14 14:15:24 minoura Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -149,7 +149,7 @@
getresp "n"
case "$resp" in
y*|Y*)
- more /kern/msgbuf
+ dmesg | more
;;
*)
echo ""
@@ -396,7 +396,7 @@
$DONTDOIT disklabel -w $drivename $labelname
echo " done."
-if [ `cat /kern/physmem` -le 1024 ]; then # less than 4megs
+if [ `sysctl -n hw.physmem` -le 4194304 ]; then # less than 4megs
echo ""
echo "You have to increase the virtual memory by activating"
echo "the swap device you have just configured especially if"
@@ -415,11 +415,6 @@
swapctl -a /dev/${drivename}b
;;
esac
- echo ""
- echo "Note that you have to use the SMALL kernel named"
- echo "netbsd.SMALL in x68k/binary/kernel/ directory instead of"
- echo "the standard kernel which is included the kern.tgz."
- echo ""
fi
if [ "$sect_fwd" = "sf:" ]; then
@@ -497,7 +492,7 @@
echo ""
echo -n "Installing boot blocks on $drivename..."
# shouldn't be needed, but...
-$DONTDOIT dd if=/usr/mdec/sdboot of=/dev/r${drivename}a conv=sync
+$DONTDOIT /usr/mdec/installboot /usr/mdec/sdboot /dev/r${drivename}a
echo " done."
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/list
--- a/distrib/x68k/floppies/ramdisk/list Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/list Thu Sep 14 14:15:23 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.11 2000/06/07 20:49:01 thorpej Exp $
+# $NetBSD: list,v 1.11.2.1 2000/09/14 14:15:24 minoura Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -22,6 +22,7 @@
LINK ramdiskbin bin/test
LINK ramdiskbin bin/[
LINK ramdiskbin sbin/disklabel
+LINK ramdiskbin sbin/dmesg
LINK ramdiskbin sbin/fsck
LINK ramdiskbin sbin/fsck_ffs
LINK ramdiskbin sbin/halt
@@ -33,7 +34,6 @@
LINK ramdiskbin sbin/mount_ffs
LINK ramdiskbin sbin/mount_msdos
LINK ramdiskbin sbin/mount_nfs
-LINK ramdiskbin sbin/mount_kernfs
LINK ramdiskbin sbin/newfs
LINK ramdiskbin sbin/ping
LINK ramdiskbin sbin/reboot
@@ -43,12 +43,14 @@
LINK ramdiskbin sbin/shutdown
LINK ramdiskbin sbin/slattach
LINK ramdiskbin sbin/swapctl
+LINK ramdiskbin sbin/sysctl
LINK ramdiskbin sbin/umount
SYMLINK /bin/cat usr/bin/chgrp
SYMLINK /bin/cat usr/bin/ftp
SYMLINK /bin/cat usr/bin/gunzip
SYMLINK /bin/cat usr/bin/gzcat
SYMLINK /bin/cat usr/bin/gzip
+SYMLINK /bin/cat usr/bin/less
SYMLINK /bin/cat usr/bin/more
SYMLINK /bin/cat usr/bin/sed
SYMLINK /bin/cat usr/bin/tip
@@ -74,6 +76,8 @@
SPECIAL /bin/rm dev/MAKEDEV
# we need the boot blocks /usr/mdec
+COPY ${CURDIR}/../ramdisk.sysinst/installboot.sh usr/mdec/installboot
+SPECIAL /bin/chmod 555 usr/mdec/installboot
COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot
LINK usr/mdec/sdboot usr/mdec/fdboot
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/ramdiskbin.conf
--- a/distrib/x68k/floppies/ramdisk/ramdiskbin.conf Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/ramdiskbin.conf Thu Sep 14 14:15:23 2000 +0000
@@ -1,34 +1,39 @@
-# $NetBSD: ramdiskbin.conf,v 1.8 1999/11/23 14:13:55 minoura Exp $
+# $NetBSD: ramdiskbin.conf,v 1.8.4.1 2000/09/14 14:15:24 minoura Exp $
#
# ramdiskbin.conf - unified binary for the install ramdisk
#
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
+srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
-progs cat chmod chown chroot cp dd df disklabel ed
-progs fsck fsck_ffs ftp gzip ifconfig init less
+progs cat chmod chown chroot cp dd df disklabel dmesg ed
+progs fsck fsck_ffs ftp gzip ifconfig init more
progs ln ls memswitch mkdir mknod mount mount_cd9660 mount_ffs mount_msdos
-progs mount_nfs mount_kernfs mt mv newfs ping pwd reboot restore rm
+progs mount_nfs mt mv newfs ping pwd reboot restore rm
progs route sed sh shutdown slattach stty swapctl sync pax test
-progs tip umount
+progs tip umount sysctl
special init srcdir distrib/utils/init_s
special ifconfig srcdir distrib/utils/x_ifconfig
special ping srcdir distrib/utils/x_ping
special route srcdir distrib/utils/x_route
+special more srcdir distrib/utils/more
+special dmesg srcdir distrib/utils/x_dmesg
+special gzip srcdir distrib/utils/x_gzip
+special dd srcdir distrib/utils/x_dd
+special ftp srcdir distrib/utils/x_ftp
+special sh srcdir distrib/utils/x_sh
ln pax tar
ln chown chgrp
ln gzip gzcat gunzip
-ln less more
+ln more less
ln sh -sh # init invokes the shell this way
ln test [
ln mount_cd9660 cd9660
ln mount_ffs ffs
ln mount_msdos msdos
ln mount_nfs nfs
-ln mount_kernfs kernfs
ln reboot halt
ln restore rrestore
-libs libhack.o -lbz2 -ledit -lutil -ltermcap -lrmt -lcrypt -ll -lm
+libs libhack.o -lz -lutil -ltermcap -lrmt -lcrypt -ll -lm
diff -r f57bfd32df53 -r 96661af6ae0e distrib/x68k/floppies/ramdisk/upgrade.tmpl
--- a/distrib/x68k/floppies/ramdisk/upgrade.tmpl Thu Sep 14 14:09:02 2000 +0000
+++ b/distrib/x68k/floppies/ramdisk/upgrade.tmpl Thu Sep 14 14:15:23 2000 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: upgrade.tmpl,v 1.10 2000/06/14 22:52:49 cgd Exp $
+# $NetBSD: upgrade.tmpl,v 1.10.2.1 2000/09/14 14:15:24 minoura Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -149,7 +149,7 @@
echo "the swap device if your machine has only 4MB memory installed, or,"
echo "if one or more of your NetBSD disk partitions are very large."
echo ""
-if [ `cat /kern/physmem` -le 1024 ]; then # less than 4megs
+if [ `sysctl -n hw.physmem` -le 4194304 ]; then # less than 4megs
defresp=y
else
defresp=n
@@ -246,7 +246,7 @@
echo ""
echo "Updating boot blocks on ${drivename}..."
# shouldn't be needed, but...
-$DONTDOIT dd if=/usr/mdec/sdboot of=/dev/r${drivename}a conv=sync
+$DONTDOIT /usr/mdec/installboot /usr/mdec/sdboot /dev/r${drivename}a
if [ $? != 0 ]; then
echo "FATAL ERROR: UPDATE OF DISK LABEL FAILED."
echo "It in unclear why this error would occur. It looks"
@@ -277,13 +277,6 @@
echo "NetBSD distribution sets, and how to clean up after the upgrade"
echo "software, when you are done."
-if [ `cat /kern/physmem` -le 1024 ]; then # less than 4megs
- echo ""
- echo "Note that you have to use the SMALL kernel named"
- echo "netbsd.SMALL in x68k/binary/kernel/ directory instead of"
- echo "the standard kernel which is included the kern.tgz."
-fi
-
echo ""
echo "GOOD LUCK!"
echo ""
diff -r f57bfd32df53 -r 96661af6ae0e sys/arch/x68k/conf/INSTALL_SMALL
--- a/sys/arch/x68k/conf/INSTALL_SMALL Thu Sep 14 14:09:02 2000 +0000
+++ b/sys/arch/x68k/conf/INSTALL_SMALL Thu Sep 14 14:15:23 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_SMALL,v 1.4.2.1 2000/09/14 14:09:03 minoura Exp $
+# $NetBSD: INSTALL_SMALL,v 1.4.2.2 2000/09/14 14:15:23 minoura Exp $
#
# INSTALL_SMALL -- `small' installation kernel.
@@ -6,7 +6,7 @@
include "arch/x68k/conf/std.x68k"
-#ident "INSTALL_SMALL-$Revision: 1.4.2.1 $"
+#ident "INSTALL_SMALL-$Revision: 1.4.2.2 $"
maxusers 8
@@ -147,7 +147,7 @@
## File systems.
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS-compatible filesystem client
-file-system KERNFS # kernel data-structure filesystem
+#file-system KERNFS # kernel data-structure filesystem
#file-system NULLFS # NULL layered filesystem (buggy)
#file-system OVERLAY # overlay file system
#file-system MFS # memory-based filesystem
Home |
Main Index |
Thread Index |
Old Index