diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-10-18 04:08:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-10-18 04:08:33 +0000 |
| commit | bf1773d7c45d72bafb95b717fd0d1f06908710c2 (patch) | |
| tree | 2e38c2091f10373300d4005634c6fc8141270c92 | |
| parent | ad74e02d43e4d0e90024fc2f6597aa89880ccb4b (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.
38 files changed, 95 insertions, 68 deletions
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile index cc1f243781a..ba389e78cf4 100644 --- a/distrib/alpha/bsd.rd/Makefile +++ b/distrib/alpha/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2010/10/18 04:07:49 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -27,7 +27,7 @@ RDSETROOT= elfrdsetroot .include "${TOP}/inst-common/Makefile.inc" -LISTS+= ${.CURDIR}/list +LISTS+= ${.CURDIR}/list.local all: ${CBIN} bsd.rd diff --git a/distrib/alpha/bsd.rd/list b/distrib/alpha/bsd.rd/list.local index e7b7ac62a78..e7b7ac62a78 100644 --- a/distrib/alpha/bsd.rd/list +++ b/distrib/alpha/bsd.rd/list.local diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list index b3d367249c7..7bf60466430 100644 --- a/distrib/alpha/common/list +++ b/distrib/alpha/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.30 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.31 2010/10/18 04:07:49 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -58,7 +58,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 TERMCAP vt100,vt220,dumb usr/share/misc/termcap SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list index 5185b8e78d2..15f28c5e2ce 100644 --- a/distrib/amd64/common/list +++ b/distrib/amd64/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.23 2010/10/12 23:37:41 deraadt Exp $ +# $OpenBSD: list,v 1.24 2010/10/18 04:07:49 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -64,7 +64,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 @@ -80,4 +81,3 @@ SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade SCRIPT ${CURDIR}/../../miniroot/install.sh install SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub SPECIAL chmod 755 install upgrade -TZ diff --git a/distrib/amd64/ramdiskA/list.local b/distrib/amd64/ramdiskA/list.local new file mode 100644 index 00000000000..f80e8c257f0 --- /dev/null +++ b/distrib/amd64/ramdiskA/list.local @@ -0,0 +1,3 @@ +# $OpenBSD: list.local,v 1.1 2010/10/18 04:07:50 deraadt Exp $ + +TZ diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index 1f7ec4c5cc6..38ebd649317 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/04/06 03:54:41 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2010/10/18 04:07:50 deraadt Exp $ .PATH: ${.CURDIR}/../ramdisk RAMDISK=RAMDISK_CD @@ -10,3 +10,4 @@ NOFS=1 .include "${.CURDIR}/../common/Makefile.inc" LISTS+= ${.CURDIR}/list.local + diff --git a/distrib/armish/ramdisk/list b/distrib/armish/ramdisk/list index ce48695025f..3049e446428 100644 --- a/distrib/armish/ramdisk/list +++ b/distrib/armish/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.13 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.14 2010/10/18 04:07:50 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -66,7 +66,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 5c949fb6a16..708e65f8b11 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.55 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.56 2010/10/18 04:07:50 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -70,7 +70,8 @@ LINK usr/mdec/uboot.lif usr/mdec/sdboot COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/hppa/list b/distrib/hppa/list index e7a22a809d9..7fccb283c0f 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.15 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.16 2010/10/18 04:07:50 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -54,7 +54,8 @@ LINK instbin sbin/sysctl # 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 diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 831de839fc6..51cdb6a3766 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2010/08/26 01:35:44 krw Exp $ +# $OpenBSD: Makefile,v 1.20 2010/10/18 04:07:50 deraadt Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -25,7 +25,7 @@ CRUNCHGENOPTS?=-E KERNEL?= RAMDISK UTILS?= ${.CURDIR}/../../miniroot -LISTS= ${ARCHDIR}/list ${.CURDIR}/list +LISTS= ${ARCHDIR}/list ${.CURDIR}/list.local MTREE= ${UTILS}/mtree.conf LIF?= lif${REV}.fs diff --git a/distrib/hppa/ramdisk/list b/distrib/hppa/ramdisk/list.local index 74edea9e89c..e603d7dba11 100644 --- a/distrib/hppa/ramdisk/list +++ b/distrib/hppa/ramdisk/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.12 2009/06/02 06:17:47 todd Exp $ +# $OpenBSD: list.local,v 1.1 2010/10/18 04:07:50 deraadt Exp $ # hppa extra's LINK instbin sbin/disklabel 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 diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index f9c1577f9c4..e47cc45baf9 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.19 2010/09/20 04:26:10 jsg Exp $ +# $OpenBSD: list,v 1.20 2010/10/18 04:07:50 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -94,7 +94,8 @@ LINK usr/mdec/xxboot usr/mdec/sdboot # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list index 294e37f711e..9b8fe151292 100644 --- a/distrib/loongson/ramdisk/list +++ b/distrib/loongson/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.5 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.6 2010/10/18 04:07:50 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -67,7 +67,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list index 68b8b36e085..b01e9dc0754 100644 --- a/distrib/luna88k/ramdisk/list +++ b/distrib/luna88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.15 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.16 2010/10/18 04:07:50 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -61,7 +61,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list index 2f1cca64e2d..fa4030962cd 100644 --- a/distrib/mac68k/ramdisk/list +++ b/distrib/mac68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.34 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.35 2010/10/18 04:07:51 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -63,7 +63,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list index e5651b295af..7c08268e493 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.41 2010/09/20 04:26:10 jsg Exp $ +# $OpenBSD: list,v 1.42 2010/10/18 04:07:51 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -71,7 +71,8 @@ COPY ${DESTDIR}/usr/mdec/msdos1mb.gz usr/mdec/msdos1mb.gz # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/miniroot/Makefile b/distrib/miniroot/Makefile index 233a88671c9..a06951c13de 100644 --- a/distrib/miniroot/Makefile +++ b/distrib/miniroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile,v 1.32 2010/10/18 04:07:48 deraadt Exp $ REV= ${OSrev} @@ -30,7 +30,7 @@ CRUNCHGENOPTS?=-E CRUNCHGENOPTS?= .endif -LISTS= ${.CURDIR}/list ${ARCHDIR}/list +LISTS= ${.CURDIR}/list ${ARCHDIR}/list.local CRUNCHCONF= ${CBIN}.conf MTREE= ${.CURDIR}/mtree.conf diff --git a/distrib/miniroot/list b/distrib/miniroot/list index dd384c25e65..78f064d49e8 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.46 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.47 2010/10/18 04:07:48 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -54,7 +54,8 @@ LINK instbin sbin/sysctl # 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 diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index aeba67333fa..b63195dab31 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.39 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.40 2010/10/18 04:07:51 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -67,7 +67,8 @@ COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list index eefee260a4e..da038441689 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.37 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.38 2010/10/18 04:07:51 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -67,7 +67,8 @@ COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/mvmeppc/ramdisk/list b/distrib/mvmeppc/ramdisk/list index 156053c094a..96d31487c25 100644 --- a/distrib/mvmeppc/ramdisk/list +++ b/distrib/mvmeppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.27 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.28 2010/10/18 04:07:51 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -72,7 +72,8 @@ COPY ${DESTDIR}/usr/mdec/msdos1mb.gz usr/mdec/msdos1mb.gz COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/palm/ramdisk/list b/distrib/palm/ramdisk/list index 4847ce2ff84..290bf8a89ed 100644 --- a/distrib/palm/ramdisk/list +++ b/distrib/palm/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.3 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.4 2010/10/18 04:07:51 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -66,7 +66,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 72bca47f6d4..176667e1e3e 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2009/04/17 15:59:48 deraadt Exp $ +# $OpenBSD: Makefile,v 1.37 2010/10/18 04:07:51 deraadt Exp $ REV= ${OSrev} @@ -32,7 +32,7 @@ KERNEL?= RAMDISK UTILS?= ${.CURDIR}/../miniroot STRIP?= strip -LISTS= ${.CURDIR}/list ${ARCHDIR}/list +LISTS= ${.CURDIR}/list ${ARCHDIR}/list.local MTREE= ${UTILS}/mtree.conf FLOPPY?= floppy${REV}.fs diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list index 452080fbbdc..d9c4d00783a 100644 --- a/distrib/ramdisk/list +++ b/distrib/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.38 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.39 2010/10/18 04:07:51 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -54,7 +54,8 @@ LINK instbin usr/bin/sed # 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 diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list index 5c1995db8f7..cce762e8122 100644 --- a/distrib/sgi/ramdisk/list +++ b/distrib/sgi/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.27 2010/03/31 19:44:35 miod Exp $ +# $OpenBSD: list,v 1.28 2010/10/18 04:08:30 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -70,7 +70,8 @@ COPY ${DESTDIR}/usr/mdec/sgivol usr/mdec/sgivol # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list index ad5f490082a..08761ae6fb5 100644 --- a/distrib/socppc/ramdisk/list +++ b/distrib/socppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.11 2010/09/20 04:26:10 jsg Exp $ +# $OpenBSD: list,v 1.12 2010/10/18 04:08:32 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -68,7 +68,8 @@ COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list.local index 0292df6a19c..04e96165f2a 100644 --- a/distrib/sparc/miniroot/list +++ b/distrib/sparc/miniroot/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.36 2009/06/02 06:17:47 todd Exp $ +# $OpenBSD: list.local,v 1.1 2010/10/18 04:08:32 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Sparc extra's diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list.local index 67ae4f0accb..ae17a8ebd9a 100644 --- a/distrib/sparc/ramdisk/list +++ b/distrib/sparc/ramdisk/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.30 2009/06/02 06:17:47 todd Exp $ +# $OpenBSD: list.local,v 1.1 2010/10/18 04:08:32 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Sparc extra's diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list index 6e0d33ae40b..de82364b67f 100644 --- a/distrib/sparc64/bsd.rd/list +++ b/distrib/sparc64/bsd.rd/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.37 2010/09/20 04:26:10 jsg Exp $ +# $OpenBSD: list,v 1.38 2010/10/18 04:08:32 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -62,7 +62,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list index f19da554f0d..0864c0ec841 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.35 2010/04/19 19:20:14 dcoppa Exp $ +# $OpenBSD: list,v 1.36 2010/10/18 04:08:32 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -61,7 +61,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list index ae8ce3dbb3a..8e65e98f819 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.29 2010/04/19 19:20:14 dcoppa Exp $ +# $OpenBSD: list,v 1.30 2010/10/18 04:08:32 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -59,7 +59,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab diff --git a/distrib/vax/common/list b/distrib/vax/common/list index 6a2b417f796..abbf16fc72a 100644 --- a/distrib/vax/common/list +++ b/distrib/vax/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.22 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.23 2010/10/18 04:08:32 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -67,7 +67,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk COPY ${DESTDIR}/etc/group etc/group COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -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 TERMCAP vt100,vt220,dumb usr/share/misc/termcap COPY ${DESTDIR}/bsd . diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list.local index 3293896fadd..f5341eb2cba 100644 --- a/distrib/vax/ramdisk/list +++ b/distrib/vax/ramdisk/list.local @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.20 2009/02/20 00:02:49 krw Exp $ +# $OpenBSD: list.local,v 1.1 2010/10/18 04:08:32 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # extras diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list index 3c553cf24fc..db869e6f362 100644 --- a/distrib/zaurus/ramdisk/list +++ b/distrib/zaurus/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.17 2010/03/31 17:51:42 deraadt Exp $ +# $OpenBSD: list,v 1.18 2010/10/18 04:08:32 deraadt Exp $ SRCDIRS distrib/special SRCDIRS bin sbin usr.bin usr.sbin @@ -67,7 +67,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # 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 SYMLINK /tmp/fstab.shadow etc/fstab |