Don't copy disktab onto install media as it is not used during

installs. Also nuke the link created for disktab.

ok deraadt@ miod@

7 files changed, 7 insertions, 21 deletions

diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index 1b3947fba57..1ce87613d8a 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.15 2009/02/15 15:56:45 krw Exp $
+#	$OpenBSD: list,v 1.16 2009/02/20 00:02:49 krw Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
@@ -64,12 +64,10 @@ 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
-SCRIPT	${DESTDIR}/etc/disktab			tmp/disktab.shadow
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
 
-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/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 70ed98e47d4..988e9f5f0d0 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.48 2007/02/14 23:38:20 deraadt Exp $
+#	$OpenBSD: list,v 1.49 2009/02/20 00:02:49 krw Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
@@ -67,8 +67,6 @@ 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
-SCRIPT	${DESTDIR}/etc/disktab			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/hppa/ramdisk/list b/distrib/hppa/ramdisk/list
index ea9630fc9ba..7f5d1038c89 100644
--- a/distrib/hppa/ramdisk/list
+++ b/distrib/hppa/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.10 2009/02/15 15:56:45 krw Exp $
+#	$OpenBSD: list,v 1.11 2009/02/20 00:02:49 krw Exp $
 
 # hppa extra's
 LINK	instbin					sbin/disklabel
@@ -18,8 +18,6 @@ SPECIAL	rm -f usr/mdec/boot
 SPECIAL	rm -f usr/mdec/mkboot
 
 # various files that we need in /etc for the install
-SCRIPT	${DESTDIR}/etc/disktab			tmp/disktab.shadow
-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/i386/common/list b/distrib/i386/common/list
index fd7a997d1db..31bd5628029 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.18 2009/02/15 15:56:45 krw Exp $
+#	$OpenBSD: list,v 1.19 2009/02/20 00:02:49 krw Exp $
 
 SRCDIRS distrib/special
 SRCDIRS bin sbin usr.bin usr.sbin
@@ -65,12 +65,10 @@ 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
-SCRIPT	${DESTDIR}/etc/disktab			tmp/disktab.shadow
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
 
-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/sparc/miniroot/list b/distrib/sparc/miniroot/list
index b4956147b12..9a1f96a6709 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.32 2009/02/15 15:56:45 krw Exp $
+#	$OpenBSD: list,v 1.33 2009/02/20 00:02:49 krw Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
@@ -24,8 +24,6 @@ SPECIAL	rm -f usr/mdec/binstall			usr/mdec/installboot
 COPY	bsd	bsd
 
 # various files that we need in /etc for the install
-SCRIPT	${DESTDIR}/etc/disktab			tmp/disktab.shadow
-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/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 7bcf013a281..6c28565212f 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.27 2009/02/15 15:56:45 krw Exp $
+#	$OpenBSD: list,v 1.28 2009/02/20 00:02:49 krw Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
@@ -22,8 +22,6 @@ COPYDIR	${DESTDIR}/usr/mdec			usr/mdec
 SPECIAL	rm -f usr/mdec/binstall			usr/mdec/installboot
 
 # various files that we need in /etc for the install
-SCRIPT	${DESTDIR}/etc/disktab			tmp/disktab.shadow
-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/vax/ramdisk/list b/distrib/vax/ramdisk/list
index ac1d7992786..3293896fadd 100644
--- a/distrib/vax/ramdisk/list
+++ b/distrib/vax/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.19 2009/02/15 15:56:45 krw Exp $
+#	$OpenBSD: list,v 1.20 2009/02/20 00:02:49 krw Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # extras
@@ -20,8 +20,6 @@ LINK	usr/mdec/xxboot				usr/mdec/rdboot
 LINK	usr/mdec/xxboot				usr/mdec/sdboot
 
 # various files that we need in /etc for the install
-SCRIPT	${DESTDIR}/etc/disktab			tmp/disktab.shadow
-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