diff options
Diffstat (limited to 'distrib/pmax')
| -rw-r--r-- | distrib/pmax/install.md | 59 | ||||
| -rw-r--r-- | distrib/pmax/ramdisk/dot.profile | 5 | ||||
| -rw-r--r-- | distrib/pmax/ramdisk/install.md | 60 | ||||
| -rw-r--r-- | distrib/pmax/ramdisk/list | 4 | ||||
| -rw-r--r-- | distrib/pmax/ramdisk/mtree.conf | 7 |
5 files changed, 14 insertions, 121 deletions
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 |