Prepare for 2.5.

[febootstrap.git] / febootstrap-run.sh

diff --git a/febootstrap-run.sh b/febootstrap-run.sh
index d3a7603..6c5e9b9 100755 (executable)
--- a/febootstrap-run.sh
+++ b/febootstrap-run.sh
@@ -21,7 +21,7 @@
 unset CDPATH
 
 TEMP=`getopt \
-        -o g:i: \
+        -o '' \
         --long help,ro \
         -n febootstrap-run -- "$@"`
 if [ $? != 0 ]; then
@@ -63,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 \