summaryrefslogtreecommitdiff
path: root/distrib/i386/floppies
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2001-12-17 00:41:52 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2001-12-17 00:41:52 +0000
commit15903e0f34b87bf1c08c0ebd26b5d0034b7fc22f (patch)
tree901eb97986f4a5ed44c8b62953217c487d86b6e5 /distrib/i386/floppies
parent753354e001548a17da7db91cc50bcaf625e72879 (diff)
Use actual files for short versions of /etc/protocols and
/etc/services used during installations. This way it is not necessary to run the install script before using commands requiring these files. Requested by deraadt@.
Diffstat (limited to 'distrib/i386/floppies')
-rw-r--r--distrib/i386/floppies/common/list5
-rw-r--r--distrib/i386/floppies/ramdiskC/list4
2 files changed, 7 insertions, 2 deletions
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list
index c8bd38cb6c6..a7b4178750b 100644
--- a/distrib/i386/floppies/common/list
+++ b/distrib/i386/floppies/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.22 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.23 2001/12/17 00:41:51 krw Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -67,6 +67,9 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
COPY ${DESTDIR}/etc/group etc/group
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+COPY ${CURDIR}/../../../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../../../miniroot/services etc/services
+
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/floppies/ramdiskC/list b/distrib/i386/floppies/ramdiskC/list
index 478dd2f0979..b3f3f325c1b 100644
--- a/distrib/i386/floppies/ramdiskC/list
+++ b/distrib/i386/floppies/ramdiskC/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.6 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.7 2001/12/17 00:41:51 krw Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -69,6 +69,8 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
COPY ${DESTDIR}/etc/group etc/group
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
+COPY ${CURDIR}/../../../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../../../miniroot/services etc/services
SYMLINK /tmp/disktab.shadow etc/disktab
SYMLINK /tmp/fstab.shadow etc/fstab
SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf