summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2001-12-13 01:40:16 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2001-12-13 01:40:16 +0000
commit159846deaa2f9bff3b560d6a49d7c8f93d7abadc (patch)
tree4d5d8d1ca04135de48cf67051957d1090c61f2a4
parentaf0b4fb17ec3cd4f9e7dd16fd10eea00b42847f6 (diff)
Remove /etc/protocols and /etc/services from install media
that use the miniroot install scripts. During an install, donetconfig() in miniroot/install.sub now creates a minimal /etc/protocols and /etc/services. During an upgrade, enable_network() now copies the existing protocols and services files into /etc. Saves approximately 13K on floppy/cd images.
Diffstat
-rw-r--r--distrib/hp300/ramdisk/list4
-rw-r--r--distrib/i386/floppies/common/list4
-rw-r--r--distrib/i386/floppies/ramdiskC/list4
-rw-r--r--distrib/macppc/ramdisk/list4
-rw-r--r--distrib/miniroot/install.sub24
-rw-r--r--distrib/miniroot/list4
-rw-r--r--distrib/ramdisk/list4
-rw-r--r--distrib/sparc64/common/list4
-rw-r--r--distrib/sparc64/ramdisk/list4
-rw-r--r--distrib/sparc64/ramdiskB/list4
10 files changed, 31 insertions, 29 deletions
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 43edb38c3cc..7ae1e1d8baf 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.24 2001/10/20 01:40:28 millert Exp $
+# $OpenBSD: list,v 1.25 2001/12/13 01:40:15 krw Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
@@ -65,8 +65,6 @@ LINK usr/mdec/uboot.lif usr/mdec/sdboot
# 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/protocols etc/protocols
-COPY ${DESTDIR}/etc/services etc/services
SPECIAL sed -e '/^#[ ].*$/d' < ${DESTDIR}/etc/disktab > etc/disktab
# we strip comments from files since we need the space...
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list
index 7b5691dd4d4..c8bd38cb6c6 100644
--- a/distrib/i386/floppies/common/list
+++ b/distrib/i386/floppies/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.21 2001/08/23 02:37:02 krw Exp $
+# $OpenBSD: list,v 1.22 2001/12/13 01:40:15 krw Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -65,8 +65,6 @@ 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/protocols etc/protocols
-COPY ${DESTDIR}/etc/services etc/services
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
SYMLINK /tmp/disktab.shadow etc/disktab
diff --git a/distrib/i386/floppies/ramdiskC/list b/distrib/i386/floppies/ramdiskC/list
index 0ef65bae4e7..478dd2f0979 100644
--- a/distrib/i386/floppies/ramdiskC/list
+++ b/distrib/i386/floppies/ramdiskC/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 2001/08/23 02:37:02 krw Exp $
+# $OpenBSD: list,v 1.6 2001/12/13 01:40:15 krw Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/instbin instbin
@@ -67,8 +67,6 @@ 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/protocols etc/protocols
-COPY ${DESTDIR}/etc/services etc/services
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab.shadow
SYMLINK /tmp/disktab.shadow etc/disktab
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 786dd1c66a6..b34876130a9 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 2001/11/19 01:23:26 drahn Exp $
+# $OpenBSD: list,v 1.6 2001/12/13 01:40:15 krw Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -77,8 +77,6 @@ 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 ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab
SYMLINK /tmp/disktab.shadow etc/disktab
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index e357f104093..f0542080de8 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sub,v 1.178 2001/11/25 21:43:08 krw Exp $
+# $OpenBSD: install.sub,v 1.179 2001/12/13 01:40:15 krw Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -722,7 +722,7 @@ enable_network() {
done
# Copy any required or optional files found
- for _netfile in hosts myname dhclient.conf resolv.conf resolv.conf.tail; do
+ for _netfile in hosts myname dhclient.conf resolv.conf resolv.conf.tail protocols services; do
if [ -f /mnt/etc/${_netfile} ]; then
cp /mnt/etc/${_netfile} /etc/${_netfile}
fi
@@ -2292,6 +2292,26 @@ donetconfig() {
hostname $resp
echo $resp > /tmp/myname
+ # Create minimal protocols and services for use during install
+ cat > /etc/protocols <<EOF
+ip 0 IP
+icmp 1 ICMP
+tcp 6 TCP
+udp 17 UDP
+EOF
+
+ cat > /etc/services <<EOF
+ftp-data 20/tcp
+ftp 21/tcp
+domain 53/tcp nameserver
+domain 53/udp nameserver
+www 80/tcp http
+www 80/udp
+nfsd 2049/udp nfs
+nfsd 2049/tcp nfs
+shell 514/tcp cmd
+EOF
+
# Always create new hosts file. If install.sh has been
# restarted, an existing one may contain information which
# will conflict with the information about to be entered.
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index 20653a6ba48..5a699e248bd 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.22 2001/10/02 17:01:31 deraadt Exp $
+# $OpenBSD: list,v 1.23 2001/12/13 01:40:15 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -59,9 +59,7 @@ ARGVLINK ksh -sh
COPY ${DESTDIR}/etc/group etc/group
COPY ${DESTDIR}/etc/master.passwd etc/master.passwd
COPY ${DESTDIR}/etc/passwd etc/passwd
-COPY ${DESTDIR}/etc/protocols etc/protocols
COPY ${DESTDIR}/etc/pwd.db etc/pwd.db
-COPY ${DESTDIR}/etc/services etc/services
COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
# and the installation scripts
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index 0eaa7fc87ea..4f144d5f745 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.14 2001/10/02 17:01:31 deraadt Exp $
+# $OpenBSD: list,v 1.15 2001/12/13 01:40:15 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -49,8 +49,6 @@ ARGVLINK ksh -sh
# 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 ${DESTDIR}/etc/spwd.db etc/spwd.db
# and the installation scripts
diff --git a/distrib/sparc64/common/list b/distrib/sparc64/common/list
index 7a40faef2e2..14b20d73a86 100644
--- a/distrib/sparc64/common/list
+++ b/distrib/sparc64/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.3 2001/10/13 05:34:13 deraadt Exp $
+# $OpenBSD: list,v 1.4 2001/12/13 01:40:15 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -51,8 +51,6 @@ ARGVLINK ksh -sh
# 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 ${DESTDIR}/etc/spwd.db etc/spwd.db
# and the installation scripts
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index a3333b825bc..424aaf5f4de 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 2001/10/10 04:21:02 deraadt Exp $
+# $OpenBSD: list,v 1.6 2001/12/13 01:40:15 krw Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -64,8 +64,6 @@ SPECIAL cd dev; sh MAKEDEV ramdisk; rm MAKEDEV
# 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 ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab
SYMLINK /tmp/disktab.shadow etc/disktab
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index e32b5f89fae..e303cd85cea 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.1 2001/10/10 04:21:02 deraadt Exp $
+# $OpenBSD: list,v 1.2 2001/12/13 01:40:15 krw Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -64,8 +64,6 @@ SPECIAL cd dev; sh MAKEDEV ramdisk; rm MAKEDEV
# 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 ${DESTDIR}/etc/spwd.db etc/spwd.db
COPY ${DESTDIR}/etc/disktab etc/disktab
SYMLINK /tmp/disktab.shadow etc/disktab
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 18:45:21 +0000