Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/i386/floppies Adjust a couple of things to use less ...
details: https://anonhg.NetBSD.org/src/rev/1320abd63a55
branches: trunk
changeset: 499304:1320abd63a55
user: simonb <simonb%NetBSD.org@localhost>
date: Thu Nov 16 13:21:05 2000 +0000
description:
Adjust a couple of things to use less temporary space:
+ build the passwd file before copying in ramdiskbin
+ don't copy MAKEDEV, run it, then delete it - run it in-place from
${.CURDIR}/...../etc.i386/MAKEDEV
Also, use LINK instead of SYMLINK for files under /usr - it's not a
separate filesystem.
Fixes PR misc/11473 and port-i386/11504 (until something else grows
again).
diffstat:
distrib/i386/floppies/ramdisk-big/list | 62 ++++++++++++-------------
distrib/i386/floppies/ramdisk-rescuesmall/list | 60 ++++++++++++-------------
distrib/i386/floppies/ramdisk-rescuetiny/list | 60 ++++++++++++-------------
distrib/i386/floppies/ramdisk-small/list | 56 +++++++++++------------
distrib/i386/floppies/ramdisk-tiny/list | 59 ++++++++++++------------
5 files changed, 144 insertions(+), 153 deletions(-)
diffs (truncated from 391 to 300 lines):
diff -r fac1edb9329d -r 1320abd63a55 distrib/i386/floppies/ramdisk-big/list
--- a/distrib/i386/floppies/ramdisk-big/list Thu Nov 16 13:15:13 2000 +0000
+++ b/distrib/i386/floppies/ramdisk-big/list Thu Nov 16 13:21:05 2000 +0000
@@ -1,4 +1,16 @@
-# $NetBSD: list,v 1.1 2000/09/27 16:04:15 fvdl Exp $
+# $NetBSD: list,v 1.2 2000/11/16 13:21:05 simonb Exp $
+
+# various files that we need in /etc for the install
+COPY ${CURDIR}/../../../../etc/group etc/group
+COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
+COPY ${CURDIR}/../../../../etc/protocols etc/protocols
+COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
+COPY ${CURDIR}/../../../../etc/services etc/services
+COPY ${CURDIR}/../../../../usr.sbin/dhcp/client/scripts/netbsd etc/dhclient-script
+
+SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
+SPECIAL /bin/rm etc/spwd.db
+SPECIAL /bin/rm etc/pwd.db
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -61,39 +73,25 @@
LINK ramdiskbin sbin/slattach
LINK ramdiskbin sbin/swapctl
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/tar
-SYMLINK /bin/cat usr/bin/tip
-SYMLINK /bin/cat usr/mdec/installboot
-SYMLINK /bin/cat usr/sbin/bad144
-SYMLINK /bin/cat usr/sbin/chown
-SYMLINK /bin/cat usr/sbin/chroot
-SYMLINK /bin/cat usr/sbin/wiconfig
+LINK ramdiskbin usr/bin/chgrp
+LINK ramdiskbin usr/bin/ftp
+LINK ramdiskbin usr/bin/gunzip
+LINK ramdiskbin usr/bin/gzcat
+LINK ramdiskbin usr/bin/gzip
+LINK ramdiskbin usr/bin/less
+LINK ramdiskbin usr/bin/more
+LINK ramdiskbin usr/bin/sed
+LINK ramdiskbin usr/bin/tar
+LINK ramdiskbin usr/bin/tip
+LINK ramdiskbin usr/mdec/installboot
+LINK ramdiskbin usr/sbin/bad144
+LINK ramdiskbin usr/sbin/chown
+LINK ramdiskbin usr/sbin/chroot
+LINK ramdiskbin usr/sbin/wiconfig
SPECIAL /bin/rm ramdiskbin
-# various files that we need in /etc for the install
-COPY ${CURDIR}/../../../../etc/group etc/group
-COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
-COPY ${CURDIR}/../../../../etc/protocols etc/protocols
-COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
-COPY ${CURDIR}/../../../../etc/services etc/services
-COPY ${CURDIR}/../../../../usr.sbin/dhcp/client/scripts/netbsd etc/dhclient-script
-
-SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
-SPECIAL /bin/rm etc/spwd.db
-SPECIAL /bin/rm etc/pwd.db
-
-# copy the MAKEDEV script and make some devices
-COPY ${CURDIR}/../../../../etc/etc.i386/MAKEDEV dev/MAKEDEV
-SPECIAL cd dev; sh MAKEDEV ramdisk bpf0 bpf1
-SPECIAL /bin/rm dev/MAKEDEV
+# make some devices
+SPECIAL cd dev; sh ${CURDIR}/../../../../etc/etc.i386/MAKEDEV ramdisk bpf0 bpf1
# we need the boot block in /usr/mdec + the MBR copy
COPY ${DESTDIR}/usr/mdec/biosboot.sym usr/mdec/biosboot.sym
diff -r fac1edb9329d -r 1320abd63a55 distrib/i386/floppies/ramdisk-rescuesmall/list
--- a/distrib/i386/floppies/ramdisk-rescuesmall/list Thu Nov 16 13:15:13 2000 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuesmall/list Thu Nov 16 13:21:05 2000 +0000
@@ -1,4 +1,15 @@
-# $NetBSD: list,v 1.1 2000/09/27 16:04:15 fvdl Exp $
+# $NetBSD: list,v 1.2 2000/11/16 13:21:06 simonb Exp $
+
+# various files that we need in /etc for the install
+COPY ${CURDIR}/../../../../etc/group etc/group
+COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
+COPY ${CURDIR}/../../../../etc/protocols etc/protocols
+COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
+COPY ${CURDIR}/../../../../etc/services etc/services
+
+SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
+SPECIAL /bin/rm etc/spwd.db
+SPECIAL /bin/rm etc/pwd.db
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -50,38 +61,25 @@
LINK ramdiskbin sbin/slattach
LINK ramdiskbin sbin/swapctl
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/tar
-SYMLINK /bin/cat usr/bin/tip
-SYMLINK /bin/cat usr/mdec/installboot
-SYMLINK /bin/cat usr/sbin/bad144
-SYMLINK /bin/cat usr/sbin/chown
-SYMLINK /bin/cat usr/sbin/chroot
-SYMLINK /bin/cat usr/sbin/wiconfig
+LINK ramdiskbin usr/bin/chgrp
+LINK ramdiskbin usr/bin/ftp
+LINK ramdiskbin usr/bin/gunzip
+LINK ramdiskbin usr/bin/gzcat
+LINK ramdiskbin usr/bin/gzip
+LINK ramdiskbin usr/bin/less
+LINK ramdiskbin usr/bin/more
+LINK ramdiskbin usr/bin/sed
+LINK ramdiskbin usr/bin/tar
+LINK ramdiskbin usr/bin/tip
+LINK ramdiskbin usr/mdec/installboot
+LINK ramdiskbin usr/sbin/bad144
+LINK ramdiskbin usr/sbin/chown
+LINK ramdiskbin usr/sbin/chroot
+LINK ramdiskbin usr/sbin/wiconfig
SPECIAL /bin/rm ramdiskbin
-# various files that we need in /etc for the install
-COPY ${CURDIR}/../../../../etc/group etc/group
-COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
-COPY ${CURDIR}/../../../../etc/protocols etc/protocols
-COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
-COPY ${CURDIR}/../../../../etc/services etc/services
-
-SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
-SPECIAL /bin/rm etc/spwd.db
-SPECIAL /bin/rm etc/pwd.db
-
-# copy the MAKEDEV script and make some devices
-COPY ${CURDIR}/../../../../etc/etc.i386/MAKEDEV dev/MAKEDEV
-SPECIAL cd dev; sh MAKEDEV ramdisk
-SPECIAL /bin/rm dev/MAKEDEV
+# make some devices
+SPECIAL cd dev; sh ${CURDIR}/../../../../etc/etc.i386/MAKEDEV ramdisk
# we need the boot block in /usr/mdec + the MBR copy
COPY ${DESTDIR}/usr/mdec/biosboot.sym usr/mdec/biosboot.sym
diff -r fac1edb9329d -r 1320abd63a55 distrib/i386/floppies/ramdisk-rescuetiny/list
--- a/distrib/i386/floppies/ramdisk-rescuetiny/list Thu Nov 16 13:15:13 2000 +0000
+++ b/distrib/i386/floppies/ramdisk-rescuetiny/list Thu Nov 16 13:21:05 2000 +0000
@@ -1,4 +1,15 @@
-# $NetBSD: list,v 1.1 2000/09/27 16:04:16 fvdl Exp $
+# $NetBSD: list,v 1.2 2000/11/16 13:21:06 simonb Exp $
+
+# various files that we need in /etc for the install
+COPY ${CURDIR}/../../../../etc/group etc/group
+COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
+COPY ${CURDIR}/../../../../etc/protocols etc/protocols
+COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
+COPY ${CURDIR}/../../../../etc/services etc/services
+
+SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
+SPECIAL /bin/rm etc/spwd.db
+SPECIAL /bin/rm etc/pwd.db
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -54,38 +65,25 @@
LINK ramdiskbin sbin/slattach
LINK ramdiskbin sbin/swapctl
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/tar
-SYMLINK /bin/cat usr/bin/tip
-SYMLINK /bin/cat usr/mdec/installboot
-SYMLINK /bin/cat usr/sbin/bad144
-SYMLINK /bin/cat usr/sbin/chown
-SYMLINK /bin/cat usr/sbin/chroot
-SYMLINK /bin/cat usr/sbin/wiconfig
+LINK ramdiskbin usr/bin/chgrp
+LINK ramdiskbin usr/bin/ftp
+LINK ramdiskbin usr/bin/gunzip
+LINK ramdiskbin usr/bin/gzcat
+LINK ramdiskbin usr/bin/gzip
+LINK ramdiskbin usr/bin/less
+LINK ramdiskbin usr/bin/more
+LINK ramdiskbin usr/bin/sed
+LINK ramdiskbin usr/bin/tar
+LINK ramdiskbin usr/bin/tip
+LINK ramdiskbin usr/mdec/installboot
+LINK ramdiskbin usr/sbin/bad144
+LINK ramdiskbin usr/sbin/chown
+LINK ramdiskbin usr/sbin/chroot
+LINK ramdiskbin usr/sbin/wiconfig
SPECIAL /bin/rm ramdiskbin
-# various files that we need in /etc for the install
-COPY ${CURDIR}/../../../../etc/group etc/group
-COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
-COPY ${CURDIR}/../../../../etc/protocols etc/protocols
-COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
-COPY ${CURDIR}/../../../../etc/services etc/services
-
-SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
-SPECIAL /bin/rm etc/spwd.db
-SPECIAL /bin/rm etc/pwd.db
-
-# copy the MAKEDEV script and make some devices
-COPY ${CURDIR}/../../../../etc/etc.i386/MAKEDEV dev/MAKEDEV
-SPECIAL cd dev; sh MAKEDEV ramdisk
-SPECIAL /bin/rm dev/MAKEDEV
+# make some devices
+SPECIAL cd dev; sh ${CURDIR}/../../../../etc/etc.i386/MAKEDEV ramdisk
# we need the boot block in /usr/mdec + the MBR copy
COPY ${DESTDIR}/usr/mdec/biosboot.sym usr/mdec/biosboot.sym
diff -r fac1edb9329d -r 1320abd63a55 distrib/i386/floppies/ramdisk-small/list
--- a/distrib/i386/floppies/ramdisk-small/list Thu Nov 16 13:15:13 2000 +0000
+++ b/distrib/i386/floppies/ramdisk-small/list Thu Nov 16 13:21:05 2000 +0000
@@ -1,4 +1,15 @@
-# $NetBSD: list,v 1.4 2000/10/06 14:40:37 fvdl Exp $
+# $NetBSD: list,v 1.5 2000/11/16 13:21:06 simonb Exp $
+
+# various files that we need in /etc for the install
+COPY ${CURDIR}/../../../../etc/group etc/group
+COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
+COPY ${CURDIR}/../../../../etc/protocols etc/protocols
+COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
+COPY ${CURDIR}/../../../../etc/services etc/services
+
+SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
+SPECIAL /bin/rm etc/spwd.db
+SPECIAL /bin/rm etc/pwd.db
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -43,35 +54,22 @@
LINK ramdiskbin sbin/route
LINK ramdiskbin sbin/swapctl
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/sed
-SYMLINK /bin/cat usr/bin/tar
-SYMLINK /bin/cat usr/bin/tip
-SYMLINK /bin/cat usr/mdec/installboot
-SYMLINK /bin/cat usr/sbin/bad144
-SYMLINK /bin/cat usr/sbin/chown
-SYMLINK /bin/cat usr/sbin/chroot
+LINK ramdiskbin usr/bin/chgrp
+LINK ramdiskbin usr/bin/ftp
+LINK ramdiskbin usr/bin/gunzip
+LINK ramdiskbin usr/bin/gzcat
+LINK ramdiskbin usr/bin/gzip
+LINK ramdiskbin usr/bin/sed
+LINK ramdiskbin usr/bin/tar
+LINK ramdiskbin usr/bin/tip
+LINK ramdiskbin usr/mdec/installboot
+LINK ramdiskbin usr/sbin/bad144
+LINK ramdiskbin usr/sbin/chown
+LINK ramdiskbin usr/sbin/chroot
SPECIAL /bin/rm ramdiskbin
-# various files that we need in /etc for the install
-COPY ${CURDIR}/../../../../etc/group etc/group
-COPY ${CURDIR}/../../../../etc/master.passwd etc/master.passwd
-COPY ${CURDIR}/../../../../etc/protocols etc/protocols
-COPY ${CURDIR}/../../../../etc/netconfig etc/netconfig
-COPY ${CURDIR}/../../../../etc/services etc/services
-
-SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
-SPECIAL /bin/rm etc/spwd.db
-SPECIAL /bin/rm etc/pwd.db
-
-# copy the MAKEDEV script and make some devices
-COPY ${CURDIR}/../../../../etc/etc.i386/MAKEDEV dev/MAKEDEV
-SPECIAL cd dev; sh MAKEDEV ramdisk
-SPECIAL /bin/rm dev/MAKEDEV
+# make some devices
+SPECIAL cd dev; sh ${CURDIR}/../../../../etc/etc.i386/MAKEDEV ramdisk
# we need the boot block in /usr/mdec + the MBR copy
COPY ${DESTDIR}/usr/mdec/biosboot.sym usr/mdec/biosboot.sym
Home |
Main Index |
Thread Index |
Old Index