From 90e7e39d5457beb48b4b06ea409b938e12cc15d0 Mon Sep 17 00:00:00 2001 From: Mathieu Parent Date: Thu, 26 Mar 2009 23:30:01 +0100 Subject: [PATCH] Replaced ubuntu by debian, as ubuntu is debian-based. --- config/ctdb.init | 6 +++--- config/ctdb.sysconfig | 2 +- config/events.d/41.httpd | 2 +- config/events.d/50.samba | 2 +- config/functions | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/ctdb.init b/config/ctdb.init index f2c3e48..d1fdda5 100755 --- a/config/ctdb.init +++ b/config/ctdb.init @@ -168,7 +168,7 @@ running() { start_server() { # check all persistent databases that they look ok case $init_style in - ubuntu) + debian) PERSISTENT_DB_DIR="/var/lib/ctdb/persistent" ;; *) @@ -202,7 +202,7 @@ start_server() { echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ctdb || RETVAL=1 ;; - ubuntu) + debian) start-stop-daemon --start --quiet --background --exec /usr/sbin/ctdbd -- $CTDB_OPTIONS RETVAL=$? ;; @@ -228,7 +228,7 @@ stop_server() { # very crude method sleep 2 pkill -9 -f valgrind - else if [ "$init_style" = "ubuntu" ]; then + else if [ "$init_style" = "debian" ]; then start-stop-daemon --stop --quiet --exec /usr/sbin/ctdbd RETVAL=$? fi diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig index ef3b0dc..baa89c6 100644 --- a/config/ctdb.sysconfig +++ b/config/ctdb.sysconfig @@ -68,7 +68,7 @@ # 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/41.httpd b/config/events.d/41.httpd index fae9f47..c5ea8de 100755 --- 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 e0e2ad7..64bbf0d 100755 --- 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 2f0b01f..0f65135 100644 --- 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 -- 1.6.2