summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2009-02-15 15:56:46 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2009-02-15 15:56:46 +0000
commit6550e89dbcfad8eb50490ad35705af309580a191 (patch)
tree306c2b0ae72274baeea42d18fd42ffa765c86bdc
parent7e6ac3ff3ea845c7efc37422fb3d5289ddcdebf5 (diff)
Build install media with disktab.shadow already in /tmp, rather
than have the install script copy it there. Shrinks install script, removes an extra copy of disktab. ok deraadt@
Diffstat
-rw-r--r--distrib/alpha/common/list4
-rw-r--r--distrib/amd64/common/list4
-rw-r--r--distrib/hppa/ramdisk/list4
-rw-r--r--distrib/i386/common/list4
-rw-r--r--distrib/miniroot/install.sh6
-rw-r--r--distrib/sparc/miniroot/list4
-rw-r--r--distrib/sparc/ramdisk/list4
-rw-r--r--distrib/vax/ramdisk/list4
8 files changed, 15 insertions, 19 deletions
diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index 48b83dd1d7a..3e1c4b8ee89 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.21 2007/07/11 01:50:40 deraadt Exp $
+# $OpenBSD: list,v 1.22 2009/02/15 15:56:45 krw Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -63,7 +63,7 @@ SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
# and the installation tools
SCRIPT ${CURDIR}/../../miniroot/dot.profile .profile
-SCRIPT ${CURDIR}/../common/disktab.shadow etc/disktab.shadow
+SCRIPT ${CURDIR}/../common/disktab.shadow tmp/disktab.shadow
SCRIPT ${CURDIR}/../../miniroot/install.sub install.sub
SCRIPT ${CURDIR}/../../miniroot/install.sh install
SCRIPT ${CURDIR}/../../miniroot/upgrade.sh upgrade
diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index ae2b34a4953..1b3947fba57 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.14 2007/02/14 23:38:20 deraadt Exp $
+# $OpenBSD: list,v 1.15 2009/02/15 15:56:45 krw Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -64,7 +64,7 @@ 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 etc/disktab.shadow
+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
diff --git a/distrib/hppa/ramdisk/list b/distrib/hppa/ramdisk/list
index 94e53527ef9..ea9630fc9ba 100644
--- a/distrib/hppa/ramdisk/list
+++ b/distrib/hppa/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.9 2008/07/01 18:58:20 todd Exp $
+# $OpenBSD: list,v 1.10 2009/02/15 15:56:45 krw Exp $
# hppa extra's
LINK instbin sbin/disklabel
@@ -18,7 +18,7 @@ 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 etc/disktab.shadow
+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
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index a354ce3e291..fd7a997d1db 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.17 2007/02/14 23:38:20 deraadt Exp $
+# $OpenBSD: list,v 1.18 2009/02/15 15:56:45 krw Exp $
SRCDIRS distrib/special
SRCDIRS bin sbin usr.bin usr.sbin
@@ -65,7 +65,7 @@ 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 etc/disktab.shadow
+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
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh
index ec5778a9283..edf4ee381ee 100644
--- a/distrib/miniroot/install.sh
+++ b/distrib/miniroot/install.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sh,v 1.159 2008/06/26 05:42:03 ray Exp $
+# $OpenBSD: install.sh,v 1.160 2009/02/15 15:56:45 krw Exp $
# $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $
#
# Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback
@@ -71,10 +71,6 @@ MODE=install
# If /etc/fstab already exists, skip disk initialization.
if [ ! -f /etc/fstab ]; then
- # Install the shadowed disktab file; lets us write to it for temporary
- # purposes without mounting the miniroot read-write.
- [ -f /etc/disktab.shadow ] && cp /etc/disktab.shadow /tmp/disktab.shadow
-
DISK=
_DKDEVS=$DKDEVS
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index 163c71bd408..b4956147b12 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.31 2007/03/07 21:18:06 miod Exp $
+# $OpenBSD: list,v 1.32 2009/02/15 15:56:45 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
@@ -24,7 +24,7 @@ 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 etc/disktab.shadow
+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
diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index 38d4cb448f3..7bcf013a281 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.26 2008/07/02 14:01:35 todd Exp $
+# $OpenBSD: list,v 1.27 2009/02/15 15:56:45 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# Sparc extra's
@@ -22,7 +22,7 @@ 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 etc/disktab.shadow
+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
diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list
index 5ea9419d1e5..ac1d7992786 100644
--- a/distrib/vax/ramdisk/list
+++ b/distrib/vax/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.18 2003/01/30 22:09:56 deraadt Exp $
+# $OpenBSD: list,v 1.19 2009/02/15 15:56:45 krw Exp $
# $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
# extras
@@ -20,7 +20,7 @@ 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 etc/disktab.shadow
+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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:32:07 +0000