projects / redhat-cluster-pve.git / blame
| Commit | Line | Data |
|---|---|---|
| d994ff01 DM |
1 | fix bug #112: we know that we run on debian |
| 2 | ||
| 3 | So we can simple remove those unreliable tests. | |
| 4 | ||
| 5 | Index: new/cman/init.d/cman.in | |
| 6 | =================================================================== | |
| 7 | --- new.orig/cman/init.d/cman.in 2012-08-14 07:26:22.000000000 +0200 | |
| 8 | +++ new/cman/init.d/cman.in 2012-08-14 07:28:35.000000000 +0200 | |
| 9 | @@ -63,17 +63,8 @@ | |
| 10 | return $statusrtrn | |
| 11 | } | |
| 12 | ||
| 13 | -# rpm based distros | |
| 14 | -if [ -d /etc/sysconfig ]; then | |
| 15 | - [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions | |
| 16 | - [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster | |
| 17 | - [ -f /etc/sysconfig/cman ] && . /etc/sysconfig/cman | |
| 18 | - [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/cman" | |
| 19 | - netmanager=NetworkManager | |
| 20 | -fi | |
| 21 | - | |
| 22 | # deb based distros | |
| 23 | -if [ ! -d /etc/sysconfig ]; then | |
| 24 | +if [ -d /etc/default ]; then | |
| 25 | [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve | |
| 26 | [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/cman" | |
| 27 | netmanager=network-manager | |
| 28 | Index: new/rgmanager/init.d/cpglockd.in | |
| 29 | =================================================================== | |
| 30 | --- new.orig/rgmanager/init.d/cpglockd.in 2012-08-14 07:26:47.000000000 +0200 | |
| 31 | +++ new/rgmanager/init.d/cpglockd.in 2012-08-14 07:27:23.000000000 +0200 | |
| 32 | @@ -42,15 +42,6 @@ | |
| 33 | return $statusrtrn | |
| 34 | } | |
| 35 | ||
| 36 | -# rpm based distros | |
| 37 | -if [ -d /etc/sysconfig ]; then | |
| 38 | - [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions | |
| 39 | - [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster | |
| 40 | - [ -f /etc/sysconfig/rgmanager ] && . /etc/sysconfig/rgmanager | |
| 41 | - [ -f /etc/sysconfig/cpglockd ] && . /etc/sysconfig/cpglockd | |
| 42 | - [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/cpglockd" | |
| 43 | -fi | |
| 44 | - | |
| 45 | # deb based distros | |
| 46 | if [ -d /etc/default ]; then | |
| 47 | [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve | |
| 48 | Index: new/rgmanager/init.d/rgmanager.in | |
| 49 | =================================================================== | |
| 50 | --- new.orig/rgmanager/init.d/rgmanager.in 2012-08-14 07:26:32.000000000 +0200 | |
| 51 | +++ new/rgmanager/init.d/rgmanager.in 2012-08-14 07:27:42.000000000 +0200 | |
| 52 | @@ -46,14 +46,6 @@ | |
| 53 | return $statusrtrn | |
| 54 | } | |
| 55 | ||
| 56 | -# rpm based distros | |
| 57 | -if [ -d /etc/sysconfig ]; then | |
| 58 | - [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions | |
| 59 | - [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster | |
| 60 | - [ -f /etc/sysconfig/rgmanager ] && . /etc/sysconfig/rgmanager | |
| 61 | - [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/rgmanager" | |
| 62 | -fi | |
| 63 | - | |
| 64 | # deb based distros | |
| 65 | if [ -d /etc/default ]; then | |
| 66 | [ -f /etc/default/redhat-cluster-pve ] && . /etc/default/redhat-cluster-pve |