diff options
Diffstat (limited to 'distrib/amiga')
| -rw-r--r-- | distrib/amiga/install.md | 30 | ||||
| -rw-r--r-- | distrib/amiga/miniroot/dot.profile | 7 | ||||
| -rw-r--r-- | distrib/amiga/miniroot/list | 4 | ||||
| -rw-r--r-- | distrib/amiga/ramdisk/dot.profile | 7 | ||||
| -rw-r--r-- | distrib/amiga/ramdisk/list | 3 |
5 files changed, 12 insertions, 39 deletions
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 |