Rename the CTDB_INIT_STYLE "ubuntu" to "debian" - this is where it comes from.

Micheal

diff --git a/config/ctdb.init b/config/ctdb.init
index 0e6d5fdaf8dc5bf3d3d2c3c066c079553da473da..554649bc1d96a3f75b688e70dcf5c5a1b4cb55f2 100755 (executable)
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -162,7 +162,7 @@ start() {
            echo
            [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1
            ;;
-       ubuntu)
+       debian)
            start-stop-daemon --start --quiet --background \
                --exec $ctdbd -- $CTDB_OPTIONS
            RETVAL=$?

diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index c5731e97779edc1fd10b2a127401a1e6340a8248..004ada32c22c6263ffa415cda68f22728a7425a7 100644 (file)
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -62,7 +62,7 @@ CTDB_RECOVERY_LOCK="/some/place/on/shared/storage"
 # should ctdb manage starting/stopping the Apache web server httpd?
 # CTDB_MANAGES_HTTPD
 
-# The init style (redhat/suse/ubuntu...) is usually auto-detected.
+# The init style (redhat/suse/debian...) is usually auto-detected.
 # The names of init scripts of services managed by CTDB are set
 # based on the detected init style. You can override the init style
 # auto-detection here to explicitly use a scheme. This might be

diff --git a/config/events.d/31.clamd b/config/events.d/31.clamd
index 11238b7465a3871a42e6c5332b490984c439a01b..842096a9924f96e3f4b81d6cdd2c7d3396f4b61b 100644 (file)
--- a/config/events.d/31.clamd
+++ b/config/events.d/31.clamd
@@ -15,7 +15,7 @@ case $CTDB_INIT_STYLE in
                CTDB_SERVICE_CLAMD="clamav"
                CTDB_CONFIG_CLAMD="clamav"
                ;;
-       ubuntu)
+       debian)
                CTDB_SERVICE_CLAMD="clamav"
                CTDB_CONFIG_CLAMD="clamav"
                ;;

diff --git a/config/events.d/41.httpd b/config/events.d/41.httpd
index 4d8c44008bbd8889acf1692c9545f6466b68315e..d6e7f9923584693415d387b961aac905e060786f 100755 (executable)
--- a/config/events.d/41.httpd
+++ b/config/events.d/41.httpd
@@ -15,7 +15,7 @@ case $CTDB_INIT_STYLE in
                CTDB_SERVICE_HTTP="apache2"
                CTDB_CONFIG_HTTP="apache2"
                ;;
-       ubuntu)
+       debian)
                CTDB_SERVICE_HTTP="apache2"
                CTDB_CONFIG_HTTP="apache2"
                ;;

diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index b413a13a3eb04a1873c6216a293d44c9e886b8af..814fb9aec45df487589e0af149ccdd03c262d8a7 100755 (executable)
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -15,7 +15,7 @@ case $CTDB_INIT_STYLE in
                CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-nmb}
                CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}
                ;;
-       ubuntu)
+       debian)
                CTDB_SERVICE_SMB=${CTDB_SERVICE_SMB:-samba}
                CTDB_SERVICE_NMB=${CTDB_SERVICE_NMB:-""}
                CTDB_SERVICE_WINBIND=${CTDB_SERVICE_WINBIND:-winbind}

diff --git a/config/functions b/config/functions
index a6b46883cac275a391811d85b9f9f8aacc9d470e..8d18828f52aa98c67779eee2f4c1fe028d54e985 100644 (file)
--- a/config/functions
+++ b/config/functions
@@ -22,7 +22,7 @@ detect_init_style() {
     if [ -x /sbin/startproc ]; then
         CTDB_INIT_STYLE="suse"
     elif [ -x /sbin/start-stop-daemon ]; then
-        CTDB_INIT_STYLE="ubuntu"
+        CTDB_INIT_STYLE="debian"
     else
         CTDB_INIT_STYLE="redhat"
     fi