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 /distrib/amd64 | |
| 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.
Diffstat (limited to 'distrib/amd64')
| -rw-r--r-- | distrib/amd64/common/list | 6 | ||||
| -rw-r--r-- | distrib/amd64/ramdiskA/list.local | 3 | ||||
| -rw-r--r-- | distrib/amd64/ramdisk_cd/Makefile | 3 |
3 files changed, 8 insertions, 4 deletions
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 + |