diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-01-03 00:36:51 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-01-03 00:36:51 +0000 |
commit | 4f36400cbcb2c4caa07fa9700490d44049dadc97 (patch) | |
tree | 9e346d6b18af2322565b8f5baa9ef11a21ce4eea /distrib/sgi | |
parent | b0360a6716b2d3f5796df5b2ba9aaa1946692d86 (diff) |
reduce the amount of cd'ing in the install script, since it sucks
to change the environment that functions assume they run in. use
sub-shells or absolute paths when possible.
ok krw
Diffstat (limited to 'distrib/sgi')
-rw-r--r-- | distrib/sgi/ramdisk/install.md | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/distrib/sgi/ramdisk/install.md b/distrib/sgi/ramdisk/install.md index 41ead3e8234..27595d34b09 100644 --- a/distrib/sgi/ramdisk/install.md +++ b/distrib/sgi/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.23 2010/06/26 23:16:41 krw Exp $ +# $OpenBSD: install.md,v 1.24 2011/01/03 00:36:50 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -46,21 +46,20 @@ fi DEFAULTSETS=${MDSETS} md_installboot() { - cd /mnt - if [[ -f bsd.${IPARCH} ]]; then - mv bsd.${IPARCH} bsd + if [[ -f /mnt/bsd.${IPARCH} ]]; then + mv /mnt/bsd.${IPARCH} /mnt/bsd fi - if [[ -f bsd.mp.${IPARCH} ]]; then - mv bsd.mp.${IPARCH} bsd.mp + if [[ -f /mnt/bsd.mp.${IPARCH} ]]; then + mv /mnt/bsd.mp.${IPARCH} /mnt/bsd.mp fi - if [[ -f bsd.rd.${IPARCH} ]]; then - mv bsd.rd.${IPARCH} bsd.rd + if [[ -f /mnt/bsd.rd.${IPARCH} ]]; then + mv /mnt/bsd.rd.${IPARCH} /mnt/bsd.rd fi - if [[ -f bsd.mp ]] && ((NCPU > 1)); then + if [[ -f /mnt/bsd.mp ]] && ((NCPU > 1)); then echo "Multiprocessor machine; using bsd.mp instead of bsd." - mv bsd bsd.sp 2>/dev/null - mv bsd.mp bsd + mv /mnt/bsd /mnt/bsd.sp 2>/dev/null + mv /mnt/bsd.mp /mnt/bsd fi } |