changeset 939:abff74b958a1

Once again add /sbin:/usr/sbin to $PATH when mke2fs isn't in $PATH.
author Rob Landley <rob@landley.net>
date Sun, 20 Dec 2009 00:32:17 -0600
parents 609bc05b0d6a
children ae8c6e0831ee
files run-from-build.sh sources/toys/run-emulator.sh
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/run-from-build.sh	Sat Dec 19 00:51:16 2009 -0600
+++ b/run-from-build.sh	Sun Dec 20 00:32:17 2009 -0600
@@ -2,6 +2,8 @@
 
 # Grab cross compiler (for distcc) and run development environment.
 
-export PATH="$(pwd)/build/host:$(pwd)/build/cross-compiler-$1/bin:$PATH" &&
-cd build/system-image-"$1" &&
-./dev-environment.sh
+export PATH="$(pwd)/build/host:$(pwd)/build/cross-compiler-$1/bin:$PATH"
+
+# Run development environment.
+
+cd build/system-image-"$1" && ./dev-environment.sh
--- a/sources/toys/run-emulator.sh	Sat Dec 19 00:51:16 2009 -0600
+++ b/sources/toys/run-emulator.sh	Sun Dec 20 00:32:17 2009 -0600
@@ -24,6 +24,9 @@
 
     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/bin:$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"