diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-05-14 21:22:08 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-05-14 21:22:08 +0000 |
| commit | 4a7cd4f64c88c3f70a0f3c85814b8bfe1b1769c1 (patch) | |
| tree | a037f34979ea77bfac14a2313dfcb6bd0d5ea472 /distrib/miniroot | |
| parent | d658f90adccc17f79bb2d7d2da45f97b8a678fd6 (diff) | |
md_machine_arch must be done after md_makerootwritable (for /kern)
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sh | 8 | ||||
| -rw-r--r-- | distrib/miniroot/upgrade.sh | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/distrib/miniroot/install.sh b/distrib/miniroot/install.sh index fe82c8b5ea2..b84080da5fa 100644 --- a/distrib/miniroot/install.sh +++ b/distrib/miniroot/install.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: install.sh,v 1.10 1997/05/14 21:07:59 millert Exp $ +# $OpenBSD: install.sh,v 1.11 1997/05/14 21:22:06 millert Exp $ # $NetBSD: install.sh,v 1.5.2.8 1996/08/27 18:15:05 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -101,9 +101,6 @@ esac # XXX Work around vnode aliasing bug (thanks for the tip, Chris...) ls -l /dev > /dev/null 2>&1 -# Get the machine architecture -ARCH=`md_machine_arch` - # Deal with terminal issues md_set_term @@ -117,6 +114,9 @@ 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/upgrade.sh b/distrib/miniroot/upgrade.sh index aa04879009e..4204e30b02d 100644 --- a/distrib/miniroot/upgrade.sh +++ b/distrib/miniroot/upgrade.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $OpenBSD: upgrade.sh,v 1.6 1997/05/13 18:22:14 millert Exp $ +# $OpenBSD: upgrade.sh,v 1.7 1997/05/14 21:22:07 millert Exp $ # $NetBSD: upgrade.sh,v 1.2.4.5 1996/08/27 18:15:08 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -59,6 +59,7 @@ 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 @@ -94,6 +95,9 @@ ls -l /dev > /dev/null 2>&1 # 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 |