diff options
Diffstat (limited to 'distrib')
68 files changed, 152 insertions, 787 deletions
diff --git a/distrib/alpha/common/dot.profile b/distrib/alpha/common/dot.profile index 0a0036a635e..d5fa8ca2dd6 100644 --- a/distrib/alpha/common/dot.profile +++ b/distrib/alpha/common/dot.profile @@ -1,5 +1,5 @@ # -# $OpenBSD: dot.profile,v 1.2 2001/03/03 12:24:14 deraadt Exp $ +# $OpenBSD: dot.profile,v 1.3 2001/06/23 19:44:34 deraadt Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -36,7 +36,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -53,7 +52,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES # need a writable root - mount /dev/rd0a / + mount -u /dev/rd0a / isin() { local _a diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index b78aacf8c39..7f835c6288d 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.1 2001/01/29 21:25:46 deraadt Exp $ +# $OpenBSD: install.md,v 1.2 2001/06/23 19:44:34 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,16 +39,11 @@ # machine dependent section of installation/upgrade script. # -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted +ARCH=ARCH # Machine-dependent install sets MDSETS=kernel -md_machine_arch() { - cat /kern/machine -} - md_set_term() { test -n "$TERM" && return echo -n "Specify terminal type [sun]: " @@ -59,7 +54,8 @@ md_set_term() { md_get_msgbuf() { # Only want to see one boot's worth of info - sed -n -f /dev/stdin /kern/msgbuf <<- OOF + dmesg > /tmp/msgbuf + sed -n -f /dev/stdin /tmp/msgbuf <<- OOF /^OpenBSD /h /^OpenBSD /!H \${ @@ -225,45 +221,3 @@ md_native_fstype() { md_native_fsopts() { : } - -md_makerootwritable() { - # 2048 is the size in DEV_BIZE blocks - - if [ -e ${TMPWRITEABLE} ]; then - md_mountkernfs - return - fi - umount /tmp >> /dev/null 2>&1 - if ! mount -t ffs -u /dev/rd0a / ; then - cat << __EOT - -FATAL ERROR: Can't mount the ram filesystem. - -__EOT - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - > ${TMPWRITEABLE} - - md_mountkernfs -} -md_mountkernfs() { - test -e $KERNFSMOUNTED && return - if ! mount -t kernfs /kern /kern; then - cat << __EOT -FATAL ERROR: Can't mount kernfs filesystem -__EOT - exit - fi - > $KERNFSMOUNTED -} - -hostname() { - case $# in - 0) cat /kern/hostname ;; - 1) echo "$1" > /kern/hostname ;; - *) echo usage: hostname [name-of-host] - esac -} diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list index 8375dad96d3..67c041c44e5 100644 --- a/distrib/alpha/common/list +++ b/distrib/alpha/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.1 2001/01/29 21:25:46 deraadt Exp $ +# $OpenBSD: list,v 1.2 2001/06/23 19:44:34 deraadt Exp $ # we strip comments from files since we need the space... @@ -10,7 +10,6 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/dot.profile > .profile SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/disktab.shadow > etc/disktab.shadow SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install -#SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/install.md > install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md SPECIAL chmod 755 install #SPECIAL chmod 755 upgrade diff --git a/distrib/alpha/inst-common/mtree.conf b/distrib/alpha/inst-common/mtree.conf index 3cdab3cbc97..3cca07b54f2 100644 --- a/distrib/alpha/inst-common/mtree.conf +++ b/distrib/alpha/inst-common/mtree.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: mtree.conf,v 1.1 1997/05/07 12:46:52 niklas Exp $ +# $OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:37 deraadt Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -41,11 +41,6 @@ tmp # ./tmp .. -# ./kern -kern -# ./kern -.. - # ./usr usr diff --git a/distrib/amiga/install.md b/distrib/amiga/install.md index 6ab29199b20..6e3ff73d3b0 100644 --- a/distrib/amiga/install.md +++ b/distrib/amiga/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.9 1999/09/03 18:55:22 deraadt Exp $ +# $OpenBSD: install.md,v 1.10 2001/06/23 19:44:38 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -43,21 +43,7 @@ # Machine-dependent install sets MDSETS="kernel" -MSGBUF=/kern/msgbuf -HOSTNAME=/kern/hostname - -# an alias for hostname(1) -hostname() { - if [ -x /bin/hostname ]; then - /bin/hostname $1 - else - if [ -z "$1" ]; then - cat $HOSTNAME - else - echo $1 > $HOSTNAME - fi - fi -} +ARCH=ARCH md_set_term() { if [ ! -z "$TERM" ]; then @@ -69,22 +55,14 @@ md_set_term() { export TERM } -md_makerootwritable() { - # This is done in .profile now -} - -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - sed -n -e '/^[sw]d[0-9] /{s/ .*//;p;}' < $MSGBUF + dmesg | sed -n -e '/^[sw]d[0-9] /{s/ .*//;p;}' } md_get_cddevs() { # return available CDROM devices - sed -n -e '/^a\{0,1\}cd[0-9] /{s/ .*//;p;}' < $MSGBUF + dmesg | sed -n -e '/^a\{0,1\}cd[0-9] /{s/ .*//;p;}' } md_get_partition_range() { diff --git a/distrib/amiga/miniroot/dot.profile b/distrib/amiga/miniroot/dot.profile index 604dec783b3..9a1547444f0 100644 --- a/distrib/amiga/miniroot/dot.profile +++ b/distrib/amiga/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.6 2000/10/25 16:38:11 millert Exp $ +# $OpenBSD: dot.profile,v 1.7 2001/06/23 19:44:38 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -58,9 +57,7 @@ EDITUBIN=/usr/bin if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern - mount_ffs -o update /kern/rootdev / + mount_ffs -o update /dev/rd0a / # set up some sane defaults echo 'erase ^H, werase ^W, kill ^U, intr ^C, status ^T' diff --git a/distrib/amiga/miniroot/list b/distrib/amiga/miniroot/list index 61ea0a5a1b1..fb89833f54c 100644 --- a/distrib/amiga/miniroot/list +++ b/distrib/amiga/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.6 1998/12/20 23:36:41 millert Exp $ +# $OpenBSD: list,v 1.7 2001/06/23 19:44:38 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Amiga extra's @@ -39,4 +39,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${ARCHDIR}/../install.md > install.md diff --git a/distrib/amiga/ramdisk/dot.profile b/distrib/amiga/ramdisk/dot.profile index fd45cc5b867..17a8df83868 100644 --- a/distrib/amiga/ramdisk/dot.profile +++ b/distrib/amiga/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.5 2000/10/25 16:38:11 millert Exp $ +# $OpenBSD: dot.profile,v 1.6 2001/06/23 19:44:39 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -57,9 +56,7 @@ EDITBIN=/bin if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern - mount_ffs -o update /kern/rootdev / + mount_ffs -o update /dev/rd0a / # set up some sane defaults echo 'erase ^H, werase ^W, kill ^U, intr ^C, status ^T' diff --git a/distrib/amiga/ramdisk/list b/distrib/amiga/ramdisk/list index 0e08c73051c..631c151f17f 100644 --- a/distrib/amiga/ramdisk/list +++ b/distrib/amiga/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.5 1998/12/21 03:31:36 millert Exp $ +# $OpenBSD: list,v 1.6 2001/06/23 19:44:39 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Amiga extra's @@ -34,4 +34,5 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/../miniroot/dot.profile .profile +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${ARCHDIR}/../install.md > install.md COPY ${ARCHDIR}/../install.md install.md diff --git a/distrib/hp300/ramdisk/dot.profile b/distrib/hp300/ramdisk/dot.profile index 4d9f818cf6f..2ea9468f609 100644 --- a/distrib/hp300/ramdisk/dot.profile +++ b/distrib/hp300/ramdisk/dot.profile @@ -1,5 +1,5 @@ # -# $OpenBSD: dot.profile,v 1.9 2000/10/25 16:38:12 millert Exp $ +# $OpenBSD: dot.profile,v 1.10 2001/06/23 19:44:40 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/07/18 04:13:09 briggs Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -39,7 +39,6 @@ export HOME=/ umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" TMPWRITEABLE=/tmp/writeable @@ -53,7 +52,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then echo '' echo 'Remounting /dev/rd0a as root...' - mount /dev/rd0a / + mount -u /dev/rd0a / # tell install.md we've done it > ${TMPWRITEABLE} diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index 2c5f7ada3f9..9ae69e899ef 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.21 2001/01/25 19:18:37 deraadt Exp $ +# $OpenBSD: install.md,v 1.22 2001/06/23 19:44:40 deraadt Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -44,9 +44,7 @@ # Machine-dependent install sets MDSETS="kernel" - -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted +ARCH=ARCH md_set_term() { echo -n "Specify terminal type [hp300h]: " @@ -69,57 +67,15 @@ md_set_term() { fi } -md_makerootwritable() { - - if [ -e ${TMPWRITEABLE} ] - then - md_mountkernfs - return - fi - if ! mount -t ffs -u /dev/rd0a / ; then - cat << \__rd0_failed_1 - -FATAL ERROR: Can't mount the ram filesystem. - -__rd0_failed_1 - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - > ${TMPWRITEABLE} - - md_mountkernfs -} - -md_mountkernfs() { - if [ -e ${KERNFSMOUNTED} ] - then - return - fi - if ! mount -t kernfs /kern /kern - then - cat << \__kernfs_failed_1 -FATAL ERROR: Can't mount kernfs filesystem -__kernfs_failed_1 - exit - fi - > ${KERNFSMOUNTED} -} - -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - egrep -a "^hd[0-9]*:." < /kern/msgbuf | cutword -t: 1 | sort -u - egrep -a "^sd[0-9]*:.*cylinders" < /kern/msgbuf | cutword -t: 1 | sort -u + dmesg | egrep -a "^hd[0-9]*:." | cutword -t: 1 | sort -u + dmesg | egrep -a "^sd[0-9]*:.*cylinders" | cutword -t: 1 | sort -u } md_get_cddevs() { # return available CD-ROM devices - egrep -a "sd[0-9]*:.*CD-ROM" < /kern/msgbuf | cutword -t: 1 | sort -u + dmesg | egrep -a "sd[0-9]*:.*CD-ROM" | cutword -t: 1 | sort -u } md_get_partition_range() { @@ -196,7 +152,7 @@ __scsi_label_1 getresp "y" case "$resp" in y*|Y*) - less -rsS /kern/msgbuf + dmesg | less -rsS ;; *) @@ -313,8 +269,8 @@ hp300_init_label_hpib_disk() { # We look though the boot messages attempting to find # the model number for the provided disk. _hpib_disktype="" - if egrep "${1}: " < /kern/msgbuf > /dev/null 2>&1; then - _hpib_disktype=HP`egrep "${1}: " < /kern/msgbuf | sort -u | \ + if dmesg | egrep "${1}: " > /dev/null 2>&1; then + _hpib_disktype=HP`dmesg | egrep "${1}: " | sort -u | \ cutword 2 ` fi if [ "X${_hpib_disktype}" = "X" ]; then @@ -468,11 +424,3 @@ md_native_fstype() { md_native_fsopts() { # Nothing to do. } - -hostname() { - case $# in - 0) cat /kern/hostname ;; - 1) echo "$1" > /kern/hostname ;; - *) echo usage: hostname [name-of-host] - esac -} diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 75317c31435..4cf54306463 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.18 2000/10/31 16:32:46 millert Exp $ +# $OpenBSD: list,v 1.19 2001/06/23 19:44:40 deraadt Exp $ COPY ${OBJDIR}/raminst raminst LINK raminst bin/cat @@ -77,7 +77,7 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/termcap.hp-vt > usr/share/misc/ # and the installation tools SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.profile > .profile SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.instutils > .instutils -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/install.md > install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub diff --git a/distrib/hp300/ramdisk/mtree.conf b/distrib/hp300/ramdisk/mtree.conf index cf3d69f01bd..fafc74ee56c 100644 --- a/distrib/hp300/ramdisk/mtree.conf +++ b/distrib/hp300/ramdisk/mtree.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: mtree.conf,v 1.2 1997/10/31 05:41:29 downsj Exp $ +# $OpenBSD: mtree.conf,v 1.3 2001/06/23 19:44:40 deraadt Exp $ # $NetBSD: mtree.conf,v 1.1 1995/07/18 04:13:24 briggs Exp $ # @@ -42,11 +42,6 @@ tmp # ./tmp .. -# ./kern -kern -# ./kern -.. - # ./var var diff --git a/distrib/i386/floppies/common/dot.profile b/distrib/i386/floppies/common/dot.profile index 7a401329398..b4254352168 100644 --- a/distrib/i386/floppies/common/dot.profile +++ b/distrib/i386/floppies/common/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:12 millert Exp $ +# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:41 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -51,8 +50,6 @@ EDITUBIN=/usr/bin if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern mount_ffs -o update /dev/rd0a / # set up some sane defaults diff --git a/distrib/i386/floppies/common/install.md b/distrib/i386/floppies/common/install.md index c8eec944b88..39395b114b9 100644 --- a/distrib/i386/floppies/common/install.md +++ b/distrib/i386/floppies/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.12 2001/03/13 21:22:50 deraadt Exp $ +# $OpenBSD: install.md,v 1.13 2001/06/23 19:44:42 deraadt Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. @@ -42,6 +42,7 @@ # Machine-dependent install sets MDSETS=kernel +ARCH=ARCH md_set_term() { test -n "$TERM" && return @@ -51,22 +52,14 @@ md_set_term() { export TERM } -md_makerootwritable() { - : -} - -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - bsort `egrep -a "^[sw]d[0-9]+ " /kern/msgbuf | cutword 1` + bsort `dmesg | egrep -a "^[sw]d[0-9]+ " | cutword 1` } md_get_cddevs() { # return available CDROM devices - bsort `egrep -a "^cd[0-9]+ " /kern/msgbuf | cutword 1` + bsort `dmesg | egrep -a "^cd[0-9]+ " | cutword 1` } md_get_partition_range() { @@ -280,11 +273,3 @@ halted, reset the machine and boot from the disk. __EOT } - -hostname() { - case $# in - 0) cat /kern/hostname ;; - 1) echo "$1" > /kern/hostname ;; - *) echo usage: hostname [name-of-host] - esac -} diff --git a/distrib/i386/floppies/common/instbin-nokrb.conf b/distrib/i386/floppies/common/instbin-nokrb.conf index a37e0dcaca8..458f30012f2 100644 --- a/distrib/i386/floppies/common/instbin-nokrb.conf +++ b/distrib/i386/floppies/common/instbin-nokrb.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin-nokrb.conf,v 1.6 2000/07/07 21:52:14 marc Exp $ +# $OpenBSD: instbin-nokrb.conf,v 1.7 2001/06/23 19:44:42 deraadt Exp $ # # instbin-nokrb.conf - unified binary for the inst/upgr floppies # @@ -9,7 +9,7 @@ srcdirs usr.sbin/pppd sys/arch/i386/stand progs cat chmod cp dd df disklabel dhclient ed progs fsck_ffs ftp fdisk progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_kernfs mount_ext2fs +progs mount_ffs mount_msdos mount_ext2fs progs mv newfs pax ksh ping reboot rm route progs sed sleep stty umount progs rsh restore gzip grep installboot diff --git a/distrib/i386/floppies/common/instbin.conf b/distrib/i386/floppies/common/instbin.conf index a790a4c995c..731acc18192 100644 --- a/distrib/i386/floppies/common/instbin.conf +++ b/distrib/i386/floppies/common/instbin.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin.conf,v 1.15 2001/04/09 06:55:40 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.16 2001/06/23 19:44:42 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # @@ -6,10 +6,10 @@ 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 cp dd df disklabel dhclient ed -progs fsck_ffs ftp fdisk +progs cat chmod cp dd df disklabel dhclient dmesg ed +progs fsck_ffs ftp fdisk hostname progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_kernfs mount_ext2fs +progs mount_ffs mount_msdos mount_ext2fs progs mv newfs pax ksh ping reboot rm route progs sed sleep stty umount progs rsh restore gzip grep installboot diff --git a/distrib/i386/floppies/common/list b/distrib/i386/floppies/common/list index 91ff7753fbe..3b4a3eae66c 100644 --- a/distrib/i386/floppies/common/list +++ b/distrib/i386/floppies/common/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.19 2001/04/19 02:17:32 deraadt Exp $ +# $OpenBSD: list,v 1.20 2001/06/23 19:44:42 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -15,6 +15,7 @@ LINK instbin bin/ls LINK instbin bin/mkdir LINK instbin bin/mv LINK instbin bin/rm +LINK instbin bin/hostname LINK instbin bin/sh bin/ksh LINK instbin bin/sleep LINK instbin bin/stty @@ -22,6 +23,7 @@ LINK instbin sbin/chown LINK instbin sbin/disklabel LINK instbin sbin/dhclient LINK instbin sbin/fdisk +LINK instbin sbin/dmesg LINK instbin sbin/fsck sbin/fsck_ffs LINK instbin sbin/halt sbin/reboot LINK instbin sbin/ifconfig @@ -31,7 +33,6 @@ LINK instbin sbin/mount LINK instbin sbin/mount_cd9660 LINK instbin sbin/mount_ffs LINK instbin sbin/mount_msdos -LINK instbin sbin/mount_kernfs LINK instbin sbin/mount_ext2fs LINK instbin sbin/ping LINK instbin sbin/newfs @@ -82,7 +83,7 @@ COPY ${CURDIR}/../common/termcap.vt usr/share/misc/termcap # and the installation tools SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/dot.profile > .profile -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../common/install.md > install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/upgrade.sh > upgrade SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../../miniroot/install.sh > install SPECIAL sed -e '/^#[ ].*$/d' -e "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/../../../miniroot/install.sub > install.sub diff --git a/distrib/i386/floppies/common/mtree.conf b/distrib/i386/floppies/common/mtree.conf index 4cf67a9de1c..9a87ca621a9 100644 --- a/distrib/i386/floppies/common/mtree.conf +++ b/distrib/i386/floppies/common/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.4 1999/08/06 20:49:08 deraadt Exp $ +# $OpenBSD: mtree.conf,v 1.5 2001/06/23 19:44:42 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -35,11 +35,6 @@ mnt2 # ./mnt2 .. -# ./kern -kern -# ./kern -.. - # ./sbin sbin # ./sbin diff --git a/distrib/i386/floppies/ramdiskC/instbin.conf b/distrib/i386/floppies/ramdiskC/instbin.conf index 7b732917f00..c15058518ff 100644 --- a/distrib/i386/floppies/ramdiskC/instbin.conf +++ b/distrib/i386/floppies/ramdiskC/instbin.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin.conf,v 1.1 2001/04/09 06:55:40 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.2 2001/06/23 19:44:43 deraadt Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # @@ -9,7 +9,7 @@ srcdirs usr.sbin/pppd sys/arch/i386/stand progs cat chmod cp dd df disklabel dhclient ed progs fsck_ffs ftp fdisk progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 -progs mount_ffs mount_msdos mount_kernfs mount_ext2fs +progs mount_ffs mount_msdos mount_ext2fs progs mv newfs pax ksh ping reboot rm route progs sed sleep stty umount wicontrol ancontrol progs rsh restore gzip grep installboot diff --git a/distrib/i386/floppies/ramdiskC/list b/distrib/i386/floppies/ramdiskC/list index ec2629f3daf..878fb4850ed 100644 --- a/distrib/i386/floppies/ramdiskC/list +++ b/distrib/i386/floppies/ramdiskC/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2001/04/19 02:17:33 deraadt Exp $ +# $OpenBSD: list,v 1.3 2001/06/23 19:44:43 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -33,7 +33,6 @@ LINK instbin sbin/mount LINK instbin sbin/mount_cd9660 LINK instbin sbin/mount_ffs LINK instbin sbin/mount_msdos -LINK instbin sbin/mount_kernfs LINK instbin sbin/mount_ext2fs LINK instbin sbin/ping LINK instbin sbin/newfs diff --git a/distrib/mac68k/ramdisk/dot.profile b/distrib/mac68k/ramdisk/dot.profile index e35c71edf88..e428d561117 100644 --- a/distrib/mac68k/ramdisk/dot.profile +++ b/distrib/mac68k/ramdisk/dot.profile @@ -1,5 +1,5 @@ # -# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:13 millert Exp $ +# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:44 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/07/18 04:13:09 briggs Exp $ # # Copyright (c) 1994 Christopher G. Demetriou @@ -39,7 +39,6 @@ export HOME=/ umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" TMPWRITEABLE=/tmp/writeable @@ -53,7 +52,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then echo '' echo 'Remounting /dev/rd0a as root...' - mount /dev/rd0a / + mount -u /dev/rd0a / # tell install.md we've done it > ${TMPWRITEABLE} diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md index dfb1f63dc17..2f7b7d33b01 100644 --- a/distrib/mac68k/ramdisk/install.md +++ b/distrib/mac68k/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.4 2001/01/25 19:18:39 deraadt Exp $ +# $OpenBSD: install.md,v 1.5 2001/06/23 19:44:44 deraadt Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -44,9 +44,7 @@ # Machine-dependent install sets MDSETS="kernel" - -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted +ARCH= md_set_term() { echo -n "Specify terminal type [vt220]: " @@ -69,56 +67,14 @@ md_set_term() { fi } -md_makerootwritable() { - - if [ -e ${TMPWRITEABLE} ] - then - md_mountkernfs - return - fi - if ! mount -t ffs -u /dev/rd0a / ; then - cat << \__rd0_failed_1 - -FATAL ERROR: Can't mount the ram filesystem. - -__rd0_failed_1 - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - > ${TMPWRITEABLE} - - md_mountkernfs -} - -md_mountkernfs() { - if [ -e ${KERNFSMOUNTED} ] - then - return - fi - if ! mount -t kernfs /kern /kern - then - cat << \__kernfs_failed_1 -FATAL ERROR: Can't mount kernfs filesystem -__kernfs_failed_1 - exit - fi - > ${KERNFSMOUNTED} -} - -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - egrep -a "^sd[0-9]+ " /kern/msgbuf | cutword 1 | sort -u + dmesg | egrep -a "^sd[0-9]+ " | cutword 1 | sort -u } md_get_cddevs() { # return available CD-ROM devices - egrep -a "^cd[0-9]+ " /kern/msgbuf | cutword 1 | sort -u + dmesg | egrep -a "^cd[0-9]+ " | cutword 1 | sort -u } md_get_partition_range() { diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list index a082c70065c..c55cd9e3254 100644 --- a/distrib/mac68k/ramdisk/list +++ b/distrib/mac68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.3 2000/07/15 02:21:00 deraadt Exp $ +# $OpenBSD: list,v 1.4 2001/06/23 19:44:45 deraadt Exp $ COPY ${OBJDIR}/raminst raminst LINK raminst bin/cat @@ -76,7 +76,7 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/ter # and the installation tools SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.profile > .profile SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.instutils > .instutils -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/install.md > install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../install.md > install.md SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub diff --git a/distrib/mac68k/ramdisk/mtree.conf b/distrib/mac68k/ramdisk/mtree.conf index 36fc71719a3..cf713eab1f6 100644 --- a/distrib/mac68k/ramdisk/mtree.conf +++ b/distrib/mac68k/ramdisk/mtree.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: mtree.conf,v 1.1 1999/06/13 10:33:31 downsj Exp $ +# $OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:45 deraadt Exp $ # $NetBSD: mtree.conf,v 1.1 1995/07/18 04:13:24 briggs Exp $ # @@ -42,11 +42,6 @@ tmp # ./tmp .. -# ./kern -kern -# ./kern -.. - # ./var var diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index 27b276d2993..c3aafef1a5e 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.77 2001/04/20 01:55:51 krw Exp $ +# $OpenBSD: install.sh,v 1.78 2001/06/23 19:44:45 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt @@ -89,8 +89,6 @@ MODE="install" # md_congrats() - display friendly message # md_native_fstype() - native filesystem type for disk installs # md_native_fsopts() - native filesystem options for disk installs -# md_makerootwritable() - make root writable (at least /tmp) -# md_machine_arch() - get machine architecture # include machine dependent subroutines . install.md @@ -136,16 +134,6 @@ md_set_term # Get timezone info get_timezone -# Make sure we can write files (at least in /tmp) -# This might make an MFS mount on /tmp, or it may -# just re-mount the root with read-write enabled. -if [ "`df /`" = "`df /tmp`" ]; then - md_makerootwritable -fi - -# Get the machine architecture (must be done after md_makerootwritable) -ARCH=`md_machine_arch` - if [ "`df /`" = "`df /mnt`" ]; then # Install the shadowed disktab file; lets us write to it for temporary # purposes without mounting the miniroot read-write. diff --git a/distrib/miniroot/list b/distrib/miniroot/list index c31bd193c00..aefe3ba0eba 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.19 2000/07/25 18:23:32 deraadt Exp $ +# $OpenBSD: list,v 1.20 2001/06/23 19:44:45 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -25,6 +25,7 @@ LINK instbin bin/ksh bin/sh LINK instbin bin/stty LINK instbin bin/sleep LINK instbin bin/sync +LINK instbin sbin/dmesg LINK instbin sbin/fsck_ffs sbin/fsck LINK instbin sbin/reboot sbin/halt LINK instbin sbin/ifconfig diff --git a/distrib/miniroot/mtree.conf b/distrib/miniroot/mtree.conf index 1461586083b..68276735757 100644 --- a/distrib/miniroot/mtree.conf +++ b/distrib/miniroot/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.5 1997/05/17 20:15:09 deraadt Exp $ +# $OpenBSD: mtree.conf,v 1.6 2001/06/23 19:44:46 deraadt Exp $ # $NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -20,11 +20,6 @@ etc # ./etc .. -# ./kern -kern -# ./kern -.. - # ./mnt mnt # ./mnt diff --git a/distrib/miniroot/upgrade.sh b/distrib/miniroot/upgrade.sh index 044921f5252..618e2854be7 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: upgrade.sh,v 1.16 2001/04/20 01:55:51 krw Exp $ +# $OpenBSD: upgrade.sh,v 1.17 2001/06/23 19:44:46 deraadt Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -57,7 +57,6 @@ MODE="upgrade" # md_welcome_banner() - display friendly message # md_not_going_to_install() - display friendly message # md_congrats() - display friendly message -# md_machine_arch() - get machine architecture # include machine dependent subroutines . install.md @@ -88,14 +87,6 @@ md_set_term # XXX Work around vnode aliasing bug (thanks for the tip, Chris...) ls -l /dev > /dev/null 2>&1 -# Make sure we can write files (at least in /tmp) -# This might make an MFS mount on /tmp, or it may -# just re-mount the root with read-write enabled. -md_makerootwritable - -# Get the machine architecture (must be done after md_makerootwritable) -ARCH=`md_machine_arch` - while [ "X${ROOTDISK}" = "X" ]; do getrootdisk done diff --git a/distrib/mvme68k/ramdisk/dot.profile b/distrib/mvme68k/ramdisk/dot.profile index 629619aab0c..97f3643e228 100644 --- a/distrib/mvme68k/ramdisk/dot.profile +++ b/distrib/mvme68k/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.6 2000/10/25 16:38:16 millert Exp $ +# $OpenBSD: dot.profile,v 1.7 2001/06/23 19:44:46 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -52,8 +51,6 @@ export TERM=vt100 if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern mount_ffs -o update /dev/rd0a / # set up some sane defaults diff --git a/distrib/mvme68k/ramdisk/install.md b/distrib/mvme68k/ramdisk/install.md index c7cb784b1ea..4750424dd7f 100644 --- a/distrib/mvme68k/ramdisk/install.md +++ b/distrib/mvme68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.11 2001/01/25 19:18:40 deraadt Exp $ +# $OpenBSD: install.md,v 1.12 2001/06/23 19:44:47 deraadt Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -39,11 +39,9 @@ # # -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted - # Machine-dependent install sets MDSETS=kernel +ARCH=ARCH md_copy_kernel() { if [ ! -s /mnt/bsd ]; then @@ -75,23 +73,19 @@ md_set_term() { export TERM } -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - egrep -a "^[sw]d[0-9]|ofdisk[0-9] " /kern/msgbuf | sed -e "s/[ :(].*//" | sort -u + dmesg | egrep -a "^[sw]d[0-9]|ofdisk[0-9] " | sed -e "s/[ :(].*//" | sort -u } md_get_cddevs() { # return available CDROM devices - egrep -a "^cd[0-9] " /kern/msgbuf | sed -e "s/[ :(].*//" | sort -u + dmesg | egrep -a "^cd[0-9] " | sed -e "s/[ :(].*//" | sort -u } md_get_ifdevs() { # return available network devices - egrep "(^ie[0-9] )|(^le[0-9] )"< /kern/msgbuf | cut -d" " -f1 | sort -u + dmesg | egrep "(^ie[0-9] )|(^le[0-9] )" | cut -d" " -f1 | sort -u } md_get_partition_range() { @@ -274,42 +268,3 @@ __congratulations_1 md_native_fstype() { } -md_makerootwritable() { -} -md_makerootwritable2() { - - if [ -e ${TMPWRITEABLE} ] - then - md_mountkernfs - return - fi - umount /tmp >> /dev/null 2>&1 - if ! mount -t ffs -u /dev/rd0a / ; then - cat << \__rd0_failed_1 - -FATAL ERROR: Can't mount the ram filesystem. - -__rd0_failed_1 - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - > ${TMPWRITEABLE} - - md_mountkernfs -} -md_mountkernfs() { - if [ -e ${KERNFSMOUNTED} ] - then - return - fi - if ! mount -t kernfs /kern /kern - then - cat << \__kernfs_failed_1 -FATAL ERROR: Can't mount kernfs filesystem -__kernfs_failed_1 - exit - fi - > ${KERNFSMOUNTED} -} diff --git a/distrib/mvme68k/ramdisk/install.sh b/distrib/mvme68k/ramdisk/install.sh index b41089a4f66..e911d5ffab5 100644 --- a/distrib/mvme68k/ramdisk/install.sh +++ b/distrib/mvme68k/ramdisk/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.1 1997/02/15 04:27:16 rahnds Exp $ +# $OpenBSD: install.sh,v 1.2 2001/06/23 19:44:47 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -63,7 +63,6 @@ MODE="install" # md_congrats() - display friendly message # md_native_fstype() - native filesystem type for disk installs # md_native_fsopts() - native filesystem options for disk installs -# md_makerootwritable() - make root writable (at least /tmp) # include machine dependent subroutines . install.md @@ -97,11 +96,6 @@ md_set_term # Get timezone info get_timezone -# Make sure we can write files (at least in /tmp) -# This might make an MFS mount on /tmp, or it may -# just re-mount the root with read-write enabled. -md_makerootwritable - # Install the shadowed disktab file; lets us write to it for temporary # purposes without mounting the miniroot read-write. cp /etc/disktab.shadow /tmp/disktab.shadow diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list index 8915104909e..c3272c9af67 100644 --- a/distrib/mvme68k/ramdisk/list +++ b/distrib/mvme68k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.7 2000/07/14 20:46:57 deraadt Exp $ +# $OpenBSD: list,v 1.8 2001/06/23 19:44:47 deraadt Exp $ SRCDIRS distrib/special SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin SRCDIRS usr.sbin/pppd @@ -95,7 +95,7 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/ter # and the installation tools SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.profile > .profile SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/dot.instutils > .instutils -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/install.md > install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../install.md > install.md SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/install.sub > install.sub diff --git a/distrib/mvme68k/ramdisk/mtree.conf b/distrib/mvme68k/ramdisk/mtree.conf index 9e9a07d9f1a..44fa62ab518 100644 --- a/distrib/mvme68k/ramdisk/mtree.conf +++ b/distrib/mvme68k/ramdisk/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.2 2000/01/24 04:50:26 smurph Exp $ +# $OpenBSD: mtree.conf,v 1.3 2001/06/23 19:44:47 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -35,11 +35,6 @@ mnt2 # ./mnt2 .. -# ./kern -kern -# ./kern -.. - # ./sbin sbin # ./sbin diff --git a/distrib/mvme88k/miniroot/dot.profile b/distrib/mvme88k/miniroot/dot.profile index 2098da8bba8..af1d6f34ce2 100644 --- a/distrib/mvme88k/miniroot/dot.profile +++ b/distrib/mvme88k/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:16 millert Exp $ +# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:48 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -58,9 +57,7 @@ EDITUBIN=/usr/bin if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern - mount_ffs -o update /kern/rootdev / + mount_ffs -o update /dev/rd0a / # set up some sane defaults echo 'erase ^H, werase ^W, kill ^U, intr ^C, status ^T' diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list index b4e2417d404..1d41f3dd1a5 100644 --- a/distrib/mvme88k/miniroot/list +++ b/distrib/mvme88k/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 1998/12/20 23:36:43 millert Exp $ +# $OpenBSD: list,v 1.3 2001/06/23 19:44:48 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Amiga extra's @@ -39,4 +39,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch`" < ${ARCHDIR}/../install.md > install.md diff --git a/distrib/mvme88k/ramdisk/dot.profile b/distrib/mvme88k/ramdisk/dot.profile index cf72a5e32fe..16c9394aeb9 100644 --- a/distrib/mvme88k/ramdisk/dot.profile +++ b/distrib/mvme88k/ramdisk/dot.profile @@ -1,5 +1,5 @@ # -# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:17 millert Exp $ +# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:49 deraadt Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -37,7 +37,6 @@ export TERM=vt200 umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # set up some sane defaults echo 'erase ^?, werase ^H, kill ^U, intr ^C, status ^T' diff --git a/distrib/mvme88k/ramdisk/install.md b/distrib/mvme88k/ramdisk/install.md index a070ad5d7d8..271ce9a47f9 100644 --- a/distrib/mvme88k/ramdisk/install.md +++ b/distrib/mvme88k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.6 2001/01/25 19:18:40 deraadt Exp $ +# $OpenBSD: install.md,v 1.7 2001/06/23 19:44:49 deraadt Exp $ # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. # @@ -39,9 +39,6 @@ # # -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted - md_set_term() { if [ ! -z "$TERM" ]; then return @@ -52,21 +49,17 @@ md_set_term() { export TERM } -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { - egrep -a "^sd[0-9] " < /kern/msgbuf + dmesg | egrep -a "^sd[0-9] " } md_get_cddevs() { - egrep -a "^cd[0-9] " < /kern/msgbuf + dmesg | egrep -a "^cd[0-9] " } md_get_ifdevs() { # return available network devices - egrep "(^ie[0-9] )|(^le[0-9] )"< /kern/msgbuf | cut -d" " -f1 | sort -u + dmesg | egrep "(^ie[0-9] )|(^le[0-9] )" | cut -d" " -f1 | sort -u } md_get_partition_range() { @@ -244,41 +237,3 @@ __congratulations_1 md_native_fstype() { } - -md_makerootwritable() { - - if [ -e ${TMPWRITEABLE} ] - then - md_mountkernfs - return - fi - umount /tmp >> /dev/null 2>&1 - if ! mount -t ffs -u /dev/rd0a / ; then - cat << \__rd0_failed_1 - -FATAL ERROR: Can't mount the ram filesystem. - -__rd0_failed_1 - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - > ${TMPWRITEABLE} - - md_mountkernfs -} -md_mountkernfs() { - if [ -e ${KERNFSMOUNTED} ] - then - return - fi - if ! mount -t kernfs /kern /kern - then - cat << \__kernfs_failed_1 -FATAL ERROR: Can't mount kernfs filesystem -__kernfs_failed_1 - exit - fi - > ${KERNFSMOUNTED} -} diff --git a/distrib/mvme88k/ramdisk/install.sh b/distrib/mvme88k/ramdisk/install.sh index ec6e73ee274..06ae7dc704f 100644 --- a/distrib/mvme88k/ramdisk/install.sh +++ b/distrib/mvme88k/ramdisk/install.sh @@ -1,5 +1,5 @@ # -# $OpenBSD: install.sh,v 1.2 2000/01/24 04:51:55 smurph Exp $ +# $OpenBSD: install.sh,v 1.3 2001/06/23 19:44:49 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -62,7 +62,6 @@ MODE="install" # md_congrats() - display friendly message # md_native_fstype() - native filesystem type for disk installs # md_native_fsopts() - native filesystem options for disk installs -# md_makerootwritable() - make root writable (at least /tmp) # include machine dependent subroutines . install.md @@ -96,11 +95,6 @@ md_set_term # Get timezone info get_timezone -# Make sure we can write files (at least in /tmp) -# This might make an MFS mount on /tmp, or it may -# just re-mount the root with read-write enabled. -md_makerootwritable - # Install the shadowed disktab file; lets us write to it for temporary # purposes without mounting the miniroot read-write. cp /etc/disktab.shadow /tmp/disktab.shadow diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list index 0d7a241bd0b..292c5cf7dc8 100644 --- a/distrib/mvme88k/ramdisk/list +++ b/distrib/mvme88k/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.4 2000/07/14 20:46:57 deraadt Exp $ +# $OpenBSD: list,v 1.5 2001/06/23 19:44:50 deraadt Exp $ COPY ${OBJDIR}/raminst raminst LINK raminst bin/cat @@ -86,7 +86,7 @@ LINK sbin/init usr/bin/vi COPY dot.profile .profile COPY dot.instutils .instutils COPY install.sh install -COPY install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md COPY install.sub install.sub COPY disktab.shadow etc/disktab.shadow COPY ${DESTDIR}/usr/mdec/installboot usr/mdec diff --git a/distrib/mvme88k/ramdisk/mtree.conf b/distrib/mvme88k/ramdisk/mtree.conf index 2496928f236..eaf11101c3f 100644 --- a/distrib/mvme88k/ramdisk/mtree.conf +++ b/distrib/mvme88k/ramdisk/mtree.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: mtree.conf,v 1.1 1998/12/17 02:16:33 smurph Exp $ +# $OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:50 deraadt Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -41,11 +41,6 @@ tmp # ./tmp .. -# ./kern -kern -# ./kern -.. - # ./usr usr diff --git a/distrib/notes/pmax/install b/distrib/notes/pmax/install index be1287e8ef3..e1b6df6a39a 100644 --- a/distrib/notes/pmax/install +++ b/distrib/notes/pmax/install @@ -256,12 +256,10 @@ So here's what you have to do after going into single user mode: # fsck /dev/rrz0a ; check the filesystem # mount /dev/rz0a / ; mount / read write - # mount -t kernfs /kern /kern # ./install - network boot - # mount -t kernfs /kern /kern # ./install This script should bring you to a completely installed OpenBSD/pmax diff --git a/distrib/pmax/install.md b/distrib/pmax/install.md index 1378ab3a2d9..e743960f607 100644 --- a/distrib/pmax/install.md +++ b/distrib/pmax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.15 2001/01/25 19:18:41 deraadt Exp $ +# $OpenBSD: install.md,v 1.16 2001/06/23 19:44:52 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -40,9 +40,7 @@ # # machine dependent section of installation/upgrade script. # - -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted +ARCH=ARCH # Machine-dependent install sets MDSETS=kernel @@ -57,66 +55,19 @@ md_set_term() { export TERM } -md_makerootwritable() { - # Was: do_mfs_mount "/tmp" "2048" - # /tmp is the mount point - # 2048 is the size in DEV_BIZE blocks - -# TTT umount /tmp > /dev/null 2>&1 -# if ! mount_mfs -s 2048 swap /tmp ; then -# cat << \__mfs_failed_1 -# -#FATAL ERROR: Can't mount the memory filesystem. -# -#__mfs_failed_1 -# exit -# fi - - # Bleh. Give mount_mfs a chance to DTRT. -# sleep 2 - - md_mountkernfs -} - -md_mountkernfs() { - if [ -e ${KERNFSMOUNTED} ] - then - return - fi - if [ ! -d /kern ]; then - mkdir /kern - fi -# TTT use the chance to also make the /mnt2 directory - should be there - if [ ! -d /mnt2 ]; then - mkdir /mnt2 - fi - if ! mount -t kernfs /kern /kern - then - cat << \__kernfs_failed_1 -FATAL ERROR: Can't mount kernfs filesystem -__kernfs_failed_1 - exit - fi - > ${KERNFSMOUNTED} -} - -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - grep -a "^rz[0-6] " < /kern/msgbuf | cut -d" " -f1 | sort -u + dmesg | grep -a "^rz[0-6] " | cut -d" " -f1 | sort -u } md_get_cddevs() { # return available CDROM devices - grep -a "^rz[0-6] " < /kern/msgbuf | cut -d" " -f1 | sort -u + dmesg | grep -a "^rz[0-6] " | cut -d" " -f1 | sort -u } md_get_ifdevs() { # return available network devices - grep "^le[0-9] " < /kern/msgbuf | cut -d" " -f1 | sort -u + dmesg | grep "^le[0-9] " | cut -d" " -f1 | sort -u } md_get_partition_range() { diff --git a/distrib/pmax/ramdisk/dot.profile b/distrib/pmax/ramdisk/dot.profile index 1e34fc044b0..8bbfeef2276 100644 --- a/distrib/pmax/ramdisk/dot.profile +++ b/distrib/pmax/ramdisk/dot.profile @@ -1,5 +1,5 @@ # -# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:16 millert Exp $ +# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:44:52 deraadt Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -36,7 +36,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -53,7 +52,7 @@ if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES # need a writable root - mount /dev/rd0a / + mount -u /dev/rd0a / isin() { local _a diff --git a/distrib/pmax/ramdisk/install.md b/distrib/pmax/ramdisk/install.md index 1f2648a34db..2d17b3cfae3 100644 --- a/distrib/pmax/ramdisk/install.md +++ b/distrib/pmax/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.6 1999/09/03 18:55:34 deraadt Exp $ +# $OpenBSD: install.md,v 1.7 2001/06/23 19:44:53 deraadt Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,15 +39,9 @@ # machine dependent section of installation/upgrade script. # -TMPWRITEABLE=/tmp/writeable -KERNFSMOUNTED=/tmp/kernfsmounted - # Machine-dependent install sets MDSETS="kernel" - -md_machine_arch() { - cat /kern/machine -} +ARCH=ARCH md_set_term() { if [ ! -z "$TERM" ]; then @@ -61,7 +55,8 @@ md_set_term() { md_get_msgbuf() { # Only want to see one boot's worth of info - sed -n -f /dev/stdin /kern/msgbuf <<- OOF + dmesg > /tmp/msgbuf + sed -n -f /dev/stdin /tmp/msgbuf <<- OOF /^Copyright (c)/h /^Copyright (c)/!H \${ @@ -216,50 +211,3 @@ md_native_fstype() { } md_native_fsopts() { } - -md_makerootwritable() { - # 2048 is the size in DEV_BIZE blocks - - if [ -e ${TMPWRITEABLE} ] - then - md_mountkernfs - return - fi - umount /tmp >> /dev/null 2>&1 - if ! mount -t ffs -u /dev/rd0a / ; then - cat << \__rd0_failed_1 - -FATAL ERROR: Can't mount the ram filesystem. - -__rd0_failed_1 - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - > ${TMPWRITEABLE} - - md_mountkernfs -} -md_mountkernfs() { - if [ -e ${KERNFSMOUNTED} ] - then - return - fi - if ! mount -t kernfs /kern /kern - then - cat << \__kernfs_failed_1 -FATAL ERROR: Can't mount kernfs filesystem -__kernfs_failed_1 - exit - fi - > ${KERNFSMOUNTED} -} - -hostname() { - case $# in - 0) cat /kern/hostname ;; - 1) echo "$1" > /kern/hostname ;; - *) echo "usage: hostname [name-of-host]" - esac -} diff --git a/distrib/pmax/ramdisk/list b/distrib/pmax/ramdisk/list index f4497ec0f77..74936d01ac9 100644 --- a/distrib/pmax/ramdisk/list +++ b/distrib/pmax/ramdisk/list @@ -1,5 +1,5 @@ # -# $OpenBSD: list,v 1.3 2000/07/15 02:21:01 deraadt Exp $ +# $OpenBSD: list,v 1.4 2001/06/23 19:44:53 deraadt Exp $ # # copy the crunched binary, link to it, and kill it @@ -78,5 +78,5 @@ SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/disktab.shadow > etc/disktab.shadow SPECIAL sed -e "/^VERSION=/s/=.*/=${REV}/" -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sub > install.sub SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/install.sh > install SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/../../miniroot/upgrade.sh > upgrade -SPECIAL sed -e '/^#[ ].*$/d' < ${CURDIR}/install.md > install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md SPECIAL chmod 755 install upgrade diff --git a/distrib/pmax/ramdisk/mtree.conf b/distrib/pmax/ramdisk/mtree.conf index 460374b984f..972d8c5df4d 100644 --- a/distrib/pmax/ramdisk/mtree.conf +++ b/distrib/pmax/ramdisk/mtree.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: mtree.conf,v 1.1 1998/11/09 06:16:12 millert Exp $ +# $OpenBSD: mtree.conf,v 1.2 2001/06/23 19:44:53 deraadt Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -41,11 +41,6 @@ tmp # ./tmp .. -# ./kern -kern -# ./kern -.. - # ./usr usr diff --git a/distrib/powerpc/ramdisk/dot.profile b/distrib/powerpc/ramdisk/dot.profile index 5f90def1cbb..f527ff43e44 100644 --- a/distrib/powerpc/ramdisk/dot.profile +++ b/distrib/powerpc/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.5 2000/10/25 16:38:16 millert Exp $ +# $OpenBSD: dot.profile,v 1.6 2001/06/23 19:44:54 deraadt Exp $ # # Copyright (c) 1994 Christopher G. Demetriou # All rights reserved. @@ -36,13 +36,10 @@ export HOME=/ umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern mount_ffs -o update /dev/rd0a / # set up some sane defaults diff --git a/distrib/powerpc/ramdisk/install.md b/distrib/powerpc/ramdisk/install.md index 0e77bea7239..69ffa16630d 100644 --- a/distrib/powerpc/ramdisk/install.md +++ b/distrib/powerpc/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.24 2001/04/17 13:06:24 brad Exp $ +# $OpenBSD: install.md,v 1.25 2001/06/23 19:44:54 deraadt Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. @@ -42,6 +42,7 @@ # Machine-dependent install sets MDSETS="kernel" +ARCH=ARCH md_set_term() { test -n "$TERM" && return @@ -51,22 +52,14 @@ md_set_term() { export TERM } -md_makerootwritable() { - : -} - -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices - bsort `cat /kern/msgbuf | egrep -a "^[sw]d[0-9]+ " | cutword 1` + bsort `dmesg | egrep -a "^[sw]d[0-9]+ " | cutword 1` } md_get_cddevs() { # return available CDROM devices - bsort `cat /kern/msgbuf | egrep -a "^cd[0-9]+ " | cutword 1` + bsort `dmesg | egrep -a "^cd[0-9]+ " | cutword 1` } md_get_partition_range() { @@ -444,11 +437,3 @@ has rebooted, use Open Firmware to boot into OpenBSD. __EOT } - -hostname() { - case $# in - 0) cat /kern/hostname ;; - 1) echo "$1" > /kern/hostname ;; - *) echo usage: hostname [name-of-host] - esac -} diff --git a/distrib/powerpc/ramdisk/list b/distrib/powerpc/ramdisk/list index 0aa9647fc77..9b4ed17c5fc 100644 --- a/distrib/powerpc/ramdisk/list +++ b/distrib/powerpc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.19 2001/04/17 05:49:03 drahn Exp $ +# $OpenBSD: list,v 1.20 2001/06/23 19:44:54 deraadt Exp $ SRCDIRS distrib/special SRCDIRS usr.bin bin sbin usr.sbin gnu/usr.bin @@ -94,7 +94,7 @@ COPY ${TOPDIR}/common/termcap.vt usr/share/misc/termcap # and the installation tools COPY dot.profile .profile -COPY install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/install.md > install.md COPY ${CURDIR}/../../miniroot/install.sh install COPY ${CURDIR}/../../miniroot/upgrade.sh upgrade #SPECIAL sed "/^VERSION=/s/=.*/=${REV}/" < ${CURDIR}/install.sub > install.sub diff --git a/distrib/powerpc/ramdisk/mtree.conf b/distrib/powerpc/ramdisk/mtree.conf index df3224319c6..3ba422240e0 100644 --- a/distrib/powerpc/ramdisk/mtree.conf +++ b/distrib/powerpc/ramdisk/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.3 2001/03/25 06:30:41 drahn Exp $ +# $OpenBSD: mtree.conf,v 1.4 2001/06/23 19:44:54 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -30,11 +30,6 @@ mnt2 # ./mnt2 .. -# ./kern -kern -# ./kern -.. - # ./sbin sbin # ./sbin diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list index 23ee075de6d..35dbc074fc6 100644 --- a/distrib/ramdisk/list +++ b/distrib/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.11 2000/06/12 16:02:50 deraadt Exp $ +# $OpenBSD: list,v 1.12 2001/06/23 19:44:55 deraadt Exp $ # $NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $ SRCDIRS distrib/special @@ -26,6 +26,7 @@ LINK instbin bin/ksh bin/sh LINK instbin bin/stty LINK instbin bin/sleep LINK instbin bin/sync +LINK instbin sbin/dmesg LINK instbin sbin/fsck_ffs sbin/fsck LINK instbin sbin/reboot sbin/halt LINK instbin sbin/ifconfig @@ -44,7 +45,6 @@ LINK instbin sbin/umount SYMLINK ../../instbin usr/bin/ftp SYMLINK ../../instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat SYMLINK ../../instbin usr/bin/sed -#SYMLINK ../../instbin usr/bin/build usr/bin/vi ARGVLINK ksh -sh diff --git a/distrib/ramdisk/mtree.conf b/distrib/ramdisk/mtree.conf index db22942c3ba..f17d2174456 100644 --- a/distrib/ramdisk/mtree.conf +++ b/distrib/ramdisk/mtree.conf @@ -1,4 +1,4 @@ -# $OpenBSD: mtree.conf,v 1.3 1998/09/21 23:23:00 deraadt Exp $ +# $OpenBSD: mtree.conf,v 1.4 2001/06/23 19:44:55 deraadt Exp $ # $NetBSD: mtree.conf,v 1.1.4.2 1996/07/15 06:29:38 leo Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -20,11 +20,6 @@ etc # ./etc .. -# ./kern -kern -# ./kern -.. - # ./mnt mnt # ./mnt diff --git a/distrib/simpleroot/Makefile b/distrib/simpleroot/Makefile index 5ea8158cd3b..e3298576cb9 100644 --- a/distrib/simpleroot/Makefile +++ b/distrib/simpleroot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 1998/06/27 20:52:12 todd Exp $ +# $OpenBSD: Makefile,v 1.14 2001/06/23 19:44:56 deraadt Exp $ REV= ${OSrev} @@ -46,8 +46,8 @@ all: chmod 755 ${MOUNT_POINT}/install sed "/^VERSION=/s/=.*/=${REV}/" < ${.CURDIR}/install.sub \ > ${MOUNT_POINT}/install.sub - cp ${.CURDIR}/../${MACHINE}/install.md ${MOUNT_POINT}/install.md - mkdir -p ${MOUNT_POINT}/kern + sed -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" \ + ${.CURDIR}/../${MACHINE}/install.md > ${MOUNT_POINT}/install.md mkdir -p ${MOUNT_POINT}/mnt2 .if exists(/sbin/ldconfig) /usr/sbin/chroot ${MOUNT_POINT} /sbin/ldconfig diff --git a/distrib/simpleroot/install.sh b/distrib/simpleroot/install.sh index f6e3136ad55..0f9c11829a8 100644 --- a/distrib/simpleroot/install.sh +++ b/distrib/simpleroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.3 1997/05/15 12:31:15 graichen Exp $ +# $OpenBSD: install.sh,v 1.4 2001/06/23 19:44:57 deraadt Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -63,7 +63,6 @@ MODE="install" # md_congrats() - display friendly message # md_native_fstype() - native filesystem type for disk installs # md_native_fsopts() - native filesystem options for disk installs -# md_makerootwritable() - make root writable (at least /tmp) # test if / is read write echo "" > /tmp/test_read_write_root 2> /dev/null @@ -135,18 +134,7 @@ md_set_term # Get timezone info get_timezone -# Make sure we can write files (at least in /tmp) -# This might make an MFS mount on /tmp, or it may -# just re-mount the root with read-write enabled. -if [ "`df /`" = "`df /tmp`" ]; then - md_makerootwritable -fi - if [ "`df /`" = "`df /mnt`" ]; then -# TTT -# # Install the shadowed disktab file; lets us write to it for temporary -# # purposes without mounting the miniroot read-write. -# cp /etc/disktab /tmp/disktab.shadow while [ "X${ROOTDISK}" = "X" ]; do getrootdisk @@ -530,8 +518,6 @@ else esac fi -umount /kern -rmdir /kern rmdir /mnt2 unmount_fs /tmp/fstab.shadow diff --git a/distrib/sparc/install.md b/distrib/sparc/install.md index 19a1f4ba189..3ab53498cbc 100644 --- a/distrib/sparc/install.md +++ b/distrib/sparc/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.33 2001/01/25 19:18:42 deraadt Exp $ +# $OpenBSD: install.md,v 1.34 2001/06/23 19:44:57 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -42,21 +42,8 @@ # # Machine-dependent install sets -HOSTNAME=/kern/hostname MDSETS="kernel xbin xman xinc xcon" - -# an alias for hostname(1) -hostname() { - if [ -x /bin/hostname ]; then - /bin/hostname $1 - else - if [ -z "$1" ]; then - cat $HOSTNAME - else - echo $1 > $HOSTNAME - fi - fi -} +ARCH=ARCH md_set_term() { test -n "$TERM" && return @@ -66,30 +53,10 @@ md_set_term() { export TERM } -md_makerootwritable() { - # Was: do_mfs_mount "/tmp" "2048" - # /tmp is the mount point - # 2048 is the size in DEV_BIZE blocks - - if [ ! -w /tmp ]; then - umount /tmp > /dev/null 2>&1 - if ! mount_mfs -s 2048 swap /tmp ; then - cat << __EOT - -FATAL ERROR: Can't mount the memory filesystem. - -__EOT - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - fi -} - md_get_msgbuf() { - # Only want to see one boot's worth of info - sed -n -f /dev/stdin /kern/msgbuf <<- OOF + # Only want to see one boot's worth of info + dmesg > /tmp/msgbuf + sed -n -f /dev/stdin /tmp/msgbuf <<- OOF /^OpenBSD /h /^OpenBSD /!H \${ @@ -99,10 +66,6 @@ md_get_msgbuf() { OOF } -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices md_get_msgbuf | sed -n -e '/^sd[0-9] /{s/ .*//;p;}' \ diff --git a/distrib/sparc/miniroot/dot.profile b/distrib/sparc/miniroot/dot.profile index ba7622090bd..fbbef7885b1 100644 --- a/distrib/sparc/miniroot/dot.profile +++ b/distrib/sparc/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.14 2000/10/25 16:38:13 millert Exp $ +# $OpenBSD: dot.profile,v 1.15 2001/06/23 19:44:58 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -51,9 +50,7 @@ TERM=sun if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern - mount_ffs -o update /kern/rootdev / + mount_ffs -o update /dev/rd0a / # set up some sane defaults echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T' diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list index 78e62540a8f..51def540a50 100644 --- a/distrib/sparc/miniroot/list +++ b/distrib/sparc/miniroot/list @@ -1,9 +1,8 @@ -# $OpenBSD: list,v 1.13 1999/11/11 02:41:45 deraadt Exp $ +# $OpenBSD: list,v 1.14 2001/06/23 19:44:58 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Sparc extra's LINK instbin sbin/disklabel -LINK instbin sbin/dmesg LINK instbin sbin/dhclient SYMLINK ../../instbin usr/bin/basename @@ -52,6 +51,6 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md COPY ${DESTDIR}/usr/mdec/boot boot SPECIAL sync; ${DESTDIR}/usr/mdec/binstall -v ffs ${TARGDIR} diff --git a/distrib/sparc/ramdisk/dot.profile b/distrib/sparc/ramdisk/dot.profile index 3041a5dcf62..69fcde362ce 100644 --- a/distrib/sparc/ramdisk/dot.profile +++ b/distrib/sparc/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.9 2000/10/25 16:38:14 millert Exp $ +# $OpenBSD: dot.profile,v 1.10 2001/06/23 19:44:58 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -51,8 +50,6 @@ TERM=sun if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern mount_ffs -o update /dev/rd0a / # set up some sane defaults diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list index 9c428fd4616..d28a11c607f 100644 --- a/distrib/sparc/ramdisk/list +++ b/distrib/sparc/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.10 1998/12/21 03:31:50 millert Exp $ +# $OpenBSD: list,v 1.11 2001/06/23 19:44:58 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # Sparc extra's @@ -36,4 +36,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/../ramdisk/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md diff --git a/distrib/sun3/install.md b/distrib/sun3/install.md index eacc2d89fd4..778274e1314 100644 --- a/distrib/sun3/install.md +++ b/distrib/sun3/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.1 2000/06/20 21:29:03 miod Exp $ +# $OpenBSD: install.md,v 1.2 2001/06/23 19:44:59 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -41,22 +41,8 @@ # # Machine-dependent install sets -MSGBUF=/kern/msgbuf -HOSTNAME=/kern/hostname MDSETS="kernel" - -# an alias for hostname(1) -hostname() { - if [ -x /bin/hostname ]; then - /bin/hostname $1 - else - if [ -z "$1" ]; then - cat $HOSTNAME - else - echo $1 > $HOSTNAME - fi - fi -} +ARCH=ARCH md_set_term() { test -n "$TERM" && return @@ -66,30 +52,10 @@ md_set_term() { export TERM } -md_makerootwritable() { - # Was: do_mfs_mount "/tmp" "2048" - # /tmp is the mount point - # 2048 is the size in DEV_BIZE blocks - - if [ ! -w /tmp ]; then - umount /tmp > /dev/null 2>&1 - if ! mount_mfs -s 2048 swap /tmp ; then - cat << __EOT - -FATAL ERROR: Can't mount the memory filesystem. - -__EOT - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - fi -} - md_get_msgbuf() { - # Only want to see one boot's worth of info - sed -n -f /dev/stdin $MSGBUF <<- OOF + # Only want to see one boot's worth of info + dmesg > /tmp/msgbuf + sed -n -f /dev/stdin /tmp/msgbuf <<- OOF /^OpenBSD /h /^OpenBSD /!H \${ @@ -99,10 +65,6 @@ md_get_msgbuf() { OOF } -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices md_get_msgbuf | sed -n -e '/^sd[0-9] /{s/ .*//;p;}' \ diff --git a/distrib/sun3/miniroot/dot.profile b/distrib/sun3/miniroot/dot.profile index e2cae145379..125008c2373 100644 --- a/distrib/sun3/miniroot/dot.profile +++ b/distrib/sun3/miniroot/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.2 2000/10/25 16:38:14 millert Exp $ +# $OpenBSD: dot.profile,v 1.3 2001/06/23 19:45:00 deraadt Exp $ # # Copyright (c) 1995 Jason R. Thorpe # Copyright (c) 1994 Christopher G. Demetriou @@ -36,7 +36,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -50,9 +49,7 @@ TERM=sun if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern - mount_ffs -o update /kern/rootdev / + mount_ffs -o update /dev/rd0a / # set up some sane defaults echo 'erase ^?, werase ^W, kill ^U, intr ^C, status ^T' diff --git a/distrib/sun3/miniroot/list b/distrib/sun3/miniroot/list index eb20e213ac8..bca9da60c26 100644 --- a/distrib/sun3/miniroot/list +++ b/distrib/sun3/miniroot/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2000/07/13 01:41:45 miod Exp $ +# $OpenBSD: list,v 1.3 2001/06/23 19:45:00 deraadt Exp $ # Sun3 extras LINK instbin sbin/disklabel @@ -51,6 +51,6 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch`" < ${CURDIR}/../common/install.md > install.md COPY ${DESTDIR}/usr/mdec/ufsboot boot SPECIAL sync; ${DESTDIR}/usr/mdec/installboot ${TARGDIR}/boot ${DESTDIR}/usr/mdec/bootxx /dev/rsvnd0c diff --git a/distrib/sun3/ramdisk/dot.profile b/distrib/sun3/ramdisk/dot.profile index cb2c5ab611e..6ce0b67c4bc 100644 --- a/distrib/sun3/ramdisk/dot.profile +++ b/distrib/sun3/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.3 2000/10/25 16:38:14 millert Exp $ +# $OpenBSD: dot.profile,v 1.4 2001/06/23 19:45:01 deraadt Exp $ # # Copyright (c) 1995 Jason R. Thorpe # Copyright (c) 1994 Christopher G. Demetriou @@ -36,7 +36,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -50,8 +49,6 @@ TERM=sun if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern mount_ffs -o update /dev/rd0a / # set up some sane defaults diff --git a/distrib/sun3/ramdisk/list b/distrib/sun3/ramdisk/list index bc314cd0cb6..dad8f698f01 100644 --- a/distrib/sun3/ramdisk/list +++ b/distrib/sun3/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.4 2000/07/13 01:41:49 miod Exp $ +# $OpenBSD: list,v 1.5 2001/06/23 19:45:01 deraadt Exp $ # Sun3 extra's LINK instbin sbin/disklabel @@ -35,4 +35,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/../ramdisk/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md diff --git a/distrib/vax/install.md b/distrib/vax/install.md index c1ad6aca15e..29dbbd5c94e 100644 --- a/distrib/vax/install.md +++ b/distrib/vax/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.1 2001/02/24 10:55:02 hugh Exp $ +# $OpenBSD: install.md,v 1.2 2001/06/23 19:45:01 deraadt Exp $ # $NetBSD: install.md,v 1.3.2.5 1996/08/26 15:45:28 gwr Exp $ # # @@ -42,22 +42,8 @@ # # Machine-dependent install sets -MSGBUF=/kern/msgbuf -HOSTNAME=/kern/hostname MDSETS="kernel" - -# an alias for hostname(1) -hostname() { - if [ -x /bin/hostname ]; then - /bin/hostname $1 - else - if [ -z "$1" ]; then - cat $HOSTNAME - else - echo $1 > $HOSTNAME - fi - fi -} +ARCH=ARCH md_set_term() { test -n "$TERM" && return @@ -67,30 +53,10 @@ md_set_term() { export TERM } -md_makerootwritable() { - # Was: do_mfs_mount "/tmp" "2048" - # /tmp is the mount point - # 2048 is the size in DEV_BIZE blocks - - if [ ! -w /tmp ]; then - umount /tmp > /dev/null 2>&1 - if ! mount_mfs -s 2048 swap /tmp ; then - cat << __EOT - -FATAL ERROR: Can't mount the memory filesystem. - -__EOT - exit - fi - - # Bleh. Give mount_mfs a chance to DTRT. - sleep 2 - fi -} - md_get_msgbuf() { - # Only want to see one boot's worth of info - sed -n -f /dev/stdin $MSGBUF <<- OOF + # Only want to see one boot's worth of info + dmesg > /tmp/msgbuf + sed -n -f /dev/stdin /tmp/msgbuf <<- OOF /^OpenBSD /h /^OpenBSD /!H \${ @@ -100,10 +66,6 @@ md_get_msgbuf() { OOF } -md_machine_arch() { - cat /kern/machine -} - md_get_diskdevs() { # return available disk devices md_get_msgbuf | sed -n -e '/^sd[0-9] /{s/ .*//;p;}' \ diff --git a/distrib/vax/ramdisk/dot.profile b/distrib/vax/ramdisk/dot.profile index bb4f8bacd15..b898df54184 100644 --- a/distrib/vax/ramdisk/dot.profile +++ b/distrib/vax/ramdisk/dot.profile @@ -1,4 +1,4 @@ -# $OpenBSD: dot.profile,v 1.2 2001/03/16 04:50:36 hugh Exp $ +# $OpenBSD: dot.profile,v 1.3 2001/06/23 19:45:02 deraadt Exp $ # $NetBSD: dot.profile,v 1.1 1995/12/18 22:54:43 pk Exp $ # # Copyright (c) 1995 Jason R. Thorpe @@ -37,7 +37,6 @@ export HISTFILE=/.sh_history umask 022 set -o emacs # emacs-style command line editing -alias dmesg="cat /kern/msgbuf" # XXX # the TERM/EDITOR stuff is really well enough parameterized to be moved @@ -51,9 +50,7 @@ TERM=vt100 if [ "X${DONEPROFILE}" = "X" ]; then DONEPROFILE=YES - # mount kernfs and re-mount the boot media (perhaps r/w) - mount_kernfs /kern /kern - mount_ffs -o update /kern/rootdev / + mount_ffs -o update /dev/rd0a / # set up some sane defaults echo 'erase ^H, werase ^W, kill ^U, intr ^C' diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list index 5e8f58a0ee8..e1c3bf136a1 100644 --- a/distrib/vax/ramdisk/list +++ b/distrib/vax/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.2 2001/03/16 04:50:36 hugh Exp $ +# $OpenBSD: list,v 1.3 2001/06/23 19:45:03 deraadt Exp $ # $NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $ # extras @@ -41,4 +41,4 @@ SYMLINK /tmp/hosts etc/hosts # and the installation tools COPY ${ARCHDIR}/../miniroot/dot.profile .profile -COPY ${ARCHDIR}/../install.md install.md +SPECIAL sed -e '/^#[ ].*$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -s`/" < ${CURDIR}/../common/install.md > install.md |