Logoj0ke.net Open Build Service > Projects > GFS > cluster2 > cluster-rgmanager-init.patch
Sign Up | Log In

File cluster-rgmanager-init.patch of Package cluster2 (Revision 26)

Currently displaying revision 26, show latest

x
 
1
--- rgmanager/init.d/rgmanager.in.orig  2008-12-30 21:56:29.000000000 +0100
2
+++ rgmanager/init.d/rgmanager.in   2009-03-30 10:06:25.000000000 +0200
3
@@ -5,19 +5,28 @@
4
 
5
 ### BEGIN INIT INFO
6
 # Provides:        rgmanager
7
-# Required-Start:  cman
8
-# Required-Stop:   cman
9
-# Default-Start:
10
+# Required-Start:  $network cman
11
+# Required-Stop:   cman
12
+# Default-Start:   2 3 5
13
 # Default-Stop:
14
 # Short-Description:   Starts and stops Red Hat Service (resource group) Manager
15
 # Description:     Starts and stops Red Hat Service (resource group) Manager
16
 ### END INIT INFO
17
 
18
 # Source function library
19
-. /etc/init.d/functions
20
+. /etc/rc.status
21
 
22
-# Grab the network config file
23
-. /etc/sysconfig/network
24
+# Shell functions sourced from /etc/rc.status:
25
+#      rc_check         check and set local and overall rc status
26
+#      rc_status        check and set local and overall rc status
27
+#      rc_status -v     ditto but be verbose in local rc status
28
+#      rc_status -v -r  ditto and clear the local rc status
29
+#      rc_failed        set local and overall rc status to failed
30
+#      rc_reset         clear local rc status (overall remains)
31
+#      rc_exit          exit appropriate to overall rc status
32
+
33
+# First reset status of this service
34
+rc_reset
35
 
36
 # Grab cluster start config if it exists
37
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
38
@@ -66,15 +75,11 @@
39
            while [ -n "`pidof $RGMGRD`" ]; do
40
                sleep 1
41
            done
42
-           echo_success
43
-           echo
44
+           rc_status
45
        else
46
            echo $"Services are stopped."
47
        fi
48
 
49
-       # Ensure all NFS rmtab daemons are dead.
50
-       killall $RMTABD &> /dev/null
51
-       
52
        rm -f /var/run/$RGMGRD.pid
53
 
54
        return 0
55
@@ -94,15 +99,13 @@
56
        [ -f "$CFG_FILE" ] || exit 0
57
 
58
        echo -n $"Starting $ID: "
59
-       daemon $RGMGRD $RGMGR_OPTS
60
-       ret=$?
61
-       echo
62
+       startproc $RGMGRD $RGMGR_OPTS
63
+       rc_status
64
 
65
        # To be consistent...
66
        if [ $ret -eq 0 ]; then
67
            touch /var/lock/subsys/rgmanager
68
        fi
69
-       exit $ret
70
        ;;
71
 
72
    restart)
73
@@ -125,15 +128,12 @@
74
        clulog -p $LOG_NOTICE "Reloading Resource Configuration."
75
        echo -n $"Reloading Resource Configuration: "
76
        killproc $RGMGRD -HUP
77
-       rv=$?
78
-       echo
79
-
80
-       exit $rv
81
+       rc_status
82
        ;;
83
 
84
    status)
85
-       status $RGMGRD
86
-       exit $?
87
+       checkproc $RGMGRD
88
+       rc_status
89
        ;;
90
 
91
    stop)
92
@@ -151,4 +151,4 @@
93
        ;;
94
 esac
95
 
96
-exit 0
97
+rc_exit
98