diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile index d30cc0ba4e92..f55934b0a903 100644 --- a/distrib/macppc/floppies/ramdisk/Makefile +++ b/distrib/macppc/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2000/05/02 16:06:50 sjg Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/24 09:15:21 tsubai Exp $ TOP= ${.CURDIR}/.. @@ -8,7 +8,7 @@ IMAGE= ramdisk.fs CBIN= ramdiskbin MOUNT_POINT?= /mnt -VND?= vnd1 +VND?= vnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a MDEC= ${DESTDIR}/usr/mdec @@ -19,6 +19,7 @@ MTREE= mtree.conf SIZE= 2048k DISKTYPE= floppyinstfs +DBG= -Os -mmultiple all: ${CBIN} dd if=/dev/zero of=${IMAGE} bs=${SIZE} count=1 @@ -45,7 +46,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c #libhack.o - make -f ${CBIN}.mk all + make -f ${CBIN}.mk DBG="${DBG}" all #HACKSRC=${TOP}/../../utils/libhack #.include "${HACKSRC}/Makefile.inc" @@ -55,4 +56,3 @@ clean cleandir distclean: rm -f *.core *.o *.cro *.c .include -.include diff --git a/distrib/macppc/floppies/ramdisk/dot.profile b/distrib/macppc/floppies/ramdisk/dot.profile index b77647a5b5e0..0033e70e5f4b 100644 --- a/distrib/macppc/floppies/ramdisk/dot.profile +++ b/distrib/macppc/floppies/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.9 2000/06/14 22:52:45 cgd Exp $ +# $NetBSD: dot.profile,v 1.10 2000/07/24 09:15:21 tsubai Exp $ # # Copyright (c) 1995 Jason R. Thorpe # Copyright (c) 1994 Christopher G. Demetriou @@ -56,9 +56,6 @@ if [ "X${DONEPROFILE}" = "X" ]; then # mount a /tmp on mfs, to avoid filling the md mount -t mfs swap /tmp - # mount the kern_fs so that we can examine the dmesg state - mount -t kernfs kern /kern - # get the terminal type _forceloop="" while [ "X${_forceloop}" = X"" ]; do diff --git a/distrib/macppc/floppies/ramdisk/list b/distrib/macppc/floppies/ramdisk/list index 06582f0b84cc..7f9effc2ca40 100644 --- a/distrib/macppc/floppies/ramdisk/list +++ b/distrib/macppc/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2000/06/07 20:08:12 matt Exp $ +# $NetBSD: list,v 1.9 2000/07/24 09:15:21 tsubai Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -25,6 +25,7 @@ LINK ramdiskbin bin/sync 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 @@ -34,7 +35,6 @@ LINK ramdiskbin sbin/mknod LINK ramdiskbin sbin/mount LINK ramdiskbin sbin/mount_cd9660 LINK ramdiskbin sbin/mount_ffs -LINK ramdiskbin sbin/mount_kernfs LINK ramdiskbin sbin/mount_mfs LINK ramdiskbin sbin/mount_msdos LINK ramdiskbin sbin/mount_nfs diff --git a/distrib/macppc/floppies/ramdisk/mtree.conf b/distrib/macppc/floppies/ramdisk/mtree.conf index b09a654765b3..35b5ad3fde7a 100644 --- a/distrib/macppc/floppies/ramdisk/mtree.conf +++ b/distrib/macppc/floppies/ramdisk/mtree.conf @@ -1,4 +1,4 @@ -# $NetBSD: mtree.conf,v 1.2 1999/06/05 20:17:41 bouyer Exp $ +# $NetBSD: mtree.conf,v 1.3 2000/07/24 09:15:21 tsubai Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -34,11 +34,6 @@ mnt2 # ./mnt2 .. -# ./kern -kern -# ./kern -.. - # ./sbin sbin # ./sbin diff --git a/distrib/macppc/floppies/ramdisk/ramdiskbin.conf b/distrib/macppc/floppies/ramdisk/ramdiskbin.conf index d564f73cbb2a..393ad4d93d71 100644 --- a/distrib/macppc/floppies/ramdisk/ramdiskbin.conf +++ b/distrib/macppc/floppies/ramdisk/ramdiskbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: ramdiskbin.conf,v 1.11 2000/06/22 17:07:40 matt Exp $ +# $NetBSD: ramdiskbin.conf,v 1.12 2000/07/24 09:15:21 tsubai Exp $ # # ramdiskbin.conf - unified binary for the install ramdisk @@ -38,4 +38,4 @@ ln reboot halt ln restore rrestore #libs libhack.o -libs -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lz -lkvm +libs -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lz