move things back a directory

24 files changed, 55 insertions, 130 deletions

diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index 2a8ad948e3d..ad9cacf7326 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,5 +1,11 @@
-#	$OpenBSD: Makefile,v 1.4 1997/09/18 17:18:37 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/04/22 02:40:02 deraadt Exp $
 
-SUBDIR=	floppies
+SUBDIR= ramdisk_cd ramdiskA ramdiskB ramdiskC
+
+unconfig:
+	cd ramdisk_cd; ${MAKE} unconfig
+	cd ramdiskA; ${MAKE} unconfig
+	cd ramdiskB; ${MAKE} unconfig
+	cd ramdiskC; ${MAKE} unconfig
 
 .include <bsd.subdir.mk>
diff --git a/distrib/i386/Makefile.inc b/distrib/i386/Makefile.inc
new file mode 100644
index 00000000000..d504fb2a441
--- /dev/null
+++ b/distrib/i386/Makefile.inc
@@ -0,0 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2002/04/22 02:40:02 deraadt Exp $
+
+REV=	${OSrev}
+
+.include <bsd.own.mk>
diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 78289b8a63b..1a94fd05675 100644
--- a/distrib/i386/floppies/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.15 2002/03/30 20:35:31 millert Exp $
+#	$OpenBSD: Makefile.inc,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -61,10 +61,10 @@ bsd.rd:	${IMAGE} bsd rdsetroot
 
 
 bsd:
-	cd ${.CURDIR}/../../../../sys/arch/i386/conf && config ${RAMDISK}
-	cd ${.CURDIR}/../../../../sys/arch/i386/compile/${RAMDISK} && \
+	cd ${.CURDIR}/../../../sys/arch/i386/conf && config ${RAMDISK}
+	cd ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK} && \
 	    make clean && make depend && COPTS=-Os make
-	cp ${.CURDIR}/../../../../sys/arch/i386/compile/${RAMDISK}/bsd bsd
+	cp ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK}/bsd bsd
 
 ${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
 
@@ -83,8 +83,8 @@ rd_teardown:
 	cp ${REALIMAGE} ${IMAGE}
 	rm ${REALIMAGE}
 
-rdsetroot:	${TOP}/../../common/rdsetroot.c
-	${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/../../common/rdsetroot.c
+rdsetroot:	${TOP}/../common/rdsetroot.c
+	${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/../common/rdsetroot.c
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
diff --git a/distrib/i386/floppies/common/crunch.conf b/distrib/i386/common/crunch.conf
index e811956b675..9ebc2aab52a 100644
--- a/distrib/i386/floppies/common/crunch.conf
+++ b/distrib/i386/common/crunch.conf
@@ -1,10 +1,10 @@
-#	$OpenBSD: crunch.conf,v 1.2 2002/04/12 02:15:28 deraadt Exp $
+#	$OpenBSD: crunch.conf,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 #
 # instbin.conf - unified binary for the inst/upgr floppies
 #
 
 srcdirs distrib/special bin sbin usr.bin/less gnu/usr.bin usr.bin usr.sbin
-srcdirs usr.sbin/pppd sys/arch/i386/stand
+srcdirs sys/arch/i386/stand
 
 progs cat chmod cp dd df disklabel dhclient dmesg ed
 progs fsck_ffs ftp fdisk hostname
diff --git a/distrib/i386/floppies/common/install.md b/distrib/i386/common/install.md
index 6178fb42cb4..1a08aa16c98 100644
--- a/distrib/i386/floppies/common/install.md
+++ b/distrib/i386/common/install.md
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.md,v 1.17 2002/04/12 02:15:28 deraadt Exp $
+#	$OpenBSD: install.md,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 #
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/distrib/i386/floppies/common/list b/distrib/i386/common/list
index 0ca2cc0e176..2a8872087e0 100644
--- a/distrib/i386/floppies/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.28 2002/04/21 17:09:49 deraadt Exp $
+#	$OpenBSD: list,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -65,8 +65,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
+COPY	${CURDIR}/../../miniroot/protocols etc/protocols
+COPY	${CURDIR}/../../miniroot/services  etc/services
 
 SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
@@ -80,9 +80,9 @@ COPY	${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
 COPY	${CURDIR}/../common/termcap.vt		usr/share/misc/termcap
 
 # and the installation tools
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../common/dot.profile	 > .profile
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile	 > .profile
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md	 > install.md
-SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade
-SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../../miniroot/install.sh > install
-SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade
+SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/install.sh > install
+SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../miniroot/install.sub > install.sub
 SPECIAL	chmod 755 install upgrade
diff --git a/distrib/i386/floppies/common/list_floppy b/distrib/i386/common/list_floppy
index f9ed8a789bc..b821adbe682 100644
--- a/distrib/i386/floppies/common/list_floppy
+++ b/distrib/i386/common/list_floppy
@@ -1,4 +1,4 @@
-#       $OpenBSD: list_floppy,v 1.1 1999/08/06 20:49:08 deraadt Exp $
+#       $OpenBSD: list_floppy,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 
 COPY	${DESTDIR}/usr/mdec/boot	boot
 SPECIAL	strip boot
diff --git a/distrib/i386/floppies/common/mtree.conf b/distrib/i386/common/mtree.conf
index f1288eb2928..932a161b2be 100644
--- a/distrib/i386/floppies/common/mtree.conf
+++ b/distrib/i386/common/mtree.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: mtree.conf,v 1.6 2002/03/03 00:43:37 krw Exp $
+#	$OpenBSD: mtree.conf,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
diff --git a/distrib/i386/floppies/common/termcap.vt b/distrib/i386/common/termcap.vt
index 6ab68007c79..6ab68007c79 100644
--- a/distrib/i386/floppies/common/termcap.vt
+++ b/distrib/i386/common/termcap.vt
diff --git a/distrib/i386/floppies/Makefile b/distrib/i386/floppies/Makefile
deleted file mode 100644
index c49d567b6f4..00000000000
--- a/distrib/i386/floppies/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#	$OpenBSD: Makefile,v 1.9 2000/07/11 19:23:58 deraadt Exp $
-
-SUBDIR= ramdisk_cd ramdisk ramdiskB ramdiskC
-
-unconfig:
-	cd ramdisk_cd; ${MAKE} unconfig
-	cd ramdisk; ${MAKE} unconfig
-	cd ramdiskB; ${MAKE} unconfig
-	cd ramdiskC; ${MAKE} unconfig
-
-.include <bsd.subdir.mk>
diff --git a/distrib/i386/floppies/Makefile.inc b/distrib/i386/floppies/Makefile.inc
deleted file mode 100644
index ae4e9390eb0..00000000000
--- a/distrib/i386/floppies/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.12 1999/08/06 20:49:05 deraadt Exp $
-
-REV=	${OSrev}
-
-.include <bsd.own.mk>
diff --git a/distrib/i386/floppies/common/dot.profile b/distrib/i386/floppies/common/dot.profile
deleted file mode 100644
index 0b711107c24..00000000000
--- a/distrib/i386/floppies/common/dot.profile
+++ /dev/null
@@ -1,70 +0,0 @@
-#	$OpenBSD: dot.profile,v 1.11 2002/04/13 17:36:56 deraadt Exp $
-#	$NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $
-#
-# Copyright (c) 1995 Jason R. Thorpe
-# Copyright (c) 1994 Christopher G. Demetriou
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by Christopher G. Demetriou.
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-export PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
-umask 022
-set -o emacs # emacs-style command line editing
-
-rootdisk=`dmesg|sed -n -e '/OpenBSD /h' -e '//!H' -e '${
-	g
-	p
-}'|sed -n -e '/^root on \([0-9a-z]*\).*/{
-	s//\/dev\/\1/
-	p
-}'`
-
-if [ "X${DONEPROFILE}" = "X" ]; then
-	DONEPROFILE=YES
-
-	mount -u ${rootdisk:-/dev/rd0a} /
-
-	# set up some sane defaults
-	echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T'
-	stty newcrt werase ^W intr ^C kill ^U erase ^? status ^T 9600
-
-	# Installing or upgrading?
-	_forceloop=""
-	while [ "X$_forceloop" = X"" ]; do
-		echo -n '(I)nstall, (U)pgrade or (S)hell? '
-		read _forceloop
-		case "$_forceloop" in
-		i*|I*)	/install
-			;;
-		u*|U*)	/upgrade
-			;;
-		s*|S*)	;;
-		*)	_forceloop=""
-			;;
-		esac
-	done
-fi
diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile
deleted file mode 100644
index 078b8879777..00000000000
--- a/distrib/i386/floppies/ramdisk/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.35 2001/11/09 16:27:29 todd Exp $
-
-.PATH: ${.CURDIR}/../ramdisk
-RAMDISK=RAMDISK
-NOBSDRD=1
-
-.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/i386/floppies/ramdiskB/Makefile b/distrib/i386/floppies/ramdiskB/Makefile
deleted file mode 100644
index 880fc5514ee..00000000000
--- a/distrib/i386/floppies/ramdiskB/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile,v 1.1 1999/08/06 20:49:11 deraadt Exp $
-
-.PATH: ${.CURDIR}/../ramdisk
-RAMDISK=RAMDISKB
-XNAME=floppyB
-NOBSDRD=1
-
-.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/i386/floppies/list2sh.awk b/distrib/i386/list2sh.awk
index 54a00816727..c32a1d4667c 100644
--- a/distrib/i386/floppies/list2sh.awk
+++ b/distrib/i386/list2sh.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: list2sh.awk,v 1.7 2001/08/26 03:27:11 krw Exp $
+#	$OpenBSD: list2sh.awk,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 
 BEGIN {
 	printf("cd ${CURDIR}\n");
diff --git a/distrib/i386/ramdiskA/Makefile b/distrib/i386/ramdiskA/Makefile
new file mode 100644
index 00000000000..e428956d893
--- /dev/null
+++ b/distrib/i386/ramdiskA/Makefile
@@ -0,0 +1,7 @@
+#	$OpenBSD: Makefile,v 1.1 2002/04/22 02:40:03 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdiskA
+RAMDISK=RAMDISK
+NOBSDRD=1
+
+.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/i386/ramdiskB/Makefile b/distrib/i386/ramdiskB/Makefile
new file mode 100644
index 00000000000..08782c1f026
--- /dev/null
+++ b/distrib/i386/ramdiskB/Makefile
@@ -0,0 +1,8 @@
+#	$OpenBSD: Makefile,v 1.1 2002/04/22 02:40:03 deraadt Exp $
+
+.PATH: ${.CURDIR}/../ramdiskA
+RAMDISK=RAMDISKB
+XNAME=floppyB
+NOBSDRD=1
+
+.include "${.CURDIR}/../common/Makefile.inc"
diff --git a/distrib/i386/floppies/ramdiskC/Makefile b/distrib/i386/ramdiskC/Makefile
index fe150bbf5fc..604bb27f971 100644
--- a/distrib/i386/floppies/ramdiskC/Makefile
+++ b/distrib/i386/ramdiskC/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2002/03/30 20:35:31 millert Exp $
+#	$OpenBSD: Makefile,v 1.1 2002/04/22 02:40:03 deraadt Exp $
 
-.PATH: ${.CURDIR}/../ramdisk
+.PATH: ${.CURDIR}/../ramdiskA
 RAMDISK=RAMDISKC
 XNAME=floppyC
 NOBSDRD=1
diff --git a/distrib/i386/floppies/ramdiskC/crunch_local.conf b/distrib/i386/ramdiskC/crunch_local.conf
index 93b31ebc99b..cf709067308 100644
--- a/distrib/i386/floppies/ramdiskC/crunch_local.conf
+++ b/distrib/i386/ramdiskC/crunch_local.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: crunch_local.conf,v 1.1 2002/03/30 20:35:31 millert Exp $
+# $OpenBSD: crunch_local.conf,v 1.1 2002/04/22 02:40:03 deraadt Exp $
 
 # Include wicontrol and ancontrol for wireless installs
 progs wicontrol ancontrol
diff --git a/distrib/i386/floppies/ramdiskC/list.local b/distrib/i386/ramdiskC/list.local
index 704e5326aae..7e2b3e1e66a 100644
--- a/distrib/i386/floppies/ramdiskC/list.local
+++ b/distrib/i386/ramdiskC/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.1 2002/03/30 20:35:31 millert Exp $
+# $OpenBSD: list.local,v 1.1 2002/04/22 02:40:03 deraadt Exp $
 
 # add local links; use bin/sh since instbin has already been unlinked
 LINK	bin/sh		sbin/wicontrol
diff --git a/distrib/i386/floppies/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index c0a5811ca5b..f9356fb162e 100644
--- a/distrib/i386/floppies/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/03/30 20:35:31 millert Exp $
+#	$OpenBSD: Makefile,v 1.1 2002/04/22 02:40:03 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISK_CD
diff --git a/distrib/i386/floppies/ramdisk_cd/crunch_local.conf b/distrib/i386/ramdisk_cd/crunch_local.conf
index 93b31ebc99b..cf709067308 100644
--- a/distrib/i386/floppies/ramdisk_cd/crunch_local.conf
+++ b/distrib/i386/ramdisk_cd/crunch_local.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: crunch_local.conf,v 1.1 2002/03/30 20:35:31 millert Exp $
+# $OpenBSD: crunch_local.conf,v 1.1 2002/04/22 02:40:03 deraadt Exp $
 
 # Include wicontrol and ancontrol for wireless installs
 progs wicontrol ancontrol
diff --git a/distrib/i386/floppies/ramdisk_cd/list.local b/distrib/i386/ramdisk_cd/list.local
index 704e5326aae..7e2b3e1e66a 100644
--- a/distrib/i386/floppies/ramdisk_cd/list.local
+++ b/distrib/i386/ramdisk_cd/list.local
@@ -1,4 +1,4 @@
-# $OpenBSD: list.local,v 1.1 2002/03/30 20:35:31 millert Exp $
+# $OpenBSD: list.local,v 1.1 2002/04/22 02:40:03 deraadt Exp $
 
 # add local links; use bin/sh since instbin has already been unlinked
 LINK	bin/sh		sbin/wicontrol
diff --git a/distrib/i386/floppies/runlist.sh b/distrib/i386/runlist.sh
index 2129c8ea733..bf5b8ee55f3 100644
--- a/distrib/i386/floppies/runlist.sh
+++ b/distrib/i386/runlist.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: runlist.sh,v 1.2 1996/04/25 21:28:01 niklas Exp $
+#	$OpenBSD: runlist.sh,v 1.1 2002/04/22 02:40:02 deraadt Exp $
 
 if [ "X$1" = "X-d" ]; then
 	SHELLCMD=cat