Репозитории ALT
S: | 1.6.11.1-alt1 |
5.1: | 0.8.7-alt1 |
4.1: | 0.5.5-alt1 |
4.0: | 0.4.4-alt1 |
Группа :: Мониторинг
Пакет: freeipmi
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: freeipmi-0.6.4-alt2.patch
Скачать
Скачать
bmc-watchdog/Makefile.am | 8 +-
bmc-watchdog/freeipmi-bmc-watchdog.init | 110 ++++++++++----------
bmc-watchdog/freeipmi-bmc-watchdog.logrotate | 2 +-
ipmiconsole/src/libipmiconsole/Makefile.am | 2 +-
ipmidetect/Makefile.am | 4 +-
ipmidetect/freeipmi-ipmidetectd.init | 143 +++++++++++---------------
6 files changed, 122 insertions(+), 147 deletions(-)
diff --git a/bmc-watchdog/Makefile.am b/bmc-watchdog/Makefile.am
index 4e2808a..82c0398 100644
--- a/bmc-watchdog/Makefile.am
+++ b/bmc-watchdog/Makefile.am
@@ -22,10 +22,10 @@ install-data-local: $(INSTALL_INIT_SCRIPTS) $(INSTALL_LOGROTATE_CONFIG) \
$(INSTALL_LOGDIR)
install-init-scripts:
- $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/init.d
- $(INSTALL) -m 755 $(srcdir)/freeipmi-bmc-watchdog.init $(DESTDIR)$(sysconfdir)/init.d/freeipmi-bmc-watchdog
+ $(INSTALL) -m 755 -d $(DESTDIR)/$(sysconfdir)/rc.d/init.d
+ $(INSTALL) -m 755 $(srcdir)/freeipmi-bmc-watchdog.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/freeipmi-bmc-watchdog
$(INSTALL) -m 755 -d $(DESTDIR)/$(sysconfdir)/sysconfig
- $(INSTALL) -m 444 $(srcdir)/freeipmi-bmc-watchdog.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/freeipmi-bmc-watchdog
+ $(INSTALL) -m 644 $(srcdir)/freeipmi-bmc-watchdog.sysconfig $(DESTDIR)$(sysconfdir)/sysconfig/freeipmi-bmc-watchdog
install-logrotate-config:
$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/logrotate.d
@@ -35,6 +35,6 @@ install-logdir:
$(INSTALL) -m 755 -d $(DESTDIR)$(BMCWATCHDOGLOGdir)
uninstall-local:
- $(RM) -f $(DESTDIR)$(sysconfdir)/init.d/freeipmi-bmc-watchdog
+ $(RM) -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/freeipmi-bmc-watchdog
$(RM) -f $(DESTDIR)$(sysconfdir)/logrotate.d/freeipmi-bmc-watchdog
$(RM) -f $(DESTDIR)$(sysconfdir)/sysconfig/freeipmi-bmc-watchdog
diff --git a/bmc-watchdog/freeipmi-bmc-watchdog.init b/bmc-watchdog/freeipmi-bmc-watchdog.init
index 5b9f925..117a09b 100755
--- a/bmc-watchdog/freeipmi-bmc-watchdog.init
+++ b/bmc-watchdog/freeipmi-bmc-watchdog.init
@@ -1,68 +1,70 @@
#!/bin/sh
#
-# chkconfig: - 99 01
-# description: bmc-watchdog startup script
+# template Summary of the service.
#
-DAEMON=/usr/sbin/bmc-watchdog
-PIDFILE=/var/run/freeipmi-bmc-watchdog.pid
-LOCKFILE=/var/lock/subsys/freeipmi-bmc-watchdog
-CONFFILE=/etc/sysconfig/freeipmi-bmc-watchdog
+# chkconfig: - 99 01
+# description: bmc-watchdog startup script
+# processname: bmc-watchdog
-. /etc/rc.d/init.d/functions
+# Do not load RH compatibility interface.
+WITHOUT_RC_COMPAT=1
-RETVAL=0
+# Source function library.
+. /etc/init.d/functions
-if [ -r $CONFFILE ]; then
- . $CONFFILE
-fi
+SourceIfNotEmpty /etc/sysconfig/freeipmi-bmc-watchdog
-case "$1" in
- start)
- echo -n "Starting bmc-watchdog: "
- [ -f $DAEMON ] || exit 1
+LOCKFILE=/var/lock/subsys/freeipmi-bmc-watchdog
+RETVAL=0
- # Default deamon mode
- #
- # timer use = SMS/OS
- # pre-timeout interrupt = none
- # action = reset
- # -F, -P, -L, -S, -O - clear flags
- # initial-countdown = 900 seconds (15 mins)
- # reset-period = 60 seconds
+start()
+{
+ start_daemon $NICE --lockfile "$LOCKFILE" --expect-user root -- bmc-watchdog $DAEMON_OPTIONS
+ RETVAL=$?
+ return $RETVAL
+}
- daemon -20 $DAEMON $OPTIONS
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch $LOCKFILE
- ;;
+stop()
+{
+ stop_daemon --lockfile "$LOCKFILE" --expect-user root -- bmc-watchdog
+ RETVAL=$?
+ return $RETVAL
+}
- stop)
- echo -n "Shutting down bmc-watchdog: "
- killproc bmc-watchdog
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
- ;;
+restart()
+{
+ stop
+ start
+}
- restart|reload)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
- status)
- status bmc-watchdog
- RETVAL=$?
- ;;
- condrestart)
- if test -e $LOCKFILE; then \
- $0 stop; \
- $0 start; \
- RETVAL=$?; \
- fi
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status|condrestart}"
- exit 1
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ restart
+ ;;
+ condstop)
+ if [ -e "$LOCKFILE" ]; then
+ stop
+ fi
+ ;;
+ condrestart|condreload)
+ if [ -e "$LOCKFILE" ]; then
+ restart
+ fi
+ ;;
+ status)
+ status --expect-user root -- bmc-watchdog
+ RETVAL=$?
+ ;;
+ *)
+ msg_usage "${0##*/} {start|stop|reload|restart|condstop|condrestart|condreload|status}"
+ RETVAL=1
esac
exit $RETVAL
diff --git a/bmc-watchdog/freeipmi-bmc-watchdog.logrotate b/bmc-watchdog/freeipmi-bmc-watchdog.logrotate
index a367e17..3de531d 100644
--- a/bmc-watchdog/freeipmi-bmc-watchdog.logrotate
+++ b/bmc-watchdog/freeipmi-bmc-watchdog.logrotate
@@ -11,6 +11,6 @@
nomail
notifempty
postrotate
- /etc/init.d/freeipmi-bmc-watchdog condrestart
+ /sbin/service freeipmi-bmc-watchdog condreload
endscript
}
diff --git a/ipmiconsole/src/libipmiconsole/Makefile.am b/ipmiconsole/src/libipmiconsole/Makefile.am
index 1a6bf1e..bd58491 100644
--- a/ipmiconsole/src/libipmiconsole/Makefile.am
+++ b/ipmiconsole/src/libipmiconsole/Makefile.am
@@ -56,7 +56,7 @@ libipmiconsole_la_LIBADD = ../../../common/src/libmiscutils.la \
install-data-hook: $(INSTALL_LOGDIR)
install-logdir:
- $(INSTALL) -m 755 -d $(DESTDIR)var/log/ipmiconsole
+ $(INSTALL) -m 755 -d $(DESTDIR)/var/log/ipmiconsole
EXTRA_DIST = ipmiconsole.map
diff --git a/ipmidetect/Makefile.am b/ipmidetect/Makefile.am
index ce36ae5..2ddd41c 100644
--- a/ipmidetect/Makefile.am
+++ b/ipmidetect/Makefile.am
@@ -15,8 +15,8 @@ EXTRA_DIST = freeipmi-ipmidetectd.init
install-data-local: $(INSTALL_INIT_SCRIPTS)
install-init-scripts:
- $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/init.d
- $(INSTALL) -m 755 $(srcdir)/freeipmi-ipmidetectd.init $(DESTDIR)$(sysconfdir)/init.d/freeipmi-ipmidetectd
+ $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/rc.d/init.d
+ $(INSTALL) -m 755 $(srcdir)/freeipmi-ipmidetectd.init $(DESTDIR)$(sysconfdir)/rc.d/init.d/freeipmi-ipmidetectd
uninstall-local:
$(RM) -f $(DESTDIR)$(sysconfdir)/init.d/freeipmi-ipmidetectd
diff --git a/ipmidetect/freeipmi-ipmidetectd.init b/ipmidetect/freeipmi-ipmidetectd.init
index 0979ceb..d9805df 100644
--- a/ipmidetect/freeipmi-ipmidetectd.init
+++ b/ipmidetect/freeipmi-ipmidetectd.init
@@ -3,7 +3,9 @@
#
# chkconfig: - 70 40
# description: ipmidetectd startup script
-#
+# chkconfig: - 99 01
+# description: ipmidetectd startup script
+# processname: ipmidetectd
### BEGIN INIT INFO
# Provides: ipmidetectd
# Required-Start: $network $remote_fs $syslog
@@ -13,94 +15,65 @@
# Description: IPMI node detection monitoring daemon
### END INIT INFO
-IPMIDETECTD=/usr/sbin/ipmidetectd
+# Do not load RH compatibility interface.
+WITHOUT_RC_COMPAT=1
-[ -f $IPMIDETECTD ] || exit 1
+# Source function library.
+. /etc/init.d/functions
-# Load Redhat or Suse appropriate libs
-if [ -f /etc/rc.d/init.d/functions ] ; then
- . /etc/rc.d/init.d/functions
- Xstart() {
- daemon $IPMIDETECTD
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/freeipmi-ipmidetectd
- }
- Xstop() {
- killproc ipmidetectd -TERM
- RETVAL=$?
- echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/freeipmi-ipmidetectd
- }
- Xstatus() {
- status ipmidetectd
- RETVAL=$?
- }
- Xcondrestart() {
- if test -e /var/lock/subsys/freeipmi-ipmidetectd; then
- $0 stop
- $0 start
- RETVAL=$?
- fi
- }
- Xexit() {
- exit $RETVAL
- }
-elif [ -f /etc/rc.status ] ; then
- . /etc/rc.status
- Xstart() {
- startproc $IPMIDETECTD
- rc_status -v
- }
- Xstop() {
- killproc -TERM $IPMIDETECTD
- rc_status -v
- }
- Xstatus() {
- echo -n "Checking for ipmidetectd: "
- checkproc $IPMIDETECTD
- rc_status -v
- }
- Xcondrestart() {
- $0 status
- if test $? = 0; then
- $0 restart
- else
- rc_reset
- fi
- rc_status
- }
- Xexit() {
- rc_exit
- }
-else
- echo "Unknown distribution type"
- exit 1
-fi
+SourceIfNotEmpty /etc/sysconfig/freeipmi-ipmidetectd
+LOCKFILE=/var/lock/subsys/freeipmi-ipmidetectd
RETVAL=0
+start()
+{
+ start_daemon $NICE --lockfile "$LOCKFILE" --expect-user root -- ipmidetectd $DAEMON_OPTIONS
+ RETVAL=$?
+ return $RETVAL
+}
+
+stop()
+{
+ stop_daemon --lockfile "$LOCKFILE" --expect-user root -- ipmidetectd
+ RETVAL=$?
+ return $RETVAL
+}
+
+restart()
+{
+ stop
+ start
+}
+
+# See how we were called.
case "$1" in
- start)
- echo -n "Starting ipmidetectd: "
- Xstart
- ;;
- stop)
- echo -n "Shutting down ipmidetectd: "
- Xstop
- ;;
- restart|reload)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
- status)
- Xstatus
- ;;
- condrestart)
- Xcondrestart
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status|condrestart}"
- exit 1
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart|reload)
+ restart
+ ;;
+ condstop)
+ if [ -e "$LOCKFILE" ]; then
+ stop
+ fi
+ ;;
+ condrestart|condreload)
+ if [ -e "$LOCKFILE" ]; then
+ restart
+ fi
+ ;;
+ status)
+ status --expect-user root -- ipmidetectd
+ RETVAL=$?
+ ;;
+ *)
+ msg_usage "${0##*/} {start|stop|reload|restart|condstop|condrestart|condreload|status}"
+ RETVAL=1
esac
+
+exit $RETVAL