changeset 636:d658f28e36ae

Move adding /sbin to $PATH to run-from-build.sh. My reasoning is that run-emulator.sh only needs mke2fs/tune2fs when called with --make-hdb, but run-from-build.sh needs either that or e2fsck all the time.
author Rob Landley <rob@landley.net>
date Wed, 18 Mar 2009 19:58:26 -0500
parents c796d3ebf179
children 6e24cfd8f258
files run-from-build.sh sources/toys/run-emulator.sh
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/run-from-build.sh	Wed Mar 18 15:32:24 2009 -0500
+++ b/run-from-build.sh	Wed Mar 18 19:58:26 2009 -0500
@@ -2,7 +2,10 @@
 
 SAVEPATH="$PATH"
 source sources/include.sh
-PATH="$SAVEPATH"
+
+# Some distros don't put /sbin:/usr/sbin in the $PATH for non-root users.
+export PATH="$SAVEPATH"
+[ -z "$(which mke2fs)" ] && PATH=/sbin:/usr/sbin:$PATH
 
 cd "${BUILD}/system-image-$ARCH_NAME" || exit 1
 
--- a/sources/toys/run-emulator.sh	Wed Mar 18 15:32:24 2009 -0500
+++ b/sources/toys/run-emulator.sh	Wed Mar 18 19:58:26 2009 -0500
@@ -97,9 +97,6 @@
 
   if [ ! -z "$HDBMEGS" ]
   then
-    # Some distros don't put /sbin:/usr/sbin in the $PATH for non-root users.
-    [ -z "$(which mke2fs)" ] && export PATH=/sbin:/usr/sbin:$PATH
-
     dd if=/dev/zero of="$HDB" bs=1024 seek=$[$HDBMEGS*1024-1] count=1 &&
     mke2fs -b 1024 -F "$HDB" -i 4096 &&
     tune2fs -j -c 0 -i 0 "$HDB"