diff options
-rw-r--r-- | distrib/alpha/inst-common/list | 10 | ||||
-rw-r--r-- | distrib/i386/common/list | 4 | ||||
-rw-r--r-- | distrib/mac68k/ramdisk/list | 8 | ||||
-rw-r--r-- | distrib/macppc/ramdisk/list | 5 | ||||
-rw-r--r-- | distrib/miniroot/list | 12 | ||||
-rw-r--r-- | distrib/mvme68k/ramdisk/list | 10 | ||||
-rw-r--r-- | distrib/mvme88k/ramdisk/list | 9 | ||||
-rw-r--r-- | distrib/mvmeppc/ramdisk/list | 9 | ||||
-rw-r--r-- | distrib/sparc64/bsd.rd/list | 5 | ||||
-rw-r--r-- | distrib/sparc64/ramdisk/list | 3 | ||||
-rw-r--r-- | distrib/sparc64/ramdiskB/list | 3 | ||||
-rw-r--r-- | distrib/vax/common/list | 9 |
12 files changed, 34 insertions, 53 deletions
diff --git a/distrib/alpha/inst-common/list b/distrib/alpha/inst-common/list index d2835106f50..32a08b4e8f9 100644 --- a/distrib/alpha/inst-common/list +++ b/distrib/alpha/inst-common/list @@ -1,5 +1,5 @@ # -# $OpenBSD: list,v 1.22 2002/04/19 23:20:23 deraadt Exp $ +# $OpenBSD: list,v 1.23 2002/04/28 19:25:09 deraadt Exp $ # # copy the crunched binary, link to it, and kill it @@ -61,10 +61,10 @@ SPECIAL cd dev; sh MAKEDEV ramdisk #COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx # various files that we need in /etc for the install -COPY ${DESTDIR}/etc/group etc -COPY ${DESTDIR}/etc/protocols etc -COPY ${DESTDIR}/etc/services etc -COPY ${DESTDIR}/etc/spwd.db etc +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 # and the common installation tools COPY ${TOPDIR}/inst-common/termcap.vt usr/share/misc/termcap diff --git a/distrib/i386/common/list b/distrib/i386/common/list index 2a8872087e0..2d47272541c 100644 --- a/distrib/i386/common/list +++ b/distrib/i386/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.1 2002/04/22 02:40:02 deraadt Exp $ +# $OpenBSD: list,v 1.2 2002/04/28 19:25:09 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -50,7 +50,7 @@ LINK instbin usr/mdec/installboot SPECIAL /bin/rm instbin # `internal' crunchgen links -ARGVLINK sh -sh +ARGVLINK ksh -sh # copy the MAKEDEV script and make some devices SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${DESTDIR}/dev/MAKEDEV > dev/MAKEDEV diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list index 309f1bc2353..f5778de9e7a 100644 --- a/distrib/mac68k/ramdisk/list +++ b/distrib/mac68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.11 2002/04/24 22:33:41 miod Exp $ +# $OpenBSD: list,v 1.12 2002/04/28 19:25:09 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -52,10 +52,10 @@ 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/protocols etc/protocols -COPY ${DESTDIR}/etc/services etc/services +COPY ${CURDIR}/../../miniroot/protocols etc/protocols +COPY ${CURDIR}/../../miniroot/services etc/services COPY ${DESTDIR}/etc/spwd.db etc/spwd.db -SYMLINK /tmp/disktab.shadow etc/disktab +SYMLINK /tmp/disktab.shadow etc/disktab 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 bf2f1ff056d..d2f561ca991 100644 --- a/distrib/macppc/ramdisk/list +++ b/distrib/macppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.11 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.12 2002/04/28 19:25:09 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -68,10 +68,9 @@ 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 ${DESTDIR}/etc/disktab etc/disktab COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -SYMLINK /tmp/disktab.shadow etc/disktab +SYMLINK /tmp/disktab.shadow etc/disktab SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/miniroot/list b/distrib/miniroot/list index 879ab01da17..d4355d40ec6 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.27 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.28 2002/04/28 19:25:09 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -44,19 +44,13 @@ LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat LINK instbin usr/bin/sed # `internal' crunchgen links -ARGVLINK mount_ffs ffs -ARGVLINK mount_nfs nfs -ARGVLINK mount_cd9660 cd9660 ARGVLINK ksh -sh # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group -COPY ${DESTDIR}/etc/master.passwd etc/master.passwd -COPY ${DESTDIR}/etc/passwd etc/passwd -COPY ${DESTDIR}/etc/pwd.db etc/pwd.db COPY ${DESTDIR}/etc/spwd.db etc/spwd.db -COPY ${CURDIR}/protocols etc/protocols -COPY ${CURDIR}/services etc/services +COPY ${CURDIR}/../miniroot/protocols etc/protocols +COPY ${CURDIR}/../miniroot/services etc/services # and the installation scripts SPECIAL sed -e '/^[ ]*#[ ].*$/d' -e '/^[ ]*#$/d' < ${CURDIR}/dot.profile > .profile diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index 48885c93e7e..13d1e3f2346 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.17 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.18 2002/04/28 19:25:09 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -61,12 +61,10 @@ COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc/group -COPY ${DESTDIR}/etc/protocols etc/protocols -COPY ${DESTDIR}/etc/services etc/services +COPY ${CURDIR}/../../miniroot/protocols etc/protocols +COPY ${CURDIR}/../../miniroot/services etc/services COPY ${DESTDIR}/etc/spwd.db etc/spwd.db -#COPY ${DESTDIR}/etc/disktab etc/disktab -#COPY disktab.preinstall etc/disktab.preinstall -SYMLINK /tmp/disktab.shadow etc/disktab +SYMLINK /tmp/disktab.shadow etc/disktab 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 f34f322f33b..465319b9129 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.12 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.13 2002/04/28 19:25:09 deraadt Exp $ COPY ${OBJDIR}/raminst raminst LINK raminst bin/cat @@ -64,11 +64,8 @@ COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc -COPY ${DESTDIR}/etc/master.passwd etc -COPY ${DESTDIR}/etc/passwd etc -COPY ${DESTDIR}/etc/protocols etc -COPY ${DESTDIR}/etc/pwd.db etc -COPY ${DESTDIR}/etc/services etc +COPY ${CURDIR}/../../miniroot/protocols etc/protocols +COPY ${CURDIR}/../../miniroot/services etc/services COPY ${DESTDIR}/etc/spwd.db etc # and the common installation tools diff --git a/distrib/mvmeppc/ramdisk/list b/distrib/mvmeppc/ramdisk/list index 69f2a6b2c90..3a884f44da7 100644 --- a/distrib/mvmeppc/ramdisk/list +++ b/distrib/mvmeppc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.7 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.8 2002/04/28 19:25:09 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -66,11 +66,10 @@ 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/protocols etc/protocols -COPY ${DESTDIR}/etc/services etc/services +COPY ${CURDIR}/../../miniroot/protocols etc/protocols +COPY ${CURDIR}/../../miniroot/services etc/services COPY ${DESTDIR}/etc/spwd.db etc/spwd.db -COPY ${DESTDIR}/etc/disktab etc/disktab -SYMLINK /tmp/disktab.shadow etc/disktab +SYMLINK /tmp/disktab.shadow etc/disktab SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list index a1b34e19c1f..ea11613f5e2 100644 --- a/distrib/sparc64/bsd.rd/list +++ b/distrib/sparc64/bsd.rd/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.7 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.8 2002/04/28 19:25:09 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -57,10 +57,9 @@ 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 ${DESTDIR}/etc/disktab etc/disktab COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services -SYMLINK /tmp/disktab.shadow etc/disktab +SYMLINK /tmp/disktab.shadow etc/disktab SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list index 24ddbcc4983..e713aff68ad 100644 --- a/distrib/sparc64/ramdisk/list +++ b/distrib/sparc64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.12 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.13 2002/04/28 19:25:09 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -59,7 +59,6 @@ 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 ${DESTDIR}/etc/disktab etc/disktab COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services SYMLINK /tmp/disktab.shadow etc/disktab diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list index f93aff057b8..8dfa5301539 100644 --- a/distrib/sparc64/ramdiskB/list +++ b/distrib/sparc64/ramdiskB/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.8 2002/04/22 02:43:16 deraadt Exp $ +# $OpenBSD: list,v 1.9 2002/04/28 19:25:10 deraadt Exp $ SRCDIRS distrib/special SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin @@ -59,7 +59,6 @@ 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 ${DESTDIR}/etc/disktab etc/disktab COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services SYMLINK /tmp/disktab.shadow etc/disktab diff --git a/distrib/vax/common/list b/distrib/vax/common/list index 3a450d53e10..f9182b43174 100644 --- a/distrib/vax/common/list +++ b/distrib/vax/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.1 2002/04/25 22:10:28 deraadt Exp $ +# $OpenBSD: list,v 1.2 2002/04/28 19:25:10 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -55,11 +55,8 @@ SPECIAL cd dev; sh MAKEDEV ramdisk # various files that we need in /etc for the install COPY ${DESTDIR}/etc/group etc -COPY ${DESTDIR}/etc/master.passwd etc -COPY ${DESTDIR}/etc/passwd etc -COPY ${DESTDIR}/etc/protocols etc -COPY ${DESTDIR}/etc/pwd.db etc -COPY ${DESTDIR}/etc/services etc +COPY ${CURDIR}/../../miniroot/protocols etc/protocols +COPY ${CURDIR}/../../miniroot/services etc/services COPY ${DESTDIR}/etc/spwd.db etc # and the common installation tools |