From 5a172ad88105a66fe903aeacc0f576d7ff2211cd Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 21 Oct 2012 11:19:51 -0500 Subject: [PATCH] test-imagex-ntfs: Error message if ntfs-3g not setuid root --- tests/test-imagex-ntfs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/test-imagex-ntfs b/tests/test-imagex-ntfs index 412ac20a..1012c344 100755 --- a/tests/test-imagex-ntfs +++ b/tests/test-imagex-ntfs @@ -37,7 +37,9 @@ __do_mount() { 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." + error "Could not mount NTFS volume \"$1\" on \"$2\"! Make sure ntfs-3g is "\ + "installed, and that you are either running the tests as root or have ntfs-3g "\ + "installed setuid root, so that we can mount a NTFS volume." fi } @@ -48,7 +50,7 @@ do_mount() { do_mkntfs() { if ! mkntfs --force --fast $1 &> /dev/null; then - error "Could not create NTFS volume on \"$1\". Make sure ntfs-3g / ntfsprogs are installed" + error "Could not create NTFS volume \"$1\"! Make sure ntfsprogs are installed." fi } @@ -73,7 +75,10 @@ cleanup() { error() { echo "****************************************************************" echo " Test failure " - echo $* + while [ $# -gt 0 ]; do + echo $1 + shift + done echo "****************************************************************" exit 1 } -- 2.43.0