|
 |
0fff429 |
From 6235108700462cc4b425ae7a697915f8147f46c3 Mon Sep 17 00:00:00 2001
|
|
|
0fff429 |
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
|
|
0fff429 |
Date: Fri, 13 Mar 2009 10:37:36 +0100
|
|
|
0fff429 |
Subject: [PATCH] s390-tools-1.8.0-initscript-fix
|
|
|
0fff429 |
|
|
|
0fff429 |
---
|
|
|
0fff429 |
etc/init.d/cpuplugd | 21 +++++++++++++++------
|
|
|
0fff429 |
etc/init.d/dumpconf | 9 ++++++---
|
|
|
0fff429 |
etc/init.d/mon_statd | 31 ++++++++++++++++++++++---------
|
|
|
0fff429 |
3 files changed, 43 insertions(+), 18 deletions(-)
|
|
|
0fff429 |
|
|
|
0fff429 |
diff --git a/etc/init.d/cpuplugd b/etc/init.d/cpuplugd
|
|
|
0fff429 |
index f8df06b..cbd5f90 100755
|
|
|
0fff429 |
--- a/etc/init.d/cpuplugd
|
|
|
0fff429 |
+++ b/etc/init.d/cpuplugd
|
|
|
0fff429 |
@@ -1,16 +1,18 @@
|
|
|
0fff429 |
#!/bin/bash
|
|
|
0fff429 |
### BEGIN INIT INFO
|
|
|
0fff429 |
# Provides: cpuplugd
|
|
|
0fff429 |
-# Required-Start: $remote_fs
|
|
|
0fff429 |
-# Required-Stop: $remote_fs
|
|
|
0fff429 |
-# Default-Start: 1 2 3 4 5
|
|
|
0fff429 |
-# Default-Stop: 0 6
|
|
|
0fff429 |
+# Required-Start: $local_fs $remote_fs
|
|
|
0fff429 |
+# Required-Stop: $local_fs $remote_fs
|
|
|
0fff429 |
+# Should-Start:
|
|
|
0fff429 |
+# Should-Stop:
|
|
|
0fff429 |
+# Default-Start:
|
|
|
0fff429 |
+# Default-Stop: 0 1 2 3 4 5 6
|
|
|
0fff429 |
# Short-Description: Start the cpu hotplug daemon for Linux on System z
|
|
|
0fff429 |
# Description: Starts the cpuplugd. It uses the configuration
|
|
|
0fff429 |
# file /etc/sysconfig/cpuplugd
|
|
|
0fff429 |
### END INIT INFO
|
|
|
0fff429 |
|
|
|
0fff429 |
-# chkconfig: 12345 01 99
|
|
|
0fff429 |
+# chkconfig: - 01 99
|
|
|
0fff429 |
|
|
|
0fff429 |
DAEMON=cpuplugd
|
|
|
0fff429 |
DAEMON_PATH=/usr/sbin/cpuplugd
|
|
|
0fff429 |
@@ -26,7 +28,13 @@ start()
|
|
|
0fff429 |
{
|
|
|
0fff429 |
if [ ! -f $RUN_PID_FILE ]; then
|
|
|
0fff429 |
echo -n $"Starting $DAEMON:"
|
|
|
0fff429 |
- $DAEMON_PATH $OPTIONS && log_success_msg || log_failure_msg
|
|
|
0fff429 |
+ $DAEMON_PATH $OPTIONS
|
|
|
0fff429 |
+ if [ $? == "0" ]; then
|
|
|
0fff429 |
+ touch /var/lock/subsys/cpuplugd
|
|
|
0fff429 |
+ log_success_msg
|
|
|
0fff429 |
+ else
|
|
|
0fff429 |
+ log_failure_msg
|
|
|
0fff429 |
+ fi
|
|
|
0fff429 |
echo
|
|
|
0fff429 |
else
|
|
|
0fff429 |
echo "$DAEMON (pid $(cat $RUN_PID_FILE)) is already running..."
|
|
|
0fff429 |
@@ -41,6 +49,7 @@ stop()
|
|
|
0fff429 |
killproc $DAEMON_PATH -TERM
|
|
|
0fff429 |
log_success_msg
|
|
|
0fff429 |
rm -f $RUN_PID_FILE
|
|
|
0fff429 |
+ rm -f /var/lock/subsys/cpuplugd
|
|
|
0fff429 |
else
|
|
|
0fff429 |
log_failure_msg
|
|
|
0fff429 |
fi
|
|
|
0fff429 |
diff --git a/etc/init.d/dumpconf b/etc/init.d/dumpconf
|
|
|
0fff429 |
index 1f719f5..3935582 100644
|
|
|
0fff429 |
--- a/etc/init.d/dumpconf
|
|
|
0fff429 |
+++ b/etc/init.d/dumpconf
|
|
|
0fff429 |
@@ -3,14 +3,14 @@
|
|
|
0fff429 |
# Provides: dumpconf
|
|
|
0fff429 |
# Required-Start: $local_fs
|
|
|
0fff429 |
# Required-Stop: $local_fs
|
|
|
0fff429 |
-# Default-Start: 1 2 3 4 5
|
|
|
0fff429 |
-# Default-Stop: 0 6
|
|
|
0fff429 |
+# Default-Start:
|
|
|
0fff429 |
+# Default-Stop: 0 1 2 3 4 5 6
|
|
|
0fff429 |
# Short-Description: Configure s390 dump feature
|
|
|
0fff429 |
# Description: Configures the s390 dump feature. It uses the configuration file
|
|
|
0fff429 |
# /etc/sysconfig/dumpconf
|
|
|
0fff429 |
### END INIT INFO
|
|
|
0fff429 |
|
|
|
0fff429 |
-# chkconfig: 12345 01 99
|
|
|
0fff429 |
+# chkconfig: - 01 99
|
|
|
0fff429 |
|
|
|
0fff429 |
DUMP_CONFIG_FILE=/etc/sysconfig/dumpconf
|
|
|
0fff429 |
|
|
|
0fff429 |
@@ -320,6 +320,8 @@ start()
|
|
|
0fff429 |
echo stop > $ON_PANIC_CONFIG_FILE
|
|
|
0fff429 |
echo "ERROR: $ERRMSG Check $DUMP_CONFIG_FILE!" >&2
|
|
|
0fff429 |
return $RETVAL
|
|
|
0fff429 |
+ else
|
|
|
0fff429 |
+ touch /var/lock/subsys/dumpconf
|
|
|
0fff429 |
fi
|
|
|
0fff429 |
|
|
|
0fff429 |
return $RETVAL
|
|
|
0fff429 |
@@ -334,6 +336,7 @@ stop()
|
|
|
0fff429 |
else
|
|
|
0fff429 |
echo "Disabling dump on panic failed" >&2
|
|
|
0fff429 |
fi
|
|
|
0fff429 |
+ rm -f /var/lock/subsys/dumpconf
|
|
|
0fff429 |
return $RETVAL
|
|
|
0fff429 |
}
|
|
|
0fff429 |
|
|
|
0fff429 |
diff --git a/etc/init.d/mon_statd b/etc/init.d/mon_statd
|
|
|
0fff429 |
index 18f920b..fe1e0e4 100755
|
|
|
0fff429 |
--- a/etc/init.d/mon_statd
|
|
|
0fff429 |
+++ b/etc/init.d/mon_statd
|
|
|
0fff429 |
@@ -1,16 +1,18 @@
|
|
|
0fff429 |
#!/bin/bash
|
|
|
0fff429 |
### BEGIN INIT INFO
|
|
|
0fff429 |
# Provides: mon_statd
|
|
|
0fff429 |
-# Required-Start: $remote_fs
|
|
|
0fff429 |
-# Required-Stop: $remote_fs
|
|
|
0fff429 |
-# Default-Start: 1 2 3 4 5
|
|
|
0fff429 |
-# Default-Stop: 0 6
|
|
|
0fff429 |
+# Required-Start: $local_fs $remote_fs
|
|
|
0fff429 |
+# Required-Stop: $local_fs $remote_fs
|
|
|
0fff429 |
+# Should-Start:
|
|
|
0fff429 |
+# Should-Stop:
|
|
|
0fff429 |
+# Default-Start:
|
|
|
0fff429 |
+# Default-Stop: 0 1 2 3 4 5 6
|
|
|
0fff429 |
# Short-Description: Configure the mon_fsstatd and mon_procd daemons.
|
|
|
0fff429 |
# Description: Configures the mon_fsstatd and mon_procd daemons. It uses the
|
|
|
0fff429 |
# configuration file /etc/sysconfig/mon_statd.
|
|
|
0fff429 |
### END INIT INFO
|
|
|
0fff429 |
|
|
|
0fff429 |
-# chkconfig: 12345 01 99
|
|
|
0fff429 |
+# chkconfig: - 01 99
|
|
|
0fff429 |
|
|
|
0fff429 |
DAEMON=mon_statd
|
|
|
0fff429 |
FSSTATD=mon_fsstatd
|
|
|
0fff429 |
@@ -45,16 +47,26 @@ start()
|
|
|
0fff429 |
|
|
|
0fff429 |
if [ ! -f $FSSTATD_PID_FILE -a "$FSSTAT" = "yes" ]; then
|
|
|
0fff429 |
echo -n $"Starting $FSSTATD:"
|
|
|
0fff429 |
- $FSSTATD_PATH -i $FSSTAT_INTERVAL && log_success_msg ||
|
|
|
0fff429 |
- log_failure_msg
|
|
|
0fff429 |
+ $FSSTATD_PATH -i $FSSTAT_INTERVAL
|
|
|
0fff429 |
+ if [ $? == 0 ]; then
|
|
|
0fff429 |
+ touch /var/lock/subsys/mon_statd
|
|
|
0fff429 |
+ log_success_msg
|
|
|
0fff429 |
+ else
|
|
|
0fff429 |
+ log_failure_msg
|
|
|
0fff429 |
+ fi
|
|
|
0fff429 |
elif [ "$FSSTAT" = "yes" ]; then
|
|
|
0fff429 |
echo "$FSSTATD (pid $(cat $FSSTATD_PID_FILE)) is already running..."
|
|
|
0fff429 |
fi
|
|
|
0fff429 |
|
|
|
0fff429 |
if [ ! -f $PROCD_PID_FILE -a "$PROC" = "yes" ]; then
|
|
|
0fff429 |
echo -n $"Starting $PROCD:"
|
|
|
0fff429 |
- $PROCD_PATH -i $PROC_INTERVAL && log_success_msg ||
|
|
|
0fff429 |
- log_failure_msg
|
|
|
0fff429 |
+ $PROCD_PATH -i $PROC_INTERVAL
|
|
|
0fff429 |
+ if [ $? == 0 ]; then
|
|
|
0fff429 |
+ touch /var/lock/subsys/mon_statd
|
|
|
0fff429 |
+ log_success_msg
|
|
|
0fff429 |
+ else
|
|
|
0fff429 |
+ log_failure_msg
|
|
|
0fff429 |
+ fi
|
|
|
0fff429 |
elif [ "$PROC" = "yes" ]; then
|
|
|
0fff429 |
echo "$PROCD (pid $(cat $PROCD_PID_FILE)) is already running..."
|
|
|
0fff429 |
fi
|
|
|
0fff429 |
@@ -80,6 +92,7 @@ stop()
|
|
|
0fff429 |
else
|
|
|
0fff429 |
log_failure_msg
|
|
|
0fff429 |
fi
|
|
|
0fff429 |
+ rm -f /var/lock/subsys/mon_statd
|
|
|
0fff429 |
echo
|
|
|
0fff429 |
}
|
|
|
0fff429 |
|
|
|
0fff429 |
--
|
|
|
0fff429 |
1.6.0.6
|
|
|
0fff429 |
|