summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-01-03 00:36:51 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-01-03 00:36:51 +0000
commit4f36400cbcb2c4caa07fa9700490d44049dadc97 (patch)
tree9e346d6b18af2322565b8f5baa9ef11a21ce4eea /distrib/miniroot/install.sub
parentb0360a6716b2d3f5796df5b2ba9aaa1946692d86 (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/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub18
1 files changed, 8 insertions, 10 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index a4b9efac596..e238b80d95e 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.631 2010/11/22 14:10:42 halex Exp $
+# $OpenBSD: install.sub,v 1.632 2011/01/03 00:36:50 deraadt Exp $
# $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1943,18 +1943,16 @@ finish_up() {
fi
echo -n "Making all device nodes..."
- (cd /mnt/dev
- sh MAKEDEV all
- # Make sure any devices we found during probe are created in the
- # installed system.
- for _dev in $(get_dkdevs) $(get_cddevs) $MTDEVS ; do
- sh MAKEDEV $_dev
- done
+ (cd /mnt/dev; sh MAKEDEV all
+ # Make sure any devices we found during probe are created in the
+ # installed system.
+ for _dev in $(get_dkdevs) $(get_cddevs) $MTDEVS ; do
+ sh MAKEDEV $_dev
+ done
)
echo "done."
- (cd /; md_installboot $ROOTDISK)
- cd /
+ md_installboot $ROOTDISK
populateusrlocal