summaryrefslogtreecommitdiff
path: root/distrib/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-18 04:08:33 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-10-18 04:08:33 +0000
commitbf1773d7c45d72bafb95b717fd0d1f06908710c2 (patch)
tree2e38c2091f10373300d4005634c6fc8141270c92 /distrib/i386
parentad74e02d43e4d0e90024fc2f6597aa89880ccb4b (diff)
Place a smaller spwd.db onto the install media. Be consistant with the naming
of the "additional" list files (for architectures which split the list) Then... cleanup some TZ which it is clear should not have been placed onto certain media which don't have the space for them.
Diffstat (limited to 'distrib/i386')
-rw-r--r--distrib/i386/common/list5
-rw-r--r--distrib/i386/ramdiskA/list.local4
-rw-r--r--distrib/i386/ramdiskB/list.local4
-rw-r--r--distrib/i386/ramdiskC/list.local4
4 files changed, 9 insertions, 8 deletions
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 28b3f0a22ed..71ff6961301 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.25 2010/10/12 23:37:11 deraadt Exp $
+# $OpenBSD: list,v 1.26 2010/10/18 04:07:50 deraadt Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -65,7 +65,8 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
# various files that we need in /etc for the install
COPY ${DESTDIR}/etc/group etc/group
-COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd
+SPECIAL pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
COPY ${CURDIR}/../../miniroot/protocols etc/protocols
COPY ${CURDIR}/../../miniroot/services etc/services
TERMCAP vt100,vt220,dumb usr/share/misc/termcap
diff --git a/distrib/i386/ramdiskA/list.local b/distrib/i386/ramdiskA/list.local
index 3ddc7a1f961..31b0e0dc4aa 100644
--- a/distrib/i386/ramdiskA/list.local
+++ b/distrib/i386/ramdiskA/list.local
@@ -1,5 +1,5 @@
-# $OpenBSD: list.local,v 1.1 2010/10/12 23:37:40 deraadt Exp $
+# $OpenBSD: list.local,v 1.2 2010/10/18 04:07:50 deraadt Exp $
LINK instbin sbin/mount_msdos
-TZ
+#TZ
diff --git a/distrib/i386/ramdiskB/list.local b/distrib/i386/ramdiskB/list.local
index 9ce4a96c251..31b0e0dc4aa 100644
--- a/distrib/i386/ramdiskB/list.local
+++ b/distrib/i386/ramdiskB/list.local
@@ -1,5 +1,5 @@
-# $OpenBSD: list.local,v 1.1 2010/10/12 23:37:41 deraadt Exp $
+# $OpenBSD: list.local,v 1.2 2010/10/18 04:07:50 deraadt Exp $
LINK instbin sbin/mount_msdos
-TZ
+#TZ
diff --git a/distrib/i386/ramdiskC/list.local b/distrib/i386/ramdiskC/list.local
index 707bb7cec30..00a4fa7b7c8 100644
--- a/distrib/i386/ramdiskC/list.local
+++ b/distrib/i386/ramdiskC/list.local
@@ -1,5 +1,5 @@
-# $OpenBSD: list.local,v 1.11 2010/10/12 23:37:41 deraadt Exp $
+# $OpenBSD: list.local,v 1.12 2010/10/18 04:07:50 deraadt Exp $
LINK instbin sbin/mount_msdos
-TZ
+#TZ