Module Name:    src
Committed By:   jym
Date:           Sun Feb 13 04:14:58 UTC 2011

Modified Files:
        src/distrib/amd64/ramdisks/common: list.ramdisk
        src/distrib/amd64/ramdisks/ramdisk: list
        src/distrib/i386/ramdisks/common: list.ramdisk
        src/distrib/i386/ramdisks/ramdisk-big: list

Log Message:
Sync ramdisks content across i386 and amd64. Biggest change is for amd64,
where configuration for crunchgen(1) is moved from ramdisk/ to common/.

For i386, only mbrlabel(8) and various LFS related binaries are added. Yes,
LFS. It was added to amd64 ramdisk 3 years ago, I believe it's for a good
reason... ?


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/amd64/ramdisks/common/list.ramdisk
cvs rdiff -u -r1.12 -r1.13 src/distrib/amd64/ramdisks/ramdisk/list
cvs rdiff -u -r1.17 -r1.18 src/distrib/i386/ramdisks/common/list.ramdisk
cvs rdiff -u -r1.4 -r1.5 src/distrib/i386/ramdisks/ramdisk-big/list

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/amd64/ramdisks/common/list.ramdisk
diff -u src/distrib/amd64/ramdisks/common/list.ramdisk:1.12 src/distrib/amd64/ramdisks/common/list.ramdisk:1.13
--- src/distrib/amd64/ramdisks/common/list.ramdisk:1.12	Thu Feb 11 09:06:47 2010
+++ src/distrib/amd64/ramdisks/common/list.ramdisk	Sun Feb 13 04:14:58 2011
@@ -1,12 +1,68 @@
-#	$NetBSD: list.ramdisk,v 1.12 2010/02/11 09:06:47 roy Exp $
+#	$NetBSD: list.ramdisk,v 1.13 2011/02/13 04:14:58 jym Exp $
 
+SRCDIRS	usr.bin/less
 SRCDIRS	bin sbin usr.bin usr.sbin libexec
 
+# Programs for a minimal ramdisk image
+
+PROG	bin/cat
+PROG	bin/chmod
+PROG	bin/cp
+PROG	bin/ln
+PROG	bin/ls
+PROG	bin/mkdir
+PROG	bin/mv
+PROG	bin/pax		usr/bin/tar
+PROG	bin/pwd
+PROG	bin/rm
+PROG	bin/sh
+PROG	bin/stty
+
+PROG	sbin/chown	bin/chgrp
+PROG	sbin/disklabel
+PROG	sbin/dmesg
+PROG	sbin/fsck
+PROG	sbin/fsck_ffs
+PROG	sbin/ifconfig
+PROG	sbin/init
+PROG	sbin/mknod
+PROG	sbin/mount
+PROG	sbin/mount_cd9660
+PROG	sbin/mount_ffs
+# PROG	sbin/mount_kernfs
+PROG	sbin/mount_msdos
+PROG	sbin/mount_nfs
+PROG	sbin/mount_tmpfs
+PROG	sbin/newfs	sbin/mount_mfs
+PROG	sbin/ping
+PROG	sbin/reboot	sbin/halt
+PROG	sbin/route
+PROG	sbin/swapctl
+PROG	sbin/umount
+
+PROG	usr/bin/ftp
+PROG	usr/bin/gzip	usr/bin/gzcat usr/bin/gunzip
+PROG	usr/bin/sed
+
+# One of these is rather useful
+# PROG	usr/bin/less	usr/bin/more
+# PROG	usr/bin/more	usr/bin/less
+
+# sysinst doesn't use installboot
+# PROG	usr/sbin/installboot
+
+PROG	usr/sbin/chroot
+
+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
+
 # init invokes the shell as -sh
 ARGVLN	sh -sh
 
 # libhack.o is built by Makefile & included Makefile.inc
-LIBS	libhack.o -lbz2 -lutil -ll -lm
+LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group

Index: src/distrib/amd64/ramdisks/ramdisk/list
diff -u src/distrib/amd64/ramdisks/ramdisk/list:1.12 src/distrib/amd64/ramdisks/ramdisk/list:1.13
--- src/distrib/amd64/ramdisks/ramdisk/list:1.12	Fri Jan 14 10:26:29 2011
+++ src/distrib/amd64/ramdisks/ramdisk/list	Sun Feb 13 04:14:58 2011
@@ -1,73 +1,31 @@
-#	$NetBSD: list,v 1.12 2011/01/14 10:26:29 tsutsui Exp $
-#
+#	$NetBSD: list,v 1.13 2011/02/13 04:14:58 jym Exp $
 
-SRCDIRS	usr.bin/less
-
-PROG	bin/cat
-PROG	bin/chmod
-PROG	bin/cp
+PROG	bin/chio
 PROG	bin/dd
 PROG	bin/df
 PROG	bin/ed
-PROG	bin/ln
-PROG	bin/ls
-PROG	bin/mkdir
 PROG	bin/mt
-PROG	bin/mv
-PROG	bin/pax		usr/bin/tar
-PROG	bin/pwd
 PROG	bin/rcmd
-PROG	bin/rm
-PROG	bin/sh
-PROG	bin/stty
 PROG	bin/sync
 
 PROG	libexec/lfs_cleanerd
 
-PROG	sbin/chown	bin/chgrp
-PROG	sbin/disklabel
-PROG	sbin/dmesg
 PROG	sbin/fdisk
-PROG	sbin/fsck
-PROG	sbin/fsck_ffs
-PROG	sbin/ifconfig
-PROG	sbin/init
 PROG	sbin/mbrlabel
-PROG	sbin/mknod
-PROG	sbin/mount
-PROG	sbin/mount_cd9660
 PROG	sbin/mount_ext2fs
-PROG	sbin/mount_ffs
-PROG	sbin/mount_kernfs
 PROG	sbin/mount_lfs
-PROG	sbin/mount_msdos
-PROG	sbin/mount_nfs
 PROG	sbin/mount_ntfs
-PROG	sbin/mount_tmpfs
-PROG	sbin/newfs	sbin/mount_mfs
 PROG	sbin/newfs_lfs
-PROG	sbin/ping
 PROG	sbin/raidctl
-PROG	sbin/reboot	sbin/halt
 PROG	sbin/restore	sbin/rrestore
-PROG	sbin/route
+PROG	sbin/scsictl
 PROG	sbin/shutdown
+PROG	sbin/slattach
 PROG	sbin/sysctl
-PROG	sbin/swapctl
-PROG	sbin/umount
 
-PROG	usr/bin/ftp
-PROG	usr/bin/gzip	usr/bin/gzcat usr/bin/gunzip
 PROG	usr/bin/less	usr/bin/more
-PROG	usr/bin/sed
+PROG	usr/bin/tip
 
 PROG	usr/sbin/installboot
 
-PROG	usr/sbin/chroot
 PROG	usr/sbin/wiconfig
-
-SPECIAL	ifconfig	srcdir	distrib/utils/x_ifconfig
-SPECIAL	ping		srcdir	distrib/utils/x_ping
-SPECIAL	route		srcdir	distrib/utils/x_route
-
-LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop

Index: src/distrib/i386/ramdisks/common/list.ramdisk
diff -u src/distrib/i386/ramdisks/common/list.ramdisk:1.17 src/distrib/i386/ramdisks/common/list.ramdisk:1.18
--- src/distrib/i386/ramdisks/common/list.ramdisk:1.17	Fri Feb 11 23:56:17 2011
+++ src/distrib/i386/ramdisks/common/list.ramdisk	Sun Feb 13 04:14:58 2011
@@ -1,7 +1,7 @@
-#	$NetBSD: list.ramdisk,v 1.17 2011/02/11 23:56:17 jym Exp $
+#	$NetBSD: list.ramdisk,v 1.18 2011/02/13 04:14:58 jym Exp $
 
 SRCDIRS	usr.bin/less
-SRCDIRS	bin sbin usr.bin usr.sbin
+SRCDIRS	bin sbin usr.bin usr.sbin libexec
 
 # Programs for a minimal ramdisk image
 
@@ -75,6 +75,7 @@
 COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
 COPY	${DESTDIR}/usr/mdec/bootxx_ffsv1	usr/mdec/bootxx_ffsv1
 COPY	${DESTDIR}/usr/mdec/bootxx_ffsv2	usr/mdec/bootxx_ffsv2
+COPY	${DESTDIR}/usr/mdec/bootxx_lfsv2	usr/mdec/bootxx_lfsv2
 COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${DESTDIR}/usr/mdec/mbr_ext		usr/mdec/mbr_ext
 COPY	${DESTDIR}/usr/mdec/mbr_bootsel		usr/mdec/mbr_bootsel

Index: src/distrib/i386/ramdisks/ramdisk-big/list
diff -u src/distrib/i386/ramdisks/ramdisk-big/list:1.4 src/distrib/i386/ramdisks/ramdisk-big/list:1.5
--- src/distrib/i386/ramdisks/ramdisk-big/list:1.4	Sun Sep 20 22:46:12 2009
+++ src/distrib/i386/ramdisks/ramdisk-big/list	Sun Feb 13 04:14:58 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.4 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.5 2011/02/13 04:14:58 jym Exp $
 
 PROG	bin/chio
 PROG	bin/dd
@@ -8,9 +8,14 @@
 PROG	bin/rcmd
 PROG	bin/sync
 
+PROG	libexec/lfs_cleanerd
+
 PROG	sbin/fdisk
+PROG	sbin/mbrlabel
 PROG	sbin/mount_ext2fs
+PROG	sbin/mount_lfs
 PROG	sbin/mount_ntfs
+PROG	sbin/newfs_lfs
 PROG	sbin/raidctl
 PROG	sbin/restore	sbin/rrestore
 PROG	sbin/scsictl

Reply via email to