projects
/
grml-scripts-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update changelog.
[grml-scripts-core.git]
/
usr_sbin
/
grml-chroot
diff --git
a/usr_sbin/grml-chroot
b/usr_sbin/grml-chroot
index
4277c34
..
a53412c
100755
(executable)
--- a/
usr_sbin/grml-chroot
+++ b/
usr_sbin/grml-chroot
@@
-9,7
+9,6
@@
PROG_NAME_=$(basename $0)
DEST_=""
MOUNTED_="" # all mounted destinations
PROG_NAME_=$(basename $0)
DEST_=""
MOUNTED_="" # all mounted destinations
-COMMAND_="" # command to start in chroot
function die
function die
@@
-23,7
+22,7
@@
function printUsage
cat <<EOT
Usage: "$PROG_NAME_" NEWROOT [COMMAND....]
cat <<EOT
Usage: "$PROG_NAME_" NEWROOT [COMMAND....]
-$PROG_NAME_
_
is a chroot wrapper with proc/sys/pts/dev filesystem handling
+$PROG_NAME_ is a chroot wrapper with proc/sys/pts/dev filesystem handling
EOT
}
EOT
}
@@
-75,11
+74,11
@@
done
shift $(($OPTIND - 1))
if (( $# < 1 )); then
shift $(($OPTIND - 1))
if (( $# < 1 )); then
+ printUsage
die "Wrong number of arguments."
fi
die "Wrong number of arguments."
fi
-DEST_="$1"
-COMMAND_="${2}"
+DEST_="$1"; shift
if [ ! -d "$DEST_" ]; then
die "Target chroot does not exist: $DEST_"
if [ ! -d "$DEST_" ]; then
die "Target chroot does not exist: $DEST_"
@@
-89,6
+88,10
@@
fi
mountit "proc" "proc"
mountit "sysfs" "sys"
mountit "/dev" "dev" "--bind"
mountit "proc" "proc"
mountit "sysfs" "sys"
mountit "/dev" "dev" "--bind"
-chroot "$DEST_" $COMMAND_
+if (( $# < 1 )); then
+ chroot "$DEST_"
+else
+ chroot "$DEST_" "$@"
+fi
umount_all
umount_all