summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/hp300/ramdisk/list8
-rw-r--r--distrib/i386/floppies/common/list5
-rw-r--r--distrib/i386/floppies/ramdiskC/list4
-rw-r--r--distrib/macppc/ramdisk/list4
-rw-r--r--distrib/miniroot/install.sub22
-rw-r--r--distrib/miniroot/list4
-rw-r--r--distrib/miniroot/protocols6
-rw-r--r--distrib/miniroot/services10
-rw-r--r--distrib/ramdisk/list4
-rw-r--r--distrib/sparc64/common/list8
-rw-r--r--distrib/sparc64/ramdisk/list18
-rw-r--r--distrib/sparc64/ramdiskB/list18
12 files changed, 63 insertions, 48 deletions
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 7ae1e1d8baf..1009ad1804c 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.25 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.26 2001/12/17 00:41:51 krw Exp $
COPY ${OBJDIR}/raminst raminst
LINK raminst bin/cat
@@ -63,8 +63,10 @@ LINK usr/mdec/uboot.lif usr/mdec/hdboot
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/group etc/group
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${CURDIR}/../../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../../miniroot/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 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
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index b34876130a9..5f3dce53414 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/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 $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -79,6 +79,8 @@ COPY ${DESTDIR}/usr/mdec/msdos1mb.gz usr/mdec/msdos1mb.gz
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/fstab.shadow etc/fstab
SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index f0542080de8..435b4f59cd4 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: install.sub,v 1.179 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: install.sub,v 1.180 2001/12/17 00:41:50 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
@@ -2292,26 +2292,6 @@ 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 5a699e248bd..68216a31ecd 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.23 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.24 2001/12/17 00:41:50 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -61,6 +61,8 @@ 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
# and the installation scripts
COPY ${CURDIR}/install.sub install.sub
diff --git a/distrib/miniroot/protocols b/distrib/miniroot/protocols
new file mode 100644
index 00000000000..a257038f91f
--- /dev/null
+++ b/distrib/miniroot/protocols
@@ -0,0 +1,6 @@
+# $OpenBSD: protocols,v 1.1 2001/12/17 00:41:50 krw Exp $
+# Minimal /etc/protocols file for use during installation
+ip 0 IP
+icmp 1 ICMP
+tcp 6 TCP
+udp 17 UDP
diff --git a/distrib/miniroot/services b/distrib/miniroot/services
new file mode 100644
index 00000000000..a1df854c2a9
--- /dev/null
+++ b/distrib/miniroot/services
@@ -0,0 +1,10 @@
+# $OpenBSD: services,v 1.1 2001/12/17 00:41:50 krw Exp $
+# Minimal /etc/services file for use during installation
+ftp-data 20/tcp
+ftp 21/tcp
+domain 53/tcp nameserver
+domain 53/udp nameserver
+www 80/tcp http
+shell 514/tcp cmd
+nfsd 2049/udp nfs
+nfsd 2049/tcp nfs
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index 4f144d5f745..18c17528638 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.15 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.16 2001/12/17 00:41:51 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -50,6 +50,8 @@ ARGVLINK ksh -sh
# 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 ${CURDIR}/../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../miniroot/services etc/services
# and the installation scripts
COPY ${CURDIR}/../miniroot/install.sub install.sub
diff --git a/distrib/sparc64/common/list b/distrib/sparc64/common/list
index 14b20d73a86..c2b71bc8cf4 100644
--- a/distrib/sparc64/common/list
+++ b/distrib/sparc64/common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.4 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.5 2001/12/17 00:41:51 krw Exp $
# $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
SRCDIRS distrib/special
@@ -50,8 +50,10 @@ LINK instbin usr/bin/sed
ARGVLINK ksh -sh
# 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/group etc/group
+COPY ${DESTDIR}/etc/spwd.db etc/spwd.db
+COPY ${CURDIR}/../../miniroot/protocols etc/protocols
+COPY ${CURDIR}/../../miniroot/services etc/services
# and the installation scripts
COPY ${CURDIR}/../../miniroot/install.sub install.sub
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 424aaf5f4de..0aacfc785f1 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/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 $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -63,13 +63,15 @@ SPECIAL cd dev; sh MAKEDEV ramdisk; rm MAKEDEV
#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
# 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
-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
+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/fstab.shadow etc/fstab
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/hosts etc/hosts
# and the common installation tools
COPY ${TOPDIR}/common/termcap.vt usr/share/misc/termcap
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index e303cd85cea..304f5e8ab57 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.2 2001/12/13 01:40:15 krw Exp $
+# $OpenBSD: list,v 1.3 2001/12/17 00:41:51 krw Exp $
SRCDIRS distrib/special
SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -63,13 +63,15 @@ SPECIAL cd dev; sh MAKEDEV ramdisk; rm MAKEDEV
#COPY ${DESTDIR}/usr/mdec/bootblk usr/mdec/bootblk
# 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
-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
+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/fstab.shadow etc/fstab
+SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf
+SYMLINK /tmp/hosts etc/hosts
# and the common installation tools
COPY ${TOPDIR}/common/termcap.vt usr/share/misc/termcap
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:42:15 +0000