test-imagex-ntfs: fix msg, mount without allow_other
authorEric Biggers <ebiggers3@gmail.com>
Sat, 22 Sep 2012 15:16:35 +0000 (10:16 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Sat, 22 Sep 2012 15:16:35 +0000 (10:16 -0500)
tests/test-imagex-capture_and_apply
tests/test-imagex-ntfs

index 5f1bc017e3a840ed8c1031a49ba82fe4d4e68de6..c15d8ab825995ca6afc8ab8276a05c74b020e2f0 100755 (executable)
@@ -114,19 +114,23 @@ do_test() {
        done
 }
 
-msg() {
+__msg() {
        echo "--------------------------------------------------------------------"
-       echo "Testing image capture and application of directory containing $1"
+       echo $1
        echo "--------------------------------------------------------------------"
 }
 
+msg() {
+       __msg "Testing image capture and application of directory containing $1"
+}
+
 cleanup
 init
 
 . $srcdir/tests/common_tests.sh
 
 # Make sure exclusion list works
-msg "Testing default capture configuration file"
+__msg "Testing default capture configuration file"
 touch in.dir/hiberfil.sys
 mkdir -p "in.dir/System Volume Information/subdir"
 imagex capture in.dir test.wim
index dbfd10a7342cb77e7ae83f1e23f000dc621e4367..412ac20a10e3383e49d17c69788b7dd7ae6934e0 100755 (executable)
@@ -31,7 +31,12 @@ do_unmount() {
 
 __do_mount() {
        options="$3"
-       if ! ntfs-3g ${options:+-o $options} $1 $2; then
+       if [ -z "$options" ]; then
+               options="no_def_opts,silent"
+       else
+               options="$options,no_def_opts,silent"
+       fi
+       if ! ntfs-3g -o $options $1 $2; then
                error "Could not mount NTFS volume \"$1\" on \"$2\".  Make sure ntfs-3g is installed."
        fi
 }