1.1 --- a/user-do Tue Jul 12 00:47:20 2011 +0200
1.2 +++ b/user-do Wed Jul 13 00:43:11 2011 +0200
1.3 @@ -1,5 +1,4 @@
1.4 #!/bin/sh
1.5 -# Usage: user-do [ --root [ --dev ] ] [ <command and options> ]
1.6
1.7 # Configuration:
1.8 if [ -e userinstall-defaults ]; then
1.9 @@ -7,39 +6,18 @@
1.10 elif [ -e /etc/default/userinstall ]; then
1.11 . /etc/default/userinstall
1.12 else
1.13 - echo "No defaults found for userinstall."
1.14 + echo "No defaults found for userinstall." 1>&2
1.15 exit 1
1.16 fi
1.17
1.18 -if [ "$1" = '--root' ]; then
1.19 +THISDIR=`dirname "$0"`
1.20 +
1.21 +if [ "$1" = '--help' ]; then
1.22 + echo "Usage: `basename $0` [ --root [ --dev ] ] [ <command and options> ]"
1.23 + exit 1
1.24 +elif [ "$1" = '--root' ]; then
1.25 shift 1
1.26 - mount -o bind /proc "$PACKAGEROOT/proc"
1.27 - mount -o bind /sys "$PACKAGEROOT/sys"
1.28 - if [ "$1" = '--dev' ]; then
1.29 - DEV=$1
1.30 - shift 1
1.31 - if [ -e "$PACKAGEROOT/dev.orig" ]; then
1.32 - echo "Devices may already be defined for the installation."
1.33 - else
1.34 - if [ -e "$PACKAGEROOT/dev" ]; then
1.35 - mv "$PACKAGEROOT/dev" "$PACKAGEROOT/dev.orig"
1.36 - fi
1.37 - if [ ! -e "$PACKAGEROOT/dev" ]; then
1.38 - mkdir "$PACKAGEROOT/dev"
1.39 - fi
1.40 - mount -o bind /dev "$PACKAGEROOT/dev"
1.41 - fi
1.42 - fi
1.43 - chroot "$PACKAGEROOT" $*
1.44 - umount "$PACKAGEROOT/proc"
1.45 - umount "$PACKAGEROOT/sys"
1.46 - if [ "$DEV" ]; then
1.47 - umount "$PACKAGEROOT/dev"
1.48 - rmdir "$PACKAGEROOT/dev"
1.49 - if [ -e "$PACKAGEROOT/dev.orig" ]; then
1.50 - mv "$PACKAGEROOT/dev.orig" "$PACKAGEROOT/dev"
1.51 - fi
1.52 - fi
1.53 + sudo "$THISDIR/user-do-root" $*
1.54 else
1.55 fakeroot fakechroot $FAKECHROOT_OPTIONS chroot "$PACKAGEROOT" $*
1.56 fi