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/amd64 | |
| 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/amd64')
| -rw-r--r-- | distrib/amd64/common/install.md | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/distrib/amd64/common/install.md b/distrib/amd64/common/install.md index 1d912e8d398..ccf6bce9db0 100644 --- a/distrib/amd64/common/install.md +++ b/distrib/amd64/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.25 2010/08/08 21:06:06 krw Exp $ +# $OpenBSD: install.md,v 1.26 2011/01/03 00:36:46 deraadt Exp $ # # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -39,11 +39,10 @@ NCPU=$(sysctl -n hw.ncpufound) ((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } md_installboot() { - cd /mnt - 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 cp /usr/mdec/boot /mnt/boot |