X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=febootstrap-run.sh;h=6c5e9b90e51020595d7d9eba7e53c298c63739c4;hb=cf29103041581a1d71444f978ad4f6ad69b63033;hp=55df2335117a6042a13e36d6bc19449831d1db7e;hpb=9cf3beefb865ea3e1a4bbe570d632649540788cc;p=febootstrap.git

diff --git a/febootstrap-run.sh b/febootstrap-run.sh
index 55df233..6c5e9b9 100755
--- a/febootstrap-run.sh
+++ b/febootstrap-run.sh
@@ -18,8 +18,10 @@
 #
 # Written by Richard W.M. Jones <rjones@redhat.com>
 
+unset CDPATH
+
 TEMP=`getopt \
-        -o g:i: \
+        -o '' \
         --long help,ro \
         -n febootstrap-run -- "$@"`
 if [ $? != 0 ]; then
@@ -61,15 +63,24 @@ fi
 target="$1"
 shift
 
-if [ ! -f "$target"/fakeroot.log ]; then
+if [ $(id -u) -eq 0 ]; then
+    chroot "$target" "$@"
+    exit 0
+fi
+
+if [ $(id -u) -ne 0 -a ! -f "$target"/fakeroot.log ]; then
     echo "febootstrap-run: $target: not a root filesystem"
     exit 1
 fi
 
 if [ "$readonly" = "no" ]; then
-    fakeroot -i "$target"/fakeroot.log -s "$target"/fakeroot.log \
-	fakechroot -s \
+    if [ $(id -u) -ne 0 ]; then
+    	fakeroot -i "$target"/fakeroot.log -s "$target"/fakeroot.log \
+	    fakechroot -s \
+	    chroot "$target" "$@"
+    else
 	chroot "$target" "$@"
+    fi
 else
     fakeroot -i "$target"/fakeroot.log \
 	fakechroot -s \