diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-06 20:49:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-08-06 20:49:13 +0000 |
| commit | 4b57bcebb4c156295b28be0f3c4a570686d600ee (patch) | |
| tree | bf7dba94529431777059e169b5682849aa812d4c /distrib/i386 | |
| parent | b157f7dc13613d1d5742dd6d18c41bb56719b307 (diff) | |
new install media. floppyXX.fs is the regular one. floppyBXX.fs contains no
none of the scsi drivers on the first floppy, but others (to be detailed
elsewhere). bsd.rd is still the one from floppyXX.fs. finally, cdromXX.fs
is a 2.88MB install, which contains a superset of all these.. to be placed on
the CD.
Diffstat (limited to 'distrib/i386')
39 files changed, 193 insertions, 2321 deletions
diff --git a/distrib/i386/floppies/Makefile b/distrib/i386/floppies/Makefile index 85c198995bf..7c71c52c96a 100644 --- a/distrib/i386/floppies/Makefile +++ b/distrib/i386/floppies/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 1997/04/18 07:27:41 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 1999/08/06 20:49:05 deraadt Exp $ -SUBDIR= ramdisk +SUBDIR= ramdisk_cd ramdisk ramdiskB unconfig: + cd ramdisk_cd; ${MAKE} unconfig cd ramdisk; ${MAKE} unconfig + cd ramdiskB; ${MAKE} unconfig .include <bsd.subdir.mk> diff --git a/distrib/i386/floppies/Makefile.inc b/distrib/i386/floppies/Makefile.inc index 0924d250eb2..ae4e9390eb0 100644 --- a/distrib/i386/floppies/Makefile.inc +++ b/distrib/i386/floppies/Makefile.inc @@ -1,6 +1,5 @@ -# $OpenBSD: Makefile.inc,v 1.11 1998/06/27 20:52:07 todd Exp $ +# $OpenBSD: Makefile.inc,v 1.12 1999/08/06 20:49:05 deraadt Exp $ REV= ${OSrev} -FLOPPY3=1 .include <bsd.own.mk> diff --git a/distrib/i386/floppies/common/Makefile.inc b/distrib/i386/floppies/common/Makefile.inc index 168a26eb4cc..497bb0feb83 100644 --- a/distrib/i386/floppies/common/Makefile.inc +++ b/distrib/i386/floppies/common/Makefile.inc @@ -1,72 +1,123 @@ -# $OpenBSD: Makefile.inc,v 1.6 1997/09/26 02:09:56 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.7 1999/08/06 20:49:08 deraadt Exp $ -# TOP is assumed to be defined by Makefile including this one. +TOP= ${.CURDIR}/.. -CBIN= instbin -COMMONDIR= ${TOP}/inst-common +.include "${TOP}/Makefile.inc" +IMAGE= mr.fs +CBIN?= instbin +.if (${KERBEROS} == "yes") +CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}.conf +.else +CRUNCHCONF?= ${.CURDIR}/../common/${CBIN}-nokrb.conf +.endif +LISTS= ${.CURDIR}/../common/list -MOUNT_POINT?= /mnt +MOUNT_POINT= /mnt +MTREE= ${.CURDIR}/../common/mtree.conf + +XNAME?= floppy +FS?= ${XNAME}${REV}.fs VND?= svnd0 VND_DEV= /dev/${VND}a VND_RDEV= /dev/r${VND}a -IMAGE?= xxx${REV}.fs +VND_CRDEV= /dev/r${VND}c PID!= echo $$$$ -REALIMAGE= /var/tmp/image.${PID} -MDEC= ${DESTDIR}/usr/mdec +REALIMAGE!= echo /var/tmp/image.${PID} +LISTFLOPPY= ${.CURDIR}/../common/list_floppy +FLOPPYSIZE?= 144 +FLOPPYTYPE?= floppy3 -LISTS= ${COMMONDIR}/list ${.CURDIR}/list -.if (${KERBEROS} == "yes") -CRUNCHCONF= ${COMMONDIR}/${CBIN}-krb.conf -.else -CRUNCHCONF= ${COMMONDIR}/${CBIN}.conf -.endif -MTREE= ${COMMONDIR}/mtree.conf +all: ${FS} -all: ${CBIN} -.ifndef FLOPPY3 - dd if=/dev/zero of=${REALIMAGE} bs=10k count=120 - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy5 - newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} -.else - dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 +${FS}: bsd.gz + dd if=/dev/zero of=${REALIMAGE} bs=10k count=${FLOPPYSIZE} vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3 - newfs -O -m 0 -o space -i 3000 -c 80 ${VND_RDEV} -.endif + disklabel -w -r ${VND} ${FLOPPYTYPE} + newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV} mount ${VND_DEV} ${MOUNT_POINT} - mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} + TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY} + /usr/mdec/installboot -v -s 18 -h 2 ${MOUNT_POINT}/boot \ + ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV} @echo "" @df -i ${MOUNT_POINT} @echo "" umount ${MOUNT_POINT} vnconfig -u ${VND} + cp ${REALIMAGE} ${FS} + rm ${REALIMAGE} + +DISKTYPE?= rdroot +NBLKS?= 3510 +# minfree, opt, b/i trks, sects, cpg +NEWFSARGS= -m 0 -o space -c 16 -i 4096 + +bsd.gz: bsd.rd + cp bsd.rd bsd.strip + strip bsd.strip + gzip -c9 bsd.strip > bsd.gz + +bsd.rd: ${IMAGE} bsd rdsetroot + cp bsd bsd.rd + ${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE} + + +bsd: + cd ${.CURDIR}/../../../../sys/arch/i386/conf && config ${RAMDISK} + cd ${.CURDIR}/../../../../sys/arch/i386/compile/${RAMDISK} && \ + make clean && COPTS=-Os make +# cd ${.CURDIR}/../../../../sys/arch/i386/compile/${RAMDISK} && \ +# make clean && make + cp ${.CURDIR}/../../../../sys/arch/i386/compile/${RAMDISK}/bsd bsd + +${IMAGE}: ${CBIN} rd_setup do_files rd_teardown + +rd_setup: ${CBIN} + dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS} + vnconfig -v -c ${VND} ${REALIMAGE} + disklabel -w -r ${VND} ${DISKTYPE} + newfs ${NEWFSARGS} ${VND_RDEV} + fsck ${VND_RDEV} + mount ${VND_DEV} ${MOUNT_POINT} + +rd_teardown: + @df -i ${MOUNT_POINT} + -umount ${MOUNT_POINT} + -vnconfig -u ${VND} cp ${REALIMAGE} ${IMAGE} rm ${REALIMAGE} +rdsetroot: ${TOP}/common/rdsetroot.c + ${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/common/rdsetroot.c + unconfig: -umount -f ${MOUNT_POINT} -vnconfig -u ${VND} -/bin/rm -f ${IMAGE} +.PRECIOUS: ${IMAGE} + +install: +.ifndef NOBSDRD + cp bsd.rd ${DESTDIR}/snapshot/bsd.rd +.endif + cp ${FS} ${DESTDIR}/snapshot/${FS} + ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} - crunchgen -D ${TOP}/../../.. -m ${CBIN}.mk -L ${DESTDIR}/usr/lib \ - ${CRUNCHCONF} + crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ + -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c make -f ${CBIN}.mk all -.if (${KERBEROS} == "yes") - mv ${CBIN}-krb ${CBIN} -.endif -install: - cp ${IMAGE} ${DESTDIR}/snapshot/ +do_files: + mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u + TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ + REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk \ - ${CBIN}.cache *.o *.lo *.c + /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \ + *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/i386/floppies/common/dot.commonutils b/distrib/i386/floppies/common/dot.commonutils deleted file mode 100644 index d8c9e6e19bf..00000000000 --- a/distrib/i386/floppies/common/dot.commonutils +++ /dev/null @@ -1,131 +0,0 @@ -# $OpenBSD: dot.commonutils,v 1.1 1997/04/13 17:17:44 mickey Exp $ -# -# 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. - -# Installation utilites (functions), to get OpenBSD installed on -# the hard disk. These are meant to be invoked from the shell prompt, -# by people installing OpenBSD. - -# we know that /etc/fstab is only generated on the hard drive -dest_dir=/ -if [ ! -f /etc/fstab ]; then - dest_dir=/mnt/ -fi - -# counter for possible shared library confusion -TAR=/bin/tar -GUNZIP="/usr/bin/gzip -d" - -Set_tmp_dir() -{ - def_tmp_dir=`pwd` - if [ "$def_tmp_dir" = "/" -o "$def_tmp_dir" = "/mnt" ]; then - def_tmp_dir="$dest_dir"usr/distrib - fi - - echo -n "What directory should be used to find and/or store " - echo "installtion" - echo -n "files? [$def_tmp_dir] " - read tmp_dir - if [ "$tmp_dir" = "" ]; then - tmp_dir=$def_tmp_dir - fi - if [ ! -d "$tmp_dir" ]; then - /bin/rm -rf $tmp_dir - mkdir -p $tmp_dir - fi -} - -Tmp_dir() -{ - if [ "$tmp_dir" = "" ]; then - Set_tmp_dir - fi - cd $tmp_dir -} - -Load_fd() -{ - Tmp_dir - which= - echo "Don't forget that you can't load from the drive you booted from." - echo "" - - while [ "$which" != "0" -a "$which" != "1" ]; do - echo -n "Read from which floppy drive ('0' or '1')? [1] " - read which - if [ "X$which" = "X" ]; then - which=1 - fi - done - echo "" - echo "WARNING: during the floppy loading process, you should only" - echo "use Control-C at the prompt." - echo "" - while echo -n \ - "Insert floppy (hit Control-C to terminate, enter to load): " - do - read foo - mount -r -t msdos /dev/fd${which}a /mnt2 - cp -rp /mnt2/* . - umount /mnt2 - done -} - -Load_tape() -{ - Tmp_dir - echo -n "Which tape drive will you be using? [rst0] " - read which - if [ "X$which" = "X" ]; then - which=rst0 - fi - echo -n "Insert the tape into the tape drive and hit return to " - echo -n "continue..." - read foo - echo "Extracting files from the tape..." - $TAR -xvpf /dev/$which - echo "Done." -} - -Extract() -{ - Tmp_dir - echo -n "Would you like to list the files as they're extracted? [n] " - read verbose - case $verbose in - y*|Y*) - tarverbose=v - ;; - *) - tarverbose= - ;; - esac - cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - ) -} diff --git a/distrib/i386/floppies/ramdisk/dot.profile b/distrib/i386/floppies/common/dot.profile index 4979853d3fd..824dbaa89a2 100644 --- a/distrib/i386/floppies/ramdisk/dot.profile +++ b/distrib/i386/floppies/common/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.9 1998/04/13 01:17:22 deraadt Exp $ +# $OpenBSD: dot.profile,v 1.1 1999/08/06 20:49:08 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe diff --git a/distrib/i386/floppies/ramdisk/install.md b/distrib/i386/floppies/common/install.md index 5fdc16ef1f5..e1048e3bd96 100644 --- a/distrib/i386/floppies/ramdisk/install.md +++ b/distrib/i386/floppies/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.49 1999/07/30 17:16:05 deraadt Exp $ +# $OpenBSD: install.md,v 1.1 1999/08/06 20:49:08 deraadt Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. diff --git a/distrib/i386/floppies/common/instbin-krb.conf b/distrib/i386/floppies/common/instbin-krb.conf deleted file mode 100644 index c1002e5732c..00000000000 --- a/distrib/i386/floppies/common/instbin-krb.conf +++ /dev/null @@ -1,26 +0,0 @@ -# $OpenBSD: instbin-krb.conf,v 1.8 1997/12/02 02:29:53 deraadt Exp $ -# -# instbin.conf - unified binary for the inst/upgr floppies -# - -srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd - -progs awk bad144 cat chmod chown cp dd df disklabel ed expr fsck_ffs -progs ftp fdisk -progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_nfs mount_kernfs -progs mv newfs pax ksh ping pppd pwd reboot rm route -progs scsi sed shutdown slattach stty sync test tip umount -progs rsh restore gzip - -ln chown chgrp -ln fsck_ffs fsck -ln less more -ln pax tar -ln pax cpio -ln ksh sh -ln ksh -sh # init invokes the shell this way -ln test [ -ln reboot halt - -libs -ledit -lutil -ltermcap -lkrb -ldes -ll -lm diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/common/instbin-nokrb.conf index 9ae5e912869..fdf75e19ed3 100644 --- a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf +++ b/distrib/i386/floppies/common/instbin-nokrb.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin-nokrb.conf,v 1.15 1999/04/08 08:01:25 deraadt Exp $ +# $OpenBSD: instbin-nokrb.conf,v 1.1 1999/08/06 20:49:08 deraadt Exp $ # # instbin-nokrb.conf - unified binary for the inst/upgr floppies # diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf index 569a1355064..007612c8da5 100644 --- a/distrib/i386/floppies/common/instbin.conf +++ b/distrib/i386/floppies/common/instbin.conf @@ -1,17 +1,18 @@ -# $OpenBSD: instbin.conf,v 1.7 1997/12/02 02:29:56 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.8 1999/08/06 20:49:08 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # -srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd +srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin +srcdirs usr.sbin/pppd sys/arch/i386/stand -progs awk bad144 cat chat chmod chown cp dd df disklabel ed +progs cat chmod chown cp dd df disklabel dhclient ed progs expr fsck_ffs ftp fdisk progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_nfs mount_kernfs -progs mv newfs pax ksh ping pppd pwd reboot rm route -progs scsi sed shutdown slattach stty sync test tip umount -progs rsh restore gzip +progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs +progs mv newfs pax ksh ping reboot rm route +progs sed sleep stty tip umount +progs rsh restore gzip sort grep installboot ln chown chgrp ln fsck_ffs fsck @@ -20,7 +21,10 @@ ln pax tar ln pax cpio ln ksh sh ln ksh -sh # init invokes the shell this way -ln test [ ln reboot halt +ln gzip gunzip +ln grep egrep +ln grep fgrep -libs -ledit -lutil -ltermcap -ll -lm +# Use -lotermcap instead of -ltermcap/-lcurses since it is smaller +libs -lutil -lotermcap -lkrb -ldes -ll -lm diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list index 8db14353c86..26cd5188e28 100644 --- a/distrib/i386/floppies/common/list +++ b/distrib/i386/floppies/common/list @@ -1,34 +1,28 @@ -# $OpenBSD: list,v 1.9 1997/05/07 06:03:22 deraadt Exp $ +# $OpenBSD: list,v 1.10 1999/08/06 20:49:08 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin LINK instbin bin/cat LINK instbin bin/chmod LINK instbin bin/cp -LINK instbin bin/cpio +LINK instbin bin/cpio bin/pax bin/tar LINK instbin bin/dd LINK instbin bin/df LINK instbin bin/ed LINK instbin bin/expr -LINK instbin bin/hostname LINK instbin bin/ln LINK instbin bin/ls LINK instbin bin/mkdir LINK instbin bin/mv -LINK instbin bin/pwd LINK instbin bin/rm -LINK instbin bin/sh +LINK instbin bin/sh bin/ksh LINK instbin bin/sleep LINK instbin bin/stty -LINK instbin bin/sync -LINK instbin bin/tar -LINK instbin bin/test -LINK instbin bin/[ LINK instbin sbin/disklabel +LINK instbin sbin/dhclient LINK instbin sbin/fdisk -LINK instbin sbin/fsck -LINK instbin sbin/fsck_ffs -LINK instbin sbin/halt +LINK instbin sbin/fsck sbin/fsck_ffs +LINK instbin sbin/halt sbin/reboot LINK instbin sbin/ifconfig LINK instbin sbin/init LINK instbin sbin/mknod @@ -39,55 +33,59 @@ LINK instbin sbin/mount_msdos LINK instbin sbin/mount_nfs LINK instbin sbin/mount_kernfs LINK instbin sbin/mount_ext2fs -LINK instbin sbin/newfs +LINK instbin sbin/newfs sbin/mount_mfs LINK instbin sbin/ping LINK instbin sbin/restore -LINK instbin sbin/reboot LINK instbin sbin/route -LINK instbin sbin/shutdown -LINK instbin sbin/slattach +#LINK instbin sbin/scsi +#LINK instbin sbin/swapon LINK instbin sbin/umount -SYMLINK /bin/cat usr/bin/awk -SYMLINK /bin/cat usr/bin/cut -SYMLINK /bin/cat usr/bin/chgrp -SYMLINK /bin/cat usr/bin/egrep -SYMLINK /bin/cat usr/bin/fgrep -SYMLINK /bin/cat usr/bin/ftp -SYMLINK /bin/cat usr/bin/grep -SYMLINK /bin/cat usr/bin/gzip -SYMLINK /bin/cat usr/bin/gunzip -SYMLINK /bin/cat usr/bin/less -SYMLINK /bin/cat usr/bin/more -SYMLINK /bin/cat usr/bin/rsh -SYMLINK /bin/cat usr/bin/sed -SYMLINK /bin/cat usr/bin/sort -SYMLINK /bin/cat usr/bin/tip -SYMLINK /bin/cat usr/bin/vi -SYMLINK /bin/cat usr/sbin/bad144 -SYMLINK /bin/cat usr/sbin/chat -SYMLINK /bin/cat usr/sbin/chown -SYMLINK /bin/cat usr/sbin/pppd +LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep +LINK instbin usr/bin/ftp +LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat +LINK instbin usr/bin/less usr/bin/more +LINK instbin usr/bin/rsh +LINK instbin usr/bin/sed +LINK instbin usr/bin/sort +LINK instbin usr/sbin/chown usr/sbin/chgrp +LINK instbin usr/mdec/installboot SPECIAL /bin/rm instbin +# `internal' crunchgen links +ARGVLINK sh -sh + # copy the MAKEDEV script and make some devices COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV SPECIAL cd dev; sh MAKEDEV ramdisk SPECIAL /bin/rm dev/MAKEDEV # we need the contents of /usr/mdec -COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec/bootsd -SPECIAL cd usr/mdec; ln bootsd bootwd -COPY ${DESTDIR}/usr/mdec/bootsd usr/mdec/sdboot -SPECIAL cd usr/mdec; ln sdboot wdboot +COPY ${DESTDIR}/usr/mdec/biosboot usr/mdec/biosboot +COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr +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 +SYMLINK /tmp/fstab.shadow etc/fstab +SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf +SYMLINK /tmp/hosts etc/hosts -COPYDIR ${DESTDIR}/etc/ppp etc/ppp +# dhcp things +COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script # and the common installation tools -COPY ${TOPDIR}/common/termcap.pc3 usr/share/misc/termcap -COPY ${DESTDIR}/usr/share/misc/scsi_modes usr/share/misc/scsi_modes +COPY ${CURDIR}/../common/termcap.pcvt usr/share/misc/termcap +#COPY ${DESTDIR}/usr/share/misc/scsi_modes usr/share/misc/scsi_modes + +# and the installation tools +COPY ${CURDIR}/../common/dot.profile .profile +COPY ${CURDIR}/../common/install.md install.md +COPY ${CURDIR}/../../../miniroot/install.sh install +COPY ${CURDIR}/../../../miniroot/upgrade.sh upgrade +SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub +SPECIAL chmod 755 install upgrade diff --git a/distrib/i386/floppies/ramdisk/list_floppy b/distrib/i386/floppies/common/list_floppy index cb425fda541..f9ed8a789bc 100644 --- a/distrib/i386/floppies/ramdisk/list_floppy +++ b/distrib/i386/floppies/common/list_floppy @@ -1,4 +1,4 @@ -# $OpenBSD: list_floppy,v 1.3 1997/05/08 05:56:24 tholo Exp $ +# $OpenBSD: list_floppy,v 1.1 1999/08/06 20:49:08 deraadt Exp $ COPY ${DESTDIR}/usr/mdec/boot boot SPECIAL strip boot diff --git a/distrib/i386/floppies/common/mtree.conf b/distrib/i386/floppies/common/mtree.conf index da6e3e3fdea..4cf67a9de1c 100644 --- a/distrib/i386/floppies/common/mtree.conf +++ b/distrib/i386/floppies/common/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.3 1997/04/17 02:10:33 niklas Exp $ +# $OpenBSD: mtree.conf,v 1.4 1999/08/06 20:49:08 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -81,3 +81,21 @@ misc # ./usr .. + +# ./var +var + +# ./var/tmp +tmp mode=01777 + +# ./var/tmp +.. + +# ./var/db +db + +# ./var/db +.. + +# ./var +.. diff --git a/distrib/i386/floppies/common/termcap.pc3 b/distrib/i386/floppies/common/termcap.pc3 deleted file mode 100644 index 9d2bf1bcee2..00000000000 --- a/distrib/i386/floppies/common/termcap.pc3 +++ /dev/null @@ -1,44 +0,0 @@ -# $OpenBSD: termcap.pc3,v 1.2 1997/04/17 02:10:34 niklas Exp $ -# -# Copyright (c) 1980, 1985, 1989 The Regents of the University of California. -# 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 the University of -# California, Berkeley and its contributors. -# 4. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. -# -# @(#)termcap.src 5.109 (Berkeley) 3/8/93 -# -pc3|ibmpc3|IBM PC 386BSD Console:\ - :DO=\E[%dB:K1=\E[H:K2=\E[E:K3=\E[I:K4=\E[F:K5=\E[G:LE=\E[%dD:\ - :RI=\E[%dC:UP=\E[%dA:am:bl=^G:bs:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\ - :cm=\E[%i%d;%dH:co#80:cr=^M:do=^J:ho=\E[H:is=\E[m:k0=\E[V:k1=\E[M:\ - :k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\ - :kD=\177:kH=\E[F:kN=\E[G:kP=\E[I:kb=\177:kd=\E[B:kh=\E[H:kl=\E[D:\ - :kr=\E[C:ku=\E[A:le=^H:li#25:ms:nd=\E[C:rs=\E[m\E[x\E[14r:se=\E[m:\ - :sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:te=\E[m:ti=\E[m:up=\E[A:km:pt:\ - :AL=\E[%dL:DL=\E[%dM:SF=\E[%dS:SR=\E[%dT:al=\E[L:dl=\E[M: diff --git a/distrib/i386/floppies/ramdisk/termcap.pcvt b/distrib/i386/floppies/common/termcap.pcvt index 1beef0ecbbf..cdca00a4c99 100644 --- a/distrib/i386/floppies/ramdisk/termcap.pcvt +++ b/distrib/i386/floppies/common/termcap.pcvt @@ -1,5 +1,5 @@ # -# $OpenBSD: termcap.pcvt,v 1.1 1997/09/06 03:53:59 millert Exp $ +# $OpenBSD: termcap.pcvt,v 1.1 1999/08/06 20:49:08 deraadt Exp $ # pcvtXX|pcvt vt200 emulator (DEC VT220):\ :am:km:mi:ms:xn:\ diff --git a/distrib/i386/floppies/inst/Makefile b/distrib/i386/floppies/inst/Makefile deleted file mode 100644 index be66c58c5c0..00000000000 --- a/distrib/i386/floppies/inst/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile,v 1.4 1997/04/17 02:10:35 niklas Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" -IMAGE= inst${REV}.fs - -.include "${TOP}/common/Makefile.inc" diff --git a/distrib/i386/floppies/inst/disktab.preinstall b/distrib/i386/floppies/inst/disktab.preinstall deleted file mode 100644 index 73b537f4694..00000000000 --- a/distrib/i386/floppies/inst/disktab.preinstall +++ /dev/null @@ -1,31 +0,0 @@ -# $OpenBSD: disktab.preinstall,v 1.2 1997/04/17 02:10:37 niklas Exp $ - -# Disk geometry and partition layout tables. -# Key: -# dt controller type -# ty type of disk (fixed, removeable, simulated) -# d[0-4] drive-type-dependent parameters -# ns #sectors/track -# nt #tracks/cylinder -# nc #cylinders/disk -# sc #sectors/cylinder, nc*nt default -# su #sectors/unit, sc*nc default -# se sector size, DEV_BSIZE default -# rm rpm, 3600 default -# sf supports bad144-style bad sector forwarding -# sk sector skew per track, default 0 -# cs sector skew per cylinder, default 0 -# hs headswitch time, default 0 -# ts one-cylinder seek time, default 0 -# il sector interleave (n:1), 1 default -# bs boot block size, default BBSIZE -# sb superblock size, default SBSIZE -# o[a-h] partition offsets in sectors -# p[a-h] partition sizes in sectors -# b[a-h] partition block sizes in bytes -# f[a-h] partition fragment sizes in bytes -# t[a-h] partition types (filesystem, swap, etc) -# -# All partition sizes reserve space for bad sector tables. -# (5 cylinders needed for maintenance + replacement sectors) -# diff --git a/distrib/i386/floppies/inst/dot.hdprofile b/distrib/i386/floppies/inst/dot.hdprofile deleted file mode 100644 index 5f3782e72f3..00000000000 --- a/distrib/i386/floppies/inst/dot.hdprofile +++ /dev/null @@ -1,59 +0,0 @@ -# $OpenBSD: dot.hdprofile,v 1.5 1996/06/16 10:25:13 deraadt Exp $ -# -# 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. - -PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ -export PATH -TERM=pc3 -export TERM - -umask 022 - -if [ "X${DONEPROFILE}" = "X" ]; then - DONEPROFILE=YES - - echo "Checking filesystems..." - fsck -y - - echo "Mounting filesystems..." - mount -a - mount -t kernfs /kern /kern - - # set up some sane defaults - echo 'erase ^?, werase ^W, kill ^U, intr ^C' - stty newcrt werase ^W intr ^C kill ^U erase ^? 9600 - echo '' - - # pull in the functions that people will use from the shell prompt. - . /.commonutils - . /.instutils - - echo "Follow the installation directions to install the OpenBSD" - echo "distribution sets." -fi diff --git a/distrib/i386/floppies/inst/dot.instutils b/distrib/i386/floppies/inst/dot.instutils deleted file mode 100644 index 32dfd63af6a..00000000000 --- a/distrib/i386/floppies/inst/dot.instutils +++ /dev/null @@ -1,156 +0,0 @@ -# $OpenBSD: dot.instutils,v 1.2 1996/04/25 21:28:06 niklas Exp $ -# -# 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. - -# Installation configuration utilites (functions), to get OpenBSD configured -# reasonably once it is installed on the hard disk. These are meant to be -# invoked from the shell prompt, by people installing OpenBSD. - -Configure() -{ - DEV=/dev - ETC=/etc - if [ ! -f /etc/fstab ]; then - DEV=/mnt/dev - ETC=/mnt/etc - fi - - echo "You will now be prompted for information about this" - echo "machine. If you hit return, the default answer (in" - echo "brackets) will be used." - - echo "" - echo -n "What is this machine's hostname? [unknown.host.domain] " - read hname - if [ "$hname" = "" ]; then - hname=unknown.host.domain - fi - echo $hname > ${ETC}/myname - proto_domain=`echo $hname | sed -e 's/[^.]*\.//'` - - echo "" - echo "What domain is this machine in (this is NOT its YP" - echo -n "domain name)? [$proto_domain] " - read dname - if [ "$dname" = "" ]; then - dname=$proto_domain - fi - - echo "" - if [ -e $ETC/sendmail.cf ]; then - echo "WARNING: A default sendmail.cf exists, and probably" - echo "needs to be tuned and/or replaced, to work properly at" - echo "your site!" - else - echo "WARNING: No default sendmail.cf installed. Did you" - echo "forget to install the 'etc' distribution?" - fi - - echo "127.0.0.1 localhost localhost.$dname" > ${ETC}/hosts - - echo "" - echo -n "Does this machine have an ethernet interface? [y] " - read resp - case "$resp" in - n*) - ;; - *) - intf= - while [ "$intf" = "" ]; do - echo -n "What is the primary interface name " - echo -n "(e.g. ed0, ep0, etc)? " - read intf - done - echo -n "What is the hostname for this interface? [$hname] " - read ifname - if [ "$ifname" = "" ]; then - ifname=$hname - fi - ifaddr= - while [ "$ifaddr" = "" ]; do - echo -n "What is the IP address associated with " - echo -n "interface ${intf}? " - read ifaddr - done - echo "$ifaddr $ifname `echo $ifname | sed -e s/\.$dname//`" \ - >> ${ETC}/hosts - - echo -n "Does this interface have a special netmask? [n] " - read resp - case "$resp" in - y*) - echo -n "What is the netmask? [0xffffff00] " - read ifnetmask - if [ "$ifnetmask" = "" ]; then - ifnetmask=0xffffff00 - fi - ;; - *) - ifnetmask= - ;; - esac - - echo -n "Does this interface need additional flags? [n] " - read resp - case "$resp" in - y*) - echo -n "What flags? [link0] " - read ifflags - if [ "$ifflags" = "" ]; then - ifflags=link0 - fi - ;; - *) - ifflags= - ;; - esac - echo "inet $ifname $ifnetmask $ifflags" > ${ETC}/hostname.$intf - - echo "" - echo -n "WARNING: if you have any more ethernet interfaces, " - echo "you will have to configure" - echo -n "them by hand. Read the comments in /etc/netstart to " - echo "learn how to do this." - ;; - esac - - echo "" - echo -n "Making device nodes (may take a while)..." - cd ${DEV} - sh MAKEDEV all - echo " done." - - sync - - echo "" - echo "If you haven't already installed a kernel on the hard drive" - echo "using your kernel-copy floppy, do so now. Kernel" - echo "installation instructions can be found in the" - echo "installation notes." -} diff --git a/distrib/i386/floppies/inst/dot.profile b/distrib/i386/floppies/inst/dot.profile deleted file mode 100644 index d78bcb92ee8..00000000000 --- a/distrib/i386/floppies/inst/dot.profile +++ /dev/null @@ -1,57 +0,0 @@ -# $OpenBSD: dot.profile,v 1.6 1997/10/20 22:24:07 millert Exp $ -# -# 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:/ -export HISTFILE=/.sh_history -export TERM=pc3 - -umask 022 - -set -o emacs # emacs-style command line editing - -if [ "X${DONEPROFILE}" = "X" ]; then - DONEPROFILE=YES - - # set up some sane defaults - echo 'erase ^?, werase ^W, kill ^U, intr ^C' - stty newcrt werase ^W intr ^C kill ^U erase ^? 9600 - echo '' - - # mount the kern_fs so that we can examine the dmesg state - mount -t kernfs /kern /kern - - # pull in the functions that people will use from the shell prompt. - . /.commonutils - . /.instutils - - # run the installation script. - install -fi diff --git a/distrib/i386/floppies/inst/install.sh b/distrib/i386/floppies/inst/install.sh deleted file mode 100644 index 27e5b1b25bb..00000000000 --- a/distrib/i386/floppies/inst/install.sh +++ /dev/null @@ -1,638 +0,0 @@ -#!/bin/sh -# $OpenBSD: install.sh,v 1.20 1998/11/03 04:17:20 aaron Exp $ -# -# 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. - -# OpenBSD installation script. -# In a perfect world, this would be a nice C program, with a reasonable -# user interface. - -DT=/etc/disktab # /etc/disktab -FSTABDIR=/mnt/etc # /mnt/etc -#DONTDOIT=echo - -VERSION=2.0 -FSTAB=${FSTABDIR}/fstab - -getresp() { - read resp - if [ "X$resp" = "X" ]; then - resp=$1 - fi -} - -echo "Welcome to the OpenBSD ${VERSION} installation program." -echo "" -echo "This program is will put OpenBSD on your hard disk. It is not" -echo "painless, but it could be worse. You'll be asked several questions," -echo "and it would probably be useful to have your disk's hardware" -echo "manual, the installation notes, and a calculator handy." -echo "" -echo "In particular, you will need to know some reasonably detailed" -echo "information about your disk's geometry, because there is currently" -echo "no way this this program can figure that information out." -echo "" -echo "As with anything which modifies your hard drive's contents, this" -echo "program can cause SIGNIFICANT data loss, and you are advised" -echo "to make sure your hard drive is backed up before beginning the" -echo "installation process." -echo "" -echo "Default answers are displyed in brackets after the questions." -echo "You can hit Control-C at any time to quit, but if you do so at a" -echo "prompt, you may have to hit return. Also, quitting in the middle of" -echo "installation may leave your system in an inconsistent state." -echo "" -echo -n "Proceed with installation? [n] " -getresp "n" -case "$resp" in -y*|Y*) - echo "Cool! Let's get to it..." - ;; -*) - echo "OK, then. Enter 'halt' at the prompt to halt the" - echo "machine. Once the machine has halted, remove the" - echo "floppy and press any key to reboot." - exit - ;; -esac - -echo "" -echo "To do the installation, you'll need to provide some information about" -echo "your disk." - -echo "OpenBSD can be installed on ST506, ESDI, IDE, or SCSI disks." -echo -n "What kind of disk will you be installing on? [SCSI] " -getresp "SCSI" -case "$resp" in -esdi|ESDI|st506|ST506) - drivetype=wd - echo -n "Does it support _automatic_ sector remapping? [y] " - getresp "y" - case "$resp" in - n*|N*) - sect_fwd="sf:" - ;; - *) - sect_fwd="" - ;; - esac -;; -ide|IDE) - drivetype=wd - sect_fwd="" - type=ST506 - ;; -scsi|SCSI) - drivetype=sd - sect_fwd="" - type=SCSI - ;; -esac - -# find out what units are possible for that disk, and query the user. -driveunits=`ls /dev/${drivetype}?a | sed -e 's,/dev/\(...\)a,\1,g'` -if [ "X${driveunits}" = "X" ]; then - echo "FATAL ERROR:" - echo "No devices for disks of type '${drivetype}'." - echo "This is probably a bug in the install disks." - echo "Exiting install program." - exit -fi -prefdrive=${drivetype}0 - -echo "The following ${drivetype}-type disks are supported by this" -echo "installation procedure:" -echo "${driveunits}" -echo "Note that they may not exist in _your_ machine; the list of" -echo "disks in your machine was printed when the system was booting." -while [ "X${drivename}" = "X" ]; do - echo -n "Which disk would like to install on? [${prefdrive}] " - getresp ${prefdrive} - otherdrives=`echo "${driveunits}" | sed -e s,${resp},,` - if [ "X${driveunits}" = "X${otherdrives}" ]; then - echo "\"${resp}\" is an invalid drive name. Valid choices" - echo "are: "${driveunits} - else - drivename=${resp} - fi -done - -echo "" -echo "Using disk ${drivename}." -echo -n "What kind of disk is it? (one word please) [my${drivetype}] " -getresp "my${drivetype}" -labelname=$resp - -echo "" -echo "You will now need to provide some information about your disk's" -echo "geometry. This should either be in the User's Manual for your disk," -echo "or you should have written down what OpenBSD printed when booting." -echo "(Note that the geometry that's printed at boot time is preferred.)" -echo "" -echo "You may choose to view the initial boot messages for your system" -echo "again right now if you like." -echo -n "View the boot messages again? [n] " -getresp "n" -case "$resp" in -y*|Y*) - less -rsS /kern/msgbuf - ;; -*) - echo "" - ;; -esac - -echo "You will now enter the disk geometry information" -echo "" - -bytes_per_sect=`cat /kern/msgbuf \ - | sed -n -e /^${drivename}:/p -e /^${drivename}:/q \ - | awk '{ print $9 }'` -echo -n "Number of bytes per disk sector? [$bytes_per_sect] " -getresp $bytes_per_sect -bytes_per_sect="$resp" - -cyls_per_disk=`cat /kern/msgbuf \ - | sed -n -e /^${drivename}:/p -e /^${drivename}:/q \ - | awk '{ print $3 }'` -echo -n "Number of disk cylinders? [$cyls_per_disk]" -getresp $cyls_per_disk -cyls_per_disk="$resp" - -tracks_per_cyl=`cat /kern/msgbuf \ - | sed -n -e /^${drivename}:/p -e /^${drivename}:/q \ - | awk '{ print $5 }'` -echo -n "Number of disk tracks (heads) per disk cylinder? [$tracks_per_cyl]" -getresp $tracks_per_cyl -tracks_per_cyl="$resp" - -sects_per_track=`cat /kern/msgbuf \ - | sed -n -e /^${drivename}:/p -e /^${drivename}:/q \ - | awk '{ print $7 }'` -echo -n "Number of disk sectors per disk track? [$sects_per_track]" -getresp $sects_per_track -sects_per_track="$resp" - -cylindersize=`expr $sects_per_track \* $tracks_per_cyl` -cylbytes=`expr $cylindersize \* $bytes_per_sect` -disksize=`expr $cylindersize \* $cyls_per_disk` - -echo "" -echo "Your disk has a total of $disksize $bytes_per_sect byte sectors," -echo "arranged as $cyls_per_disk cylinders which contain $cylindersize " -echo "sectors ($cylbytes bytes) each." -echo "" -echo "You can specify partition sizes in cylinders ('c') or sectors ('s')." -while [ "X${sizemult}" = "X" ]; do - echo -n "What units would you like to use? [cylinders] " - getresp cylinders - case "$resp" in - c*|C*) - sizemult=$cylindersize - sizeunit="cylinders" - maxdisk=$cyls_per_disk - ;; - s*|S*) - sizemult=1 - sizeunit="sectors" - maxdisk=$disksize; - ;; - *) - echo "Enter cylinders ('c') or sectors ('s')." - ;; - esac -done - -if [ $sizeunit = "sectors" ]; then - echo "For best disk performance or workable CHS-translating IDE systems," - echo "partitions should begin and end on cylinder boundaries. Wherever" - echo "possible, use multiples of the cylinder size ($cylindersize sectors)." -fi - -echo -n "" -echo -n "Size of OpenBSD portion of disk (in $sizeunit) ? [$maxdisk] " -getresp "$maxdisk" -partition=$resp -partition_sects=`expr $resp \* $sizemult` -part_offset=0 -if [ $partition_sects -lt $disksize ]; then - echo -n "Offset of OpenBSD portion of disk (in $sizeunit)? " - getresp - part_offset=$resp -fi -badspacesec=0 -if [ "$sect_fwd" = "sf:" ]; then - badspacecyl=`expr $sects_per_track + 126` - badspacecyl=`expr $badspacecyl + $cylindersize - 1` - badspacecyl=`expr $badspacecyl / $cylindersize` - badspacesec=`expr $badspacecyl \* $cylindersize` - echo "" - echo -n "Using $badspacesec sectors ($badspacecyl cylinders) for the " - echo "bad144 bad block table" -fi - -sects_left=`expr $partition_sects - $badspacesec` -units_left=`expr $sects_left / $sizemult` -echo "" -echo "There are $units_left $sizeunit left to allocate." -echo "" -root=0 -while [ $root -eq 0 ]; do - echo -n "Root partition size (in $sizeunit)? " - getresp - case $resp in - [1-9]*) - total=$resp - if [ $total -gt $units_left ]; then - echo -n "Root size is greater than remaining " - echo "free space on disk." - else - root=$resp - fi - ;; - esac -done -root_offset=$part_offset -part_used=`expr $root + $badspacesec / $sizemult` -units_left=`expr $partition - $part_used` -echo "" - -swap=0 -while [ $swap -eq 0 ]; do - echo "$units_left $sizeunit remaining in OpenBSD portion of disk." - echo -n "Swap partition size (in $sizeunit)? " - getresp - case $resp in - [1-9]*) - if [ $swap -gt $units_left ]; then - echo -n "Swap size is greater than remaining " - echo "free space on disk." - else - swap=$resp - fi - ;; - esac -done -swap_offset=`expr $root_offset + $root` -part_used=`expr $part_used + $swap` -echo "" - -fragsize=1024 -blocksize=8192 -$DONTDOIT fsck -t ffs /dev/rfd0a -$DONTDOIT mount -u /dev/fd0a / -cat /etc/disktab.preinstall > $DT -echo "" >> $DT -echo "$labelname|OpenBSD installation generated:\\" >> $DT -echo " :dt=${type}:ty=winchester:\\" >> $DT -echo -n " :nc#${cyls_per_disk}:ns#${sects_per_track}" >> $DT -echo ":nt#${tracks_per_cyl}:\\" >> $DT -echo " :se#${bytes_per_sect}:${sect_fwd}\\" >> $DT -_size=`expr $root \* $sizemult` -_offset=`expr $root_offset \* $sizemult` -echo -n " :pa#${_size}:oa#${_offset}" >> $DT -echo ":ta=4.2BSD:ba#${blocksize}:fa#${fragsize}:\\" >> $DT -_size=`expr $swap \* $sizemult` -_offset=`expr $swap_offset \* $sizemult` -echo " :pb#${_size}:ob#${_offset}:tb=swap:\\" >> $DT -echo " :pc#${disksize}:oc#0:\\" >> $DT - -echo "You will now have to enter information about any other partitions" -echo "to be created in the OpenBSD portion of the disk. This process will" -echo "be complete when you've filled up all remaining space in the OpenBSD" -echo "portion of the disk." - -while [ $part_used -lt $partition ]; do - part_size=0 - units_left=`expr $partition - $part_used` - while [ $part_size -eq 0 ]; do - echo "" - echo -n "$units_left $sizeunit remaining in OpenBSD portion of " - echo "the disk" - echo -n "Next partition size (in $sizeunit) [$units_left] ? " - getresp "$units_left" - case $resp in - [1-9]*) - total=`expr $part_used + $resp` - if [ $total -gt $partition ]; then - echo "That would make the partition too large to fit!" - else - part_size=$resp - part_used=$total - part_name="" - while [ "$part_name" = "" ]; do - echo -n "Mount point? " - getresp - part_name=$resp - done - fi - ;; - esac - done - # XXX we skip partition d to avoid user confusion - if [ "$ename" = "" ]; then - ename=$part_name - offset=`expr $part_offset + $root + $swap` - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pe#${_size}:oe#${_offset}" >> $DT - echo ":te=4.2BSD:be#${blocksize}:fe#${fragsize}:\\" >> $DT - offset=`expr $offset + $part_size` - elif [ "$fname" = "" ]; then - fname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pf#${_size}:of#${_offset}" >> $DT - echo ":tf=4.2BSD:bf#${blocksize}:ff#${fragsize}:\\" >> $DT - offset=`expr $offset + $part_size` - elif [ "$gname" = "" ]; then - gname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pg#${_size}:og#${_offset}" >> $DT - echo ":tg=4.2BSD:bg#${blocksize}:fg#${fragsize}:\\" >> $DT - offset=`expr $offset + $part_size` - elif [ "$hname" = "" ]; then - hname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :ph#${_size}:oh#${_offset}" >> $DT - echo ":th=4.2BSD:bh#${blocksize}:fh#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$iname" = "" ]; then - iname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pi#${_size}:oi#${_offset}" >> $DT - echo ":ti=4.2BSD:bi#${blocksize}:fi#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$jname" = "" ]; then - jname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pj#${_size}:oj#${_offset}" >> $DT - echo ":tj=4.2BSD:bj#${blocksize}:fj#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$kname" = "" ]; then - kname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pk#${_size}:ok#${_offset}" >> $DT - echo ":tk=4.2BSD:bk#${blocksize}:fk#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$lname" = "" ]; then - lname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pl#${_size}:ol#${_offset}" >> $DT - echo ":tl=4.2BSD:bl#${blocksize}:fl#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$mname" = "" ]; then - mname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pm#${_size}:om#${_offset}" >> $DT - echo ":tm=4.2BSD:bm#${blocksize}:fm#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$nname" = "" ]; then - nname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pn#${_size}:on#${_offset}" >> $DT - echo ":tn=4.2BSD:bn#${blocksize}:fn#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$oname" = "" ]; then - oname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :po#${_size}:oo#${_offset}" >> $DT - echo ":to=4.2BSD:bo#${blocksize}:fo#${fragsize}:\\" >> $DT - part_used=$partition - elif [ "$pname" = "" ]; then - pname=$part_name - _size=`expr $part_size \* $sizemult` - _offset=`expr $offset \* $sizemult` - echo -n " :pp#${_size}:op#${_offset}" >> $DT - echo ":tp=4.2BSD:bp#${blocksize}:fp#${fragsize}:\\" >> $DT - part_used=$partition - fi -done -echo "" >> $DT -sync - -echo "" -echo "THIS IS YOUR LAST CHANCE!!!" -echo "" -echo -n "Are you SURE you want OpenBSD installed on your hard drive? (yes/no) " -answer="" -while [ "$answer" = "" ]; do - getresp - case $resp in - yes|YES) - echo "" - echo "Here we go..." - answer=yes - ;; - no|NO) - echo "" - echo -n "OK, then. enter 'halt' to halt the machine. " - echo "Once the machine has halted," - echo -n "remove the floppy, and press any key to " - echo "reboot." - exit - ;; - *) - echo -n "I want a yes or no answer... well? " - ;; - esac -done - -echo "" -echo -n "Labeling disk $drivename..." -$DONTDOIT disklabel -w -B $drivename $labelname -echo " done." - -if [ "$sect_fwd" = "sf:" ]; then - echo -n "Initializing bad144 badblock table..." - $DONTDOIT bad144 $drivename 0 - echo " done." -fi - -echo "Initializing root filesystem, and mounting..." -$DONTDOIT newfs /dev/r${drivename}a -$DONTDOIT mount -v /dev/${drivename}a /mnt -if [ "$ename" != "" ]; then - echo "" - echo "Initializing $ename filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}e - $DONTDOIT mkdir -p /mnt/$ename - $DONTDOIT mount -v /dev/${drivename}e /mnt/$ename -fi -if [ "$fname" != "" ]; then - echo "" - echo "Initializing $fname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}f - $DONTDOIT mkdir -p /mnt/$fname - $DONTDOIT mount -v /dev/${drivename}f /mnt/$fname -fi -if [ "$gname" != "" ]; then - echo "" - echo "Initializing $gname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}g - $DONTDOIT mkdir -p /mnt/$gname - $DONTDOIT mount -v /dev/${drivename}g /mnt/$gname -fi -if [ "$hname" != "" ]; then - echo "" - echo "Initializing $hname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}h - $DONTDOIT mkdir -p /mnt/$hname - $DONTDOIT mount -v /dev/${drivename}h /mnt/$hname -fi -if [ "$iname" != "" ]; then - echo "" - echo "Initializing $iname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}i - $DONTDOIT mkdir -p /mnt/$iname - $DONTDOIT mount -v /dev/${drivename}i /mnt/$iname -fi -if [ "$jname" != "" ]; then - echo "" - echo "Initializing $jname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}j - $DONTDOIT mkdir -p /mnt/$jname - $DONTDOIT mount -v /dev/${drivename}j /mnt/$jname -fi -if [ "$kname" != "" ]; then - echo "" - echo "Initializing $kname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}k - $DONTDOIT mkdir -p /mnt/$kname - $DONTDOIT mount -v /dev/${drivename}k /mnt/$kname -fi -if [ "$lname" != "" ]; then - echo "" - echo "Initializing $lname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}l - $DONTDOIT mkdir -p /mnt/$lname - $DONTDOIT mount -v /dev/${drivename}l /mnt/$lname -fi -if [ "$mname" != "" ]; then - echo "" - echo "Initializing $mname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}m - $DONTDOIT mkdir -p /mnt/$mname - $DONTDOIT mount -v /dev/${drivename}m /mnt/$mname -fi -if [ "$nname" != "" ]; then - echo "" - echo "Initializing $nname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}n - $DONTDOIT mkdir -p /mnt/$nname - $DONTDOIT mount -v /dev/${drivename}n /mnt/$nname -fi -if [ "$oname" != "" ]; then - echo "" - echo "Initializing $oname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}o - $DONTDOIT mkdir -p /mnt/$oname - $DONTDOIT mount -v /dev/${drivename}o /mnt/$oname -fi -if [ "$pname" != "" ]; then - echo "" - echo "Initializing $pname filesystem, and mounting..." - $DONTDOIT newfs /dev/r${drivename}p - $DONTDOIT mkdir -p /mnt/$pname - $DONTDOIT mount -v /dev/${drivename}p /mnt/$pname -fi - -echo "" -echo "Populating filesystems with bootstrapping binaries and config files" -$DONTDOIT tar -cXf - . | (cd /mnt ; tar -xpf - ) -$DONTDOIT cp /tmp/.hdprofile /mnt/.profile - -echo "" -echo -n "Creating an fstab..." -echo /dev/${drivename}a / ffs rw 1 1 | sed -e s,//,/, > $FSTAB -if [ "$ename" != "" ]; then - echo /dev/${drivename}e /$ename ffs rw 1 2 | sed -e s,//,/, >> $FSTAB -fi -if [ "$fname" != "" ]; then - echo /dev/${drivename}f /$fname ffs rw 1 3 | sed -e s,//,/, >> $FSTAB -fi -if [ "$gname" != "" ]; then - echo /dev/${drivename}g /$gname ffs rw 1 4 | sed -e s,//,/, >> $FSTAB -fi -if [ "$hname" != "" ]; then - echo /dev/${drivename}h /$hname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$iname" != "" ]; then - echo /dev/${drivename}i /$iname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$jname" != "" ]; then - echo /dev/${drivename}j /$jname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$kname" != "" ]; then - echo /dev/${drivename}k /$kname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$lname" != "" ]; then - echo /dev/${drivename}l /$lname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$mname" != "" ]; then - echo /dev/${drivename}m /$mname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$nname" != "" ]; then - echo /dev/${drivename}n /$nname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$oname" != "" ]; then - echo /dev/${drivename}o /$oname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi -if [ "$pname" != "" ]; then - echo /dev/${drivename}p /$pname ffs rw 1 5 | sed -e s,//,/, >> $FSTAB -fi - -sync -echo " done." - -echo "OK! The preliminary work of setting up your disk is now complete." -echo "" -echo "The remaining tasks are:" -echo "" -echo "To copy a OpenBSD kernel to the hard drive's root filesystem." -echo "Once accomplished, you can boot off the hard drive." -echo "" -echo "To load and install the OpenBSD distribution sets." -echo "Currently the hard drive's root filesystem is mounted on /mnt" -echo "" -echo "Consult the installation notes which will describe how to" -echo "install the distribution sets and kernel. Post-installation" -echo "configuration is also discussed therein." -echo "" -echo "GOOD LUCK!" -echo "" diff --git a/distrib/i386/floppies/inst/list b/distrib/i386/floppies/inst/list deleted file mode 100644 index da27efaeaae..00000000000 --- a/distrib/i386/floppies/inst/list +++ /dev/null @@ -1,11 +0,0 @@ -# $OpenBSD: list,v 1.2 1997/04/17 02:10:39 niklas Exp $ - -# the disktab explanation file -COPY disktab.preinstall etc/disktab.preinstall - -# and the installation tools -COPY dot.profile .profile -COPY dot.instutils .instutils -COPY install.sh install -COPY dot.hdprofile tmp/.hdprofile -SPECIAL chmod 755 install diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile deleted file mode 100644 index 2821e6c2619..00000000000 --- a/distrib/i386/floppies/kc/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# $OpenBSD: Makefile,v 1.17 1997/09/26 02:09:55 millert Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" -IMAGE= kc${REV}.fs -CBIN= kcbin -MOUNT_POINT?= /mnt -VND?= svnd0 -VND_DEV= /dev/${VND}a -VND_RDEV= /dev/r${VND}a -IMAGE?= xxx-${REV}.fs -PID!= echo $$$$ -REALIMAGE!= echo /var/tmp/image.${PID} -MDEC= ${DESTDIR}/usr/mdec - -LIST= ${.CURDIR}/list -CRUNCHCONF= ${.CURDIR}/${CBIN}.conf -MTREE= ${.CURDIR}/mtree.conf - -bsd: - cd ${.CURDIR}/../../../../sys/arch/i386/conf && config INST - cd ${.CURDIR}/../../../../sys/arch/i386/compile/INST && \ - make clean && make - cp ${.CURDIR}/../../../../sys/arch/i386/compile/INST/bsd bsd - strip bsd - -all: bsd ${CBIN} -.ifndef FLOPPY3 -.else -.endif -.ifndef FLOPPY3 - dd if=/dev/zero of=${REALIMAGE} bs=10k count=120 - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy5 - newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} -.else - dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -B -b /usr/mdec/fdboot -s /usr/mdec/bootfd ${VND} floppy3 - newfs -O -m 0 -o space -i 6500 -c 80 ${VND_RDEV} -.endif - mount ${VND_DEV} ${MOUNT_POINT} - mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LIST} - @echo "" - @df -i ${MOUNT_POINT} - @echo "" - umount ${MOUNT_POINT} - vnconfig -u ${VND} - cp ${REALIMAGE} ${IMAGE} - rm ${REALIMAGE} - -unconfig: - -umount -f ${MOUNT_POINT} - -vnconfig -u ${VND} - -/bin/rm -f ${IMAGE} - -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} - crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF} - -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all - -clean cleandir: - /bin/rm -f *.core bsd ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c - -install: - cp ${IMAGE} ${DESTDIR}/snapshot - -.include <bsd.obj.mk> -.include <bsd.subdir.mk> diff --git a/distrib/i386/floppies/kc/copy_kernel.sh b/distrib/i386/floppies/kc/copy_kernel.sh deleted file mode 100644 index 5b064a7fa02..00000000000 --- a/distrib/i386/floppies/kc/copy_kernel.sh +++ /dev/null @@ -1,113 +0,0 @@ -# $OpenBSD: copy_kernel.sh,v 1.1 1996/05/31 23:00:25 mickey Exp $ -# -# Kernel copy script - -DEFAULT_PARTITON=sd0a -MOUNT_POINT=/mnt -KERNEL_NAME=/bsd -#TEST=testfn - -testfn() { - echo $* - sleep 5 -} - -cancel() { - echo "" - echo "Copy cancelled." - exit 1 -} - -umountfs() { - echo "Unmounting filesystem; please wait." - trap 2 3 - ${TEST} umount ${MOUNT_POINT} - case $? in - 0) - ;; - *) - echo "Warning: Unmount of ${MOUNT_POINT} failed." - ;; - esac -} - -warning() { - echo "" - echo "Copy failed or was interrupted." - echo "Warning: Copied kernel my be corrupted!" -} - -trap "cancel;" 2 3 -echo "OpenBSD kernel copy program" -echo "" -echo "Default answers are displayed in brackets. You may hit Control-C" -echo "at any time to cancel this operation (though if you hit Control-C at" -echo "a prompt, you need to hit return for it to be noticed)." - -echo "" -echo "What disk partition should the kernel be installed on?" -echo "(For example, \"sd0a\", \"wd0a\", etc.)" -echo "" -echo -n "Partition? [${DEFAULT_PARTITON}] " -read diskpart -if [ "X${diskpart}" = "X" ]; then - diskpart=${DEFAULT_PARTITON} -fi -rawdiskpart="r${diskpart}" - -echo "" -echo -n "Are you sure you want to copy a new kernel to ${diskpart}? [n] " -read reply -case ${reply} in -y*|Y*) - ;; -*) - cancel - ;; -esac - -echo "" -echo "Checking ${diskpart} partition; please wait." -${TEST} fsck -p "/dev/${rawdiskpart}" -case $? in -0) - ;; -*) - echo "File system check failed or aborted!" - cancel - ;; -esac - -echo "Mounting /dev/${diskpart} on ${MOUNT_POINT}." -trap "echo ''; umountfs; cancel;" 2 3 -${TEST} mount "/dev/${diskpart}" ${MOUNT_POINT} -case $? in -0) - ;; -*) - echo "Mount failed!" - cancel - ;; -esac - -echo "Copying kernel to ${MOUNT_POINT}." -trap "warning; umountfs; cancel;" 2 3 -${TEST} cp ${KERNEL_NAME} ${MOUNT_POINT} -case $? in -0) - ;; -*) - warning - umountfs - cancel - ;; -esac - -umountfs - -echo "" -echo "Copy completed." -echo "" -echo "Use \"halt\" to halt the system, then (when the system is halted)" -echo "eject the floppy disk and hit any key to reboot from the hard disk." -exit 0 diff --git a/distrib/i386/floppies/kc/dot.profile b/distrib/i386/floppies/kc/dot.profile deleted file mode 100644 index 558b5ea2786..00000000000 --- a/distrib/i386/floppies/kc/dot.profile +++ /dev/null @@ -1,13 +0,0 @@ -# $OpenBSD: dot.profile,v 1.1 1996/05/31 23:00:26 mickey Exp $ - -PATH=/sbin:/bin:/ -export PATH - -if [ "X${DONEPROFILE}" = "X" ]; then - DONEPROFILE=YES - - echo -n "Enter 'copy_kernel' at the prompt to copy a kernel to your " - echo "hard disk," - echo "'reboot' to reboot the system, or 'halt' to halt the system." - echo "" -fi diff --git a/distrib/i386/floppies/kc/kcbin.conf b/distrib/i386/floppies/kc/kcbin.conf deleted file mode 100644 index aca25ea9080..00000000000 --- a/distrib/i386/floppies/kc/kcbin.conf +++ /dev/null @@ -1,15 +0,0 @@ -# $OpenBSD: kcbin.conf,v 1.4 1996/09/27 03:24:02 deraadt Exp $ -# -# kcbin.conf - unified binary for the kc floppy -# - -srcdirs bin sbin - -progs cp dd disklabel fsck_ffs fdisk init mount mount_ffs reboot sh test umount - -ln test [ -ln fsck_ffs fsck -ln reboot halt -ln sh -sh # init invokes the shell this way - -libs -ledit -lutil -ltermcap -ll diff --git a/distrib/i386/floppies/kc/list b/distrib/i386/floppies/kc/list deleted file mode 100644 index 8c662dc3bf7..00000000000 --- a/distrib/i386/floppies/kc/list +++ /dev/null @@ -1,36 +0,0 @@ -# $OpenBSD: list,v 1.6 1996/09/27 03:24:03 deraadt Exp $ - -# copy the kernel -COPY ${OBJDIR}/bsd bsd - -# copy the crunched binary, link to it, and kill it -COPY ${OBJDIR}/kcbin kcbin -LINK kcbin bin/cp -LINK kcbin bin/dd -LINK kcbin bin/sh -LINK kcbin bin/test -LINK kcbin bin/[ -LINK kcbin sbin/disklabel -LINK kcbin sbin/fdisk -LINK kcbin sbin/fsck -LINK kcbin sbin/fsck_ffs -LINK kcbin sbin/halt -LINK kcbin sbin/init -LINK kcbin sbin/mount -LINK kcbin sbin/mount_ffs -LINK kcbin sbin/reboot -LINK kcbin sbin/umount -SPECIAL /bin/rm kcbin - -# copy the MAKEDEV script and make some devices -COPY ${CURDIR}/../../../../etc/etc.i386/MAKEDEV dev/MAKEDEV -SPECIAL cd dev; sh MAKEDEV floppy -SPECIAL /bin/rm dev/MAKEDEV - -# we need the contents of /usr/mdec -COPYDIR ${DESTDIR}/usr/mdec usr/mdec - -# copy the common kc-floppy tools -COPY ${CURDIR}/dot.profile .profile -COPY ${CURDIR}/copy_kernel.sh copy_kernel -SPECIAL chmod 755 copy_kernel diff --git a/distrib/i386/floppies/kc/mtree.conf b/distrib/i386/floppies/kc/mtree.conf deleted file mode 100644 index ade31ddfa5f..00000000000 --- a/distrib/i386/floppies/kc/mtree.conf +++ /dev/null @@ -1,36 +0,0 @@ -# $OpenBSD: mtree.conf,v 1.1 1996/05/31 23:00:30 mickey Exp $ - -/set type=dir uname=root gname=wheel mode=0755 -# . -. - -# ./bin -bin -# ./bin -.. - -# ./dev -dev -# ./dev -.. - -#./mnt -mnt -# ./mnt -.. - -# ./sbin -sbin -# ./sbin -.. - -# ./usr -usr - -# ./usr/mdec -mdec -# ./usr/mdec -.. - -# ./usr -.. diff --git a/distrib/i386/floppies/ramdisk/Makefile b/distrib/i386/floppies/ramdisk/Makefile index a17a610b28b..fd88926a6fe 100644 --- a/distrib/i386/floppies/ramdisk/Makefile +++ b/distrib/i386/floppies/ramdisk/Makefile @@ -1,118 +1,6 @@ -# $OpenBSD: Makefile,v 1.33 1999/05/26 16:08:43 espie Exp $ +# $OpenBSD: Makefile,v 1.34 1999/08/06 20:49:10 deraadt Exp $ -TOP= ${.CURDIR}/.. +.PATH: ${.CURDIR}/../ramdisk +RAMDISK=RAMDISK -.include "${TOP}/Makefile.inc" -IMAGE= mr.fs -CBIN?= instbin -.if (${KERBEROS} == "yes") -CRUNCHCONF?= ${.CURDIR}/${CBIN}.conf -.else -CRUNCHCONF?= ${.CURDIR}/${CBIN}-nokrb.conf -.endif -LISTS= ${.CURDIR}/list - -MOUNT_POINT= /mnt -MTREE= ${.CURDIR}/mtree.conf - -FS= floppy${REV}.fs -VND?= svnd0 -VND_DEV= /dev/${VND}a -VND_RDEV= /dev/r${VND}a -VND_CRDEV= /dev/r${VND}c -PID!= echo $$$$ -REALIMAGE!= echo /var/tmp/image.${PID} -LISTFLOPPY= ${.CURDIR}/list_floppy - -all: ${FS} - -${FS}: bsd.gz - dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} floppy3 - newfs -m 0 -o space -i 524288 -c 80 ${VND_RDEV} - mount ${VND_DEV} ${MOUNT_POINT} - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTFLOPPY} - /usr/mdec/installboot -v -s 18 -h 2 ${MOUNT_POINT}/boot \ - ${DESTDIR}/usr/mdec/biosboot ${VND_CRDEV} - @echo "" - @df -i ${MOUNT_POINT} - @echo "" - umount ${MOUNT_POINT} - vnconfig -u ${VND} - cp ${REALIMAGE} ${FS} - rm ${REALIMAGE} - -DISKTYPE= rdroot -NBLKS= 3510 -# minfree, opt, b/i trks, sects, cpg -NEWFSARGS= -m 0 -o space -c 16 -i 4096 - -bsd.gz: bsd.rd - cp bsd.rd bsd.strip - strip bsd.strip - gzip -c9 bsd.strip > bsd.gz - -bsd.rd: ${IMAGE} bsd rdsetroot - cp bsd bsd.rd - ${.OBJDIR}/rdsetroot bsd.rd < ${IMAGE} - - -bsd: - cd ${.CURDIR}/../../../../sys/arch/i386/conf && config RAMDISK - cd ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK && \ - make clean && COPTS=-Os make -# cd ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK && \ -# make clean && make - cp ${.CURDIR}/../../../../sys/arch/i386/compile/RAMDISK/bsd bsd - -${IMAGE}: ${CBIN} rd_setup do_files rd_teardown - -rd_setup: ${CBIN} - dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS} - vnconfig -v -c ${VND} ${REALIMAGE} - disklabel -w -r ${VND} ${DISKTYPE} - newfs ${NEWFSARGS} ${VND_RDEV} - fsck ${VND_RDEV} - mount ${VND_DEV} ${MOUNT_POINT} - -rd_teardown: - @df -i ${MOUNT_POINT} - -umount ${MOUNT_POINT} - -vnconfig -u ${VND} - cp ${REALIMAGE} ${IMAGE} - rm ${REALIMAGE} - -rdsetroot: ${TOP}/common/rdsetroot.c - ${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/common/rdsetroot.c - -unconfig: - -umount -f ${MOUNT_POINT} - -vnconfig -u ${VND} - -/bin/rm -f ${IMAGE} - -.PRECIOUS: ${IMAGE} - -install: - cp bsd.rd ${DESTDIR}/snapshot/bsd.rd - cp ${FS} ${DESTDIR}/snapshot/${FS} - -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} - crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ - -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} - -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - make -f ${CBIN}.mk all - -do_files: - mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u - TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - REV=${REV} TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS} - -clean cleandir: - /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \ - *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot - -.include <bsd.obj.mk> -.include <bsd.subdir.mk> +.include "${.CURDIR}/../common/Makefile.inc" diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf deleted file mode 100644 index 3701fc7f532..00000000000 --- a/distrib/i386/floppies/ramdisk/instbin.conf +++ /dev/null @@ -1,30 +0,0 @@ -# $OpenBSD: instbin.conf,v 1.29 1999/04/08 08:01:26 deraadt Exp $ -# -# instbin.conf - unified binary for the inst/upgr floppies -# - -srcdirs distrib/special bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin -srcdirs usr.sbin/pppd sys/arch/i386/stand - -progs cat chmod chown cp dd df disklabel dhclient ed -progs expr fsck_ffs ftp fdisk -progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs -progs mv newfs pax ksh ping reboot rm route -progs sed sleep stty tip umount -progs rsh restore gzip sort grep installboot - -ln chown chgrp -ln fsck_ffs fsck -ln less more -ln pax tar -ln pax cpio -ln ksh sh -ln ksh -sh # init invokes the shell this way -ln reboot halt -ln gzip gunzip -ln grep egrep -ln grep fgrep - -# Use -lotermcap instead of -ltermcap/-lcurses since it is smaller -libs -lutil -lotermcap -lkrb -ldes -ll -lm diff --git a/distrib/i386/floppies/ramdisk/list b/distrib/i386/floppies/ramdisk/list deleted file mode 100644 index 384552ff797..00000000000 --- a/distrib/i386/floppies/ramdisk/list +++ /dev/null @@ -1,91 +0,0 @@ -# $OpenBSD: list,v 1.27 1999/04/08 08:01:26 deraadt Exp $ - -# copy the crunched binary, link to it, and kill it -COPY ${OBJDIR}/instbin instbin -LINK instbin bin/cat -LINK instbin bin/chmod -LINK instbin bin/cp -LINK instbin bin/cpio bin/pax bin/tar -LINK instbin bin/dd -LINK instbin bin/df -LINK instbin bin/ed -LINK instbin bin/expr -LINK instbin bin/ln -LINK instbin bin/ls -LINK instbin bin/mkdir -LINK instbin bin/mv -LINK instbin bin/rm -LINK instbin bin/sh bin/ksh -LINK instbin bin/sleep -LINK instbin bin/stty -LINK instbin sbin/disklabel -LINK instbin sbin/dhclient -LINK instbin sbin/fdisk -LINK instbin sbin/fsck sbin/fsck_ffs -LINK instbin sbin/halt sbin/reboot -LINK instbin sbin/ifconfig -LINK instbin sbin/init -LINK instbin sbin/mknod -LINK instbin sbin/mount -LINK instbin sbin/mount_cd9660 -LINK instbin sbin/mount_ffs -LINK instbin sbin/mount_msdos -LINK instbin sbin/mount_nfs -LINK instbin sbin/mount_kernfs -LINK instbin sbin/mount_ext2fs -LINK instbin sbin/newfs sbin/mount_mfs -LINK instbin sbin/ping -LINK instbin sbin/restore -LINK instbin sbin/route -#LINK instbin sbin/scsi -#LINK instbin sbin/swapon -LINK instbin sbin/umount -LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep -LINK instbin usr/bin/ftp -LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat -LINK instbin usr/bin/less usr/bin/more -LINK instbin usr/bin/rsh -LINK instbin usr/bin/sed -LINK instbin usr/bin/sort -LINK instbin usr/sbin/chown usr/sbin/chgrp -LINK instbin usr/mdec/installboot -SPECIAL /bin/rm instbin - -# `internal' crunchgen links -ARGVLINK sh -sh - -# copy the MAKEDEV script and make some devices -COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV -SPECIAL cd dev; sh MAKEDEV ramdisk -SPECIAL /bin/rm dev/MAKEDEV - -# we need the contents of /usr/mdec -COPY ${DESTDIR}/usr/mdec/biosboot usr/mdec/biosboot -COPY ${DESTDIR}/usr/mdec/mbr usr/mdec/mbr -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 -SYMLINK /tmp/fstab.shadow etc/fstab -SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf -SYMLINK /tmp/hosts etc/hosts - -# dhcp things -COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script - -# and the common installation tools -COPY ${CURDIR}/termcap.pcvt usr/share/misc/termcap -#COPY ${DESTDIR}/usr/share/misc/scsi_modes usr/share/misc/scsi_modes - -# and the installation tools -COPY dot.profile .profile -COPY install.md install.md -COPY ${CURDIR}/../../../miniroot/install.sh install -COPY ${CURDIR}/../../../miniroot/upgrade.sh upgrade -SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub -SPECIAL chmod 755 install upgrade diff --git a/distrib/i386/floppies/ramdisk/mtree.conf b/distrib/i386/floppies/ramdisk/mtree.conf deleted file mode 100644 index db6dd960d04..00000000000 --- a/distrib/i386/floppies/ramdisk/mtree.conf +++ /dev/null @@ -1,101 +0,0 @@ -# $OpenBSD: mtree.conf,v 1.6 1999/03/08 04:07:59 deraadt Exp $ - -/set type=dir uname=root gname=wheel mode=0755 -# . -. - -# ./bin -bin -# ./bin -.. - -# ./dev -dev -# ./dev -.. - -# ./etc -etc - -# ./etc/ppp -ppp -# ./etc/ppp -.. - -# ./etc -.. - -# ./mnt -mnt -# ./mnt -.. - -# ./mnt2 -mnt2 -# ./mnt2 -.. - -# ./kern -kern -# ./kern -.. - -# ./sbin -sbin -# ./sbin -.. - -# ./tmp -tmp mode=01777 -# ./tmp -.. - -# ./usr -usr - -# ./usr/bin -bin -# ./usr/bin -.. - -# ./usr/mdec -mdec -# ./usr/mdec -.. - -# ./usr/sbin -sbin -# ./usr/sbin -.. - -# ./usr/share -share - -# ./usr/share/misc -misc -# ./usr/share/misc -.. - -# ./usr/share -.. - -# ./usr -.. - -# ./var -var - -# ./var/tmp -tmp mode=01777 - -# ./var/tmp -.. - -# ./var/db -db - -# ./var/db -.. - -# ./var -.. diff --git a/distrib/i386/floppies/ramdiskB/Makefile b/distrib/i386/floppies/ramdiskB/Makefile new file mode 100644 index 00000000000..880fc5514ee --- /dev/null +++ b/distrib/i386/floppies/ramdiskB/Makefile @@ -0,0 +1,8 @@ +# $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/ramdisk_cd/Makefile b/distrib/i386/floppies/ramdisk_cd/Makefile new file mode 100644 index 00000000000..a82d073b7f2 --- /dev/null +++ b/distrib/i386/floppies/ramdisk_cd/Makefile @@ -0,0 +1,10 @@ +# $OpenBSD: Makefile,v 1.1 1999/08/06 20:49:11 deraadt Exp $ + +.PATH: ${.CURDIR}/../ramdisk +RAMDISK=RAMDISK_CD +FLOPPYSIZE=288 +FLOPPYTYPE=floppy288 +XNAME=cdrom +NOBSDRD=1 + +.include "${.CURDIR}/../common/Makefile.inc" diff --git a/distrib/i386/floppies/upgr/Makefile b/distrib/i386/floppies/upgr/Makefile deleted file mode 100644 index 3a82aafde87..00000000000 --- a/distrib/i386/floppies/upgr/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile,v 1.5 1997/04/17 02:10:49 niklas Exp $ - -TOP= ${.CURDIR}/.. - -.include "${TOP}/Makefile.inc" -IMAGE= upgr${REV}.fs - -.include "${TOP}/common/Makefile.inc" diff --git a/distrib/i386/floppies/upgr/dot.hdprofile b/distrib/i386/floppies/upgr/dot.hdprofile deleted file mode 100644 index a1aed4eccfb..00000000000 --- a/distrib/i386/floppies/upgr/dot.hdprofile +++ /dev/null @@ -1,58 +0,0 @@ -# $OpenBSD: dot.hdprofile,v 1.4 1996/06/16 10:25:23 deraadt Exp $ -# -# 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. - -PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ -export PATH -TERM=pc3 -export TERM - -umask 022 - -if [ "X${DONEPROFILE}" = "X" ]; then - DONEPROFILE=YES - - echo "Checking filesystems..." - fsck -y - - echo "Mounting filesystems..." - mount -a - - # set up some sane defaults - echo 'erase ^?, werase ^W, kill ^U, intr ^C' - stty newcrt werase ^W intr ^C kill ^U erase ^? 9600 - echo '' - - # pull in the functions that people will use from the shell prompt. - . /.commonutils - . /.upgrutils - - echo "Follow the installation directions to install the OpenBSD" - echo "distribution sets." -fi diff --git a/distrib/i386/floppies/upgr/dot.profile b/distrib/i386/floppies/upgr/dot.profile deleted file mode 100644 index e0ce1e3f962..00000000000 --- a/distrib/i386/floppies/upgr/dot.profile +++ /dev/null @@ -1,53 +0,0 @@ -# $OpenBSD: dot.profile,v 1.4 1997/04/17 02:10:50 niklas Exp $ -# -# 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. -# - -PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ -export PATH -TERM=pc3 -export TERM - -umask 022 - -if [ "X${DONEPROFILE}" = "X" ]; then - DONEPROFILE=YES - - # set up some sane defaults - echo 'erase ^?, werase ^W, kill ^U, intr ^C' - stty newcrt werase ^W intr ^C kill ^U erase ^? 9600 - echo '' - - # pull in the functions that people will use from the shell prompt. - . /.commonutils - . /.upgrutils - - # run the upgrade script. - upgrade -fi diff --git a/distrib/i386/floppies/upgr/dot.upgrutils b/distrib/i386/floppies/upgr/dot.upgrutils deleted file mode 100644 index 2eb5d1de430..00000000000 --- a/distrib/i386/floppies/upgr/dot.upgrutils +++ /dev/null @@ -1,58 +0,0 @@ -# $OpenBSD: dot.upgrutils,v 1.4 1996/04/25 21:28:30 niklas Exp $ -# -# 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. - -# Upgrade cleanup utilites (functions), to make sure a recently-upgraded -# system is safely runnable. These are meant to be invoked from the shell -# prompt, by people installing OpenBSD. - -Cleanup() -{ - upgrade_dir=/ - - if [ ! -f /etc/fstab ]; then - upgrade_dir=/mnt - fi - - echo "Cleaning up miscellaneous files in /etc..." - mv $upgrade_dir/etc/rc.bak $upgrade_dir/etc/rc - chroot $upgrade_dir /usr/sbin/pwd_mkdb -p /etc/master.passwd - chroot $upgrade_dir /bin/rm /etc/sendmail.fc > /dev/null 2>&1 - mv $upgrade_dir/.profile.bak $upgrade_dir/.profile - sync - echo "Done." - - echo "" - echo "All that's left to do now is to install a new OpenBSD kernel" - echo "on your hard disk. You should now halt your machine using" - echo "the 'halt' command. Once the machine is halted, replace the" - echo "installation floppy with the kernel-copy floppy and hit any" - echo "key to reboot. Use the kernel-copy floppy to copy a kernel" - echo "to your hard disk." -} diff --git a/distrib/i386/floppies/upgr/list b/distrib/i386/floppies/upgr/list deleted file mode 100644 index d5a18c6f8d8..00000000000 --- a/distrib/i386/floppies/upgr/list +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: list,v 1.3 1997/04/17 02:10:51 niklas Exp $ - -# and the upgrade tools -COPY dot.profile .profile -COPY dot.upgrutils .upgrutils -COPY upgrade.sh upgrade -COPY dot.hdprofile tmp/.hdprofile -SPECIAL chmod 755 upgrade diff --git a/distrib/i386/floppies/upgr/upgrade.sh b/distrib/i386/floppies/upgr/upgrade.sh deleted file mode 100644 index 045705943c2..00000000000 --- a/distrib/i386/floppies/upgr/upgrade.sh +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh -# $OpenBSD: upgrade.sh,v 1.5 1996/06/29 05:54:14 tholo Exp $ -# -# 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. - -# OpenBSD upgrade script. -# In a perfect world, this would be a nice C program, with a reasonable -# user interface. - -DT=/etc/disktab # /etc/disktab -FSTABDIR=/mnt/etc # /mnt/etc -#DONTDOIT=echo - -VERSION=1.1 -FSTAB=${FSTABDIR}/fstab - -getresp() { - read resp - if [ "X$resp" = "X" ]; then - resp=$1 - fi -} - -echo "Welcome to the OpenBSD ${VERSION} upgrade program." -echo "" -echo "This program is designed to help you put the new version of OpenBSD" -echo "on your hard disk, in a simple and rational way. To upgrade, you" -echo "must have plenty of free space on all partitions which will be" -echo "upgraded. If you have at least 1MB free on your root partition," -echo "and several free on your /usr patition, you should be fine." -echo "" -echo "As with anything which modifies your hard drive's contents, this" -echo "program can cause SIGNIFICANT data loss, and you are advised" -echo "to make sure your hard drive is backed up before beginning the" -echo "upgrade process." -echo "" -echo "Default answers are displyed in brackets after the questions." -echo "You can hit Control-C at any time to quit, but if you do so at a" -echo "prompt, you may have to hit return. Also, quitting in the middle of" -echo "the upgrade may leave your system in an inconsistent (and unusable)" -echo "state." -echo "" -echo -n "Proceed with upgrade? [n] " -getresp "n" -case "$resp" in - y*|Y*) - echo "Cool! Let's get to it..." - ;; - *) - echo "" - echo "OK, then. Enter 'halt' at the prompt to halt the" - echo "machine. Once the machine has halted, remove the" - echo "floppy and press any key to reboot." - exit - ;; -esac - -# find out what units are possible, and query the user. -driveunits=`ls /dev/[sw]d?a | sed -e 's,/dev/\(...\)a,\1,g'` -if [ "X${driveunits}" = "X" ]; then - echo "FATAL ERROR:" - echo "No disk devices." - echo "This is probably a bug in the install disks." - echo "Exiting install program." - exit -fi - -echo "" -echo "The following disks are supported by this upgrade procedure:" -echo " "${driveunits} -echo "If your system was previously completely contained within the" -echo "disks listed above (i.e. if your system didn't occupy any space" -echo "on disks NOT listed above), this upgrade disk can upgrade your" -echo "system. If it cannot, hit Control-C at the prompt." -echo "" -while [ "X${drivename}" = "X" ]; do - echo -n "Which disk contains your root partion? " - getresp - otherdrives=`echo "${driveunits}" | sed -e s,${resp},,` - if [ "X${driveunits}" = "X${otherdrives}" ]; then - echo "" - echo "\"${resp}\" is an invalid drive name. Valid choices" - echo "are: "${driveunits} - echo "" - else - drivename=${resp} - fi -done - -echo "" -echo "Root partition is on ${drivename}a." - -echo "" -echo "Would you like to upgrade your file systems to the new file system" -echo -n "format? [y] " -getresp "y" -case "$resp" in - n*|N*) - echo "" - echo "You should upgrade your file systems with 'fsck -c 2'" - echo "as soon as is feasible, because the new file system" - echo "code is better-tested and more performant." - upgradefs=NO - ;; - *) - upgradefs=YES - ;; -esac - -if [ $upgradefs = YES ]; then - echo "" - echo "Upgrading the file system on ${drivename}a..." - - fsck -p -c 2 /dev/r${drivename}a - if [ $? != 0 ]; then - echo "FATAL ERROR: FILE SYSTEM UPGRADE FAILED." - echo "You should probably reboot the machine, fsck your" - echo "disk(s), and try the upgrade procedure again." - exit 1 - fi - echo "Done." -fi - -echo "" -echo "Mounting root partition on /mnt..." -mount /dev/${drivename}a /mnt -if [ $? != 0 ]; then - echo "FATAL ERROR: MOUNT FAILED." - echo "You should verify that your system is set up as you" - echo "described, and re-attempt the upgrade procedure." - exit 1 -fi -echo "Done." - -if [ $upgradefs = YES ]; then - echo "" - echo -n "Copying new fsck binary to your hard disk..." - if [ ! -d /mnt/sbin ]; then - mkdir /mnt/sbin - fi - cp /sbin/fsck /mnt/sbin/fsck - if [ $? != 0 ]; then - echo "FATAL ERROR: COPY FAILED." - echo "It in unclear why this error would occur. It looks" - echo "like you may end up having to upgrade by hand." - exit 1 - fi - echo " Done." - - echo "" - echo "Re-mounting root partition read-only..." - mount -u -o ro /dev/${drivename}a /mnt - if [ $? != 0 ]; then - echo "FATAL ERROR: RE-MOUNT FAILED." - echo "It in unclear why this error would occur. It looks" - echo "like you may end up having to upgrade by hand." - exit 1 - fi - echo "Done." - - echo "" - echo "Upgrading the rest of your file systems..." - chroot /mnt fsck -p -c 2 - if [ $? != 0 ]; then - echo "FATAL ERROR: FILE SYSTEM UPGRADE(S) FAILED." - echo "You should probably reboot the machine, fsck your" - echo "file system(s), and try the upgrade procedure" - echo "again." - exit 1 - fi - echo "Done." - - echo "" - echo "Re-mounting root partition read-write..." - mount -u -o rw /dev/${drivename}a /mnt - if [ $? != 0 ]; then - echo "FATAL ERROR: RE-MOUNT FAILED." - echo "It in unclear why this error would occur. It looks" - echo "like you may end up having to upgrade by hand." - exit 1 - fi - echo "Done." -fi - -echo "" -echo "Updating boot blocks on ${drivename}..." -disklabel -r $drivename > /mnt/tmp/${drivename}.label -if [ $? != 0 ]; then - echo "FATAL ERROR: READ OF DISK LABEL FAILED." - echo "It in unclear why this error would occur. It looks" - echo "like you may end up having to upgrade by hand." - exit 1 -fi -disklabel -R -B $drivename /mnt/tmp/${drivename}.label -if [ $? != 0 ]; then - echo "FATAL ERROR: UPDATE OF DISK LABEL FAILED." - echo "It in unclear why this error would occur. It looks" - echo "like you may end up having to upgrade by hand." - exit 1 -fi -echo "Done." - -echo "" -echo "Copying bootstrapping binaries and config files to the hard drive..." -$DONTDOIT cp /mnt/.profile /mnt/.profile.bak -$DONTDOIT pax -rw -X -k . /mnt -$DONTDOIT mv /mnt/etc/rc /mnt/etc/rc.bak -$DONTDOIT cp /tmp/.hdprofile /mnt/.profile - -echo "" -echo "Mounting remaining partitions..." -chroot /mnt mount -at ffs > /dev/null 2>&1 -echo "Done." - -echo "" -echo "" -echo "OK! The preliminary work of setting up your disk is now complete," -echo "and you can now upgrade the actual OpenBSD software." -echo "" -echo "Right now, your hard disk is mounted on /mnt. You should consult" -echo "the installation notes to determine how to load and install the new" -echo "OpenBSD distribution sets, and how to clean up after the upgrade" -echo "software, when you are done." -echo "" -echo "GOOD LUCK!" -echo "" |