Test suite: CTDB_SAMBA_SKIP_SHARE_CHECK test now uses _loadconfig().
authorMartin Schwenke <martin@meltin.net>
Tue, 31 Aug 2010 07:48:00 +0000 (17:48 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 3 Aug 2011 06:06:40 +0000 (16:06 +1000)
Signed-off-by: Martin Schwenke <martin@meltin.net>
tests/complex/02_ctdb_samba_skip_share_check.sh

index 4cb24d69d97fa39f6ffe808f88c7bc224469ea53..c7eadc6b11bb3387853abd9cdd094678d5623071 100755 (executable)
@@ -108,15 +108,9 @@ try_command_on_node $test_node "echo 'function testparm () { tp=\$(which testpar
 
 n="$rc_local_d/samba-skip-share-check"
 n_contents='loadconfig() {
-    name="$1"
-    if [ -f /etc/sysconfig/$name ]; then
-       . /etc/sysconfig/$name
-    elif [ -f /etc/default/$name ]; then
-       . /etc/default/$name
-    elif [ -f $CTDB_BASE/sysconfig/$name ]; then
-       . $CTDB_BASE/sysconfig/$name
-    fi
-    if [ "$name" = "ctdb" ] ; then
+    _loadconfig "$@"
+
+    if [ "$1" = "ctdb" ] ; then
         CTDB_SAMBA_SKIP_SHARE_CHECK=no
     fi
 }