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
__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
}