Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2014-12-16 14:48:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga" Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2014-11-29 08:39:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2014-12-16 14:47:51.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 4 17:18:07 UTC 2014 - [email protected] + +- use a bash script for rcicinga to integrate some additional + options from old sysvinit script (check, check_verbose) + +------------------------------------------------------------------- New: ---- icinga_sysvinit_compat ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.qEiVtY/_old 2014-12-16 14:47:54.000000000 +0100 +++ /var/tmp/diff_new_pack.qEiVtY/_new 2014-12-16 14:47:54.000000000 +0100 @@ -79,6 +79,7 @@ BuildRequires: zlib-devel %if 0%{?using_systemd} BuildRequires: systemd +Source100: icinga_sysvinit_compat %endif Requires: net-tools Requires(pre): %fillup_prereq @@ -432,7 +433,7 @@ # init-scripts # remove the default init script as SUSE uses an adapted one %if 0%{?using_systemd} -ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} +install -D -m0755 %{SOURCE100} %{buildroot}%{_sbindir}/rc%{name} ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcido2db install -D -m0755 %{SOURCE18} "%{buildroot}%{icinga_libdir}/icinga-exec-start-pre" install -D -m0755 %{SOURCE19} "%{buildroot}%{icinga_libdir}/ido2db-exec-start-pre" @@ -607,12 +608,13 @@ %{_mandir}/man8/icinga*.8* %{_sbindir}/%{name} %attr(0755,root,%{icinga_group}) %{_sbindir}/icingastats -%{_sbindir}/rc%{name} %if 0%{?using_systemd} +%attr(0755,root,root) %{_sbindir}/rc%{name} %{icinga_libdir}/icinga-exec-start-pre %exclude %{icinga_libdir}/ido2db-exec-start-pre %{_unitdir}/icinga.service %else +%{_sbindir}/rc%{name} %{_initrddir}/%{name} %endif %{icinga_datadir}/p1.pl ++++++ icinga_sysvinit_compat ++++++ #! /bin/sh # Copyright (c) 2014 SUSE Linux GmbH, Germany. # Author: Lars Vogdt # # /usr/sbin/rcicinga # # Systemd enhancements script for Icinga # . /etc/rc.status ICINGA_BIN='/usr/sbin/icinga' ICINGA_CFG='/etc/icinga/icinga.cfg' ICINGA_CFG_ERR_LOG='/var/log/icinga/config.err' # Read config and log errors in logfile config_check () { case "$1" in verbose) $ICINGA_BIN -v "$ICINGA_CFG" >"$ICINGA_CFG_ERR_LOG" 2>&1 if [ $? -eq 0 ]; then return 0 else return 1 fi ;; *) $ICINGA_BIN -v "$ICINGA_CFG" >/dev/null 2>&1 if [ $? -eq 0 ]; then return 0 else $ICINGA_BIN -v "$ICINGA_CFG" >"$ICINGA_CFG_ERR_LOG" 2>&1 return 1 fi ;; esac } # Check for missing binaries (stale symlinks should not happen) # Note: Special treatment of stop for LSB conformance test -x "$ICINGA_BIN" || { echo "$ICINGA_BIN not installed or not executable."; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } # Check for existence of needed config file test -r "$ICINGA_CFG" || { echo "$ICINGA_CFG not existing or readable."; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Reset status of this service rc_reset case "$1" in check) echo -n "Starting configuration check " config_check if [ $? -eq 0 ]; then echo "- passed configuration check" test -f $ICINGA_CFG_ERR_LOG && rm $ICINGA_CFG_ERR_LOG rc_reset else echo "- detected Error in configuration files" echo "Please read $ICINGA_CFG_ERR_LOG" rc_failed fi rc_status -v ;; check_verbose) echo "Running verbose configuration check..." config_check verbose exitcode=$? cat "$ICINGA_CFG_ERR_LOG" rc_failed $exitcode rc_status -v rc_exit ;; *) /bin/systemctl $* icinga.service ;; esac rc_exit -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
