From 58f068078734937142bcfb5ce03146b6630c3041 Mon Sep 17 00:00:00 2001 From: niklas Date: Wed, 30 Apr 1997 18:52:43 +0000 Subject: [PATCH] We run OpenBSD. we also want vim acting as vi. --- distrib/miniroot/install.sh | 3 ++- distrib/miniroot/install.sub | 5 +++-- distrib/miniroot/list | 3 +++ distrib/miniroot/list2sh.awk | 1 + distrib/miniroot/makeconf.awk | 1 + distrib/miniroot/mtree.conf | 1 + distrib/miniroot/runlist.sh | 1 + distrib/miniroot/upgrade.sh | 3 ++- 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 9cf64b5ae08..bcb3b9279ea 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: install.sh,v 1.4 1997/04/30 18:52:43 niklas Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -36,7 +37,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 7ccea68a553..21b3b9b8c7d 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: install.sub,v 1.5 1997/04/30 18:52:45 niklas Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -36,7 +37,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -# NetBSD installation/upgrade script - common subroutines. +# OpenBSD installation/upgrade script - common subroutines. ROOTDISK="" # filled in below VERSION= # filled in automatically (see list) @@ -611,7 +612,7 @@ install_from_mounted_fs() { fi done else - echo "There are no NetBSD install sets available in \"$1\"" + echo "There are no OpenBSD install sets available in \"$1\"" return fi diff --git a/distrib/miniroot/list b/distrib/miniroot/list index 279e3148c20..30e138a2cbf 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,3 +1,4 @@ +# $OpenBSD: list,v 1.6 1997/04/30 18:52:46 niklas Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin @@ -50,6 +51,7 @@ SYMLINK ../../instbin usr/bin/sort SYMLINK ../../instbin usr/bin/pax SYMLINK usr/bin/pax usr/bin/tar SYMLINK ../../instbin usr/bin/tip +SYMLINK ../../instbin usr/bin/vim usr/bin/vi # `internal' crunchgen links ARGVLINK mount_ffs ffs @@ -65,6 +67,7 @@ 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 +COPY ${DESTDIR}/etc/virc etc/virc # and the installation scripts COPY ${CURDIR}/install.sub install.sub diff --git a/distrib/miniroot/list2sh.awk b/distrib/miniroot/list2sh.awk index 2fa6f0b6e51..f9564e27c23 100644 --- a/distrib/miniroot/list2sh.awk +++ b/distrib/miniroot/list2sh.awk @@ -1,3 +1,4 @@ +# $OpenBSD: list2sh.awk,v 1.3 1997/04/30 18:52:47 niklas Exp $ # $NetBSD: list2sh.awk,v 1.2 1996/05/04 15:45:31 pk Exp $ BEGIN { diff --git a/distrib/miniroot/makeconf.awk b/distrib/miniroot/makeconf.awk index 01030db9816..6e251c2cbb4 100644 --- a/distrib/miniroot/makeconf.awk +++ b/distrib/miniroot/makeconf.awk @@ -1,3 +1,4 @@ +# $OpenBSD: makeconf.awk,v 1.4 1997/04/30 18:52:48 niklas Exp $ # $NetBSD: makeconf.awk,v 1.3 1996/05/04 15:45:32 pk Exp $ # diff --git a/distrib/miniroot/mtree.conf b/distrib/miniroot/mtree.conf index ad16fcaf94d..7a262f67f67 100644 --- a/distrib/miniroot/mtree.conf +++ b/distrib/miniroot/mtree.conf @@ -1,3 +1,4 @@ +# $OpenBSD: mtree.conf,v 1.3 1997/04/30 18:52:49 niklas Exp $ # $NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $ /set type=dir uname=root gname=wheel mode=0755 diff --git a/distrib/miniroot/runlist.sh b/distrib/miniroot/runlist.sh index 1ea9ff12198..4138d4e4455 100644 --- a/distrib/miniroot/runlist.sh +++ b/distrib/miniroot/runlist.sh @@ -1,3 +1,4 @@ +# $OpenBSD: runlist.sh,v 1.2 1997/04/30 18:52:49 niklas Exp $ # $NetBSD: runlist.sh,v 1.1 1995/12/18 22:47:38 pk Exp $ if [ "X$1" = "X-d" ]; then diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 572ce51174d..8143e464b3c 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,4 +1,5 @@ #!/bin/sh +# $OpenBSD: upgrade.sh,v 1.4 1997/04/30 18:52:50 niklas Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -36,7 +37,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -# NetBSD installation script. +# OpenBSD installation script. # In a perfect world, this would be a nice C program, with a reasonable # user interface. -- 2.20.1