diff --git a/distrib/x68k/floppies/ramdisk/Makefile b/distrib/x68k/floppies/ramdisk/Makefile index 2add8cae0a6a..78f229d17d20 100644 --- a/distrib/x68k/floppies/ramdisk/Makefile +++ b/distrib/x68k/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1999/03/24 15:54:45 minoura Exp $ +# $NetBSD: Makefile,v 1.8 1999/04/12 16:06:36 minoura Exp $ TOP= ${.CURDIR}/.. @@ -24,8 +24,6 @@ LISTS= list CRUNCHCONF= ${CBIN}.conf MTREE= mtree.conf -DISKTYPE= floppy5 - install.sh: install.tmpl sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET} @@ -36,10 +34,9 @@ start.sh: start.tmpl sed "s/@@VERSION@@/${VER}/" < ${.ALLSRC} > ${.TARGET} all: ${AUXTARGETS} ${CBIN} - dd if=/dev/zero of=${IMAGE} count=2400 - vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE} - disklabel -rw ${VND_CDEV} ${DISKTYPE} - newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV} ${DISKTYPE} + dd if=/dev/zero of=${IMAGE} count=2048 + vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/16/2/64 + newfs -B be -m 0 -o space -i 5120 -c 80 ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${.CURDIR}/${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ @@ -61,6 +58,12 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c make -f ${CBIN}.mk all +# Use size-reduced libhack. +${CBIN}: libhack.o + +HACKSRC=${TOP}/../../utils/libhack +.include "${HACKSRC}/Makefile.inc" + clean cleandir distclean: /bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c diff --git a/distrib/x68k/floppies/ramdisk/list b/distrib/x68k/floppies/ramdisk/list index 4723a54bd885..e4f2a69e6417 100644 --- a/distrib/x68k/floppies/ramdisk/list +++ b/distrib/x68k/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.6 1999/03/27 14:07:08 minoura Exp $ +# $NetBSD: list,v 1.7 1999/04/12 16:06:36 minoura Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -59,6 +59,16 @@ SYMLINK /bin/cat usr/sbin/chroot SYMLINK /bin/cat usr/sbin/update 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/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.x68k/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk @@ -68,13 +78,6 @@ SPECIAL /bin/rm dev/MAKEDEV COPY ${DESTDIR}/usr/mdec/sdboot usr/mdec/sdboot LINK usr/mdec/sdboot usr/mdec/fdboot -# 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/services etc/services -SPECIAL pwd_mkdb -p -d ./ etc/master.passwd - # and the common installation tools COPY ${CURDIR}/../../../utils/script-installer/dot.instutils .instutils COPY ${CURDIR}/../../../utils/script-installer/dot.commonutils .commonutils diff --git a/distrib/x68k/floppies/ramdisk/ramdiskbin.conf b/distrib/x68k/floppies/ramdisk/ramdiskbin.conf index e510763b93a5..52debb9c8fa5 100644 --- a/distrib/x68k/floppies/ramdisk/ramdiskbin.conf +++ b/distrib/x68k/floppies/ramdisk/ramdiskbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: ramdiskbin.conf,v 1.5 1999/03/24 15:54:46 minoura Exp $ +# $NetBSD: ramdiskbin.conf,v 1.6 1999/04/12 16:06:36 minoura Exp $ # # ramdiskbin.conf - unified binary for the install ramdisk # @@ -13,6 +13,8 @@ progs route sed sh shutdown slattach stty swapctl sync pax test progs tip umount update special init srcdir distrib/utils/init_s +special ifconfig srcdir distrib/utils/x_ifconfig +special route srcdir distrib/utils/x_route ln pax tar ln chown chgrp @@ -28,4 +30,4 @@ ln mount_kernfs kernfs ln reboot halt ln restore rrestore -libs -ledit -lutil -ltermcap -lrmt -lcrypt -ll -lm +libs libhack.o -ledit -lutil -ltermcap -lrmt -lcrypt -ll -lm