move (de)installation of abrt-hook-ccpp into abrt-ccpp service.

Init script is packaged and installed with abrt-addon-ccpp package.

In order to not install the hook twice, "old" plugin loading in abrtd
is disabled (pending deletion of entire "old" plugin machinery).

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

3 files changed, 152 insertions, 10 deletions

diff --git a/abrt-ccpp.init b/abrt-ccpp.init
new file mode 100644
index 00000000..457378a9
--- /dev/null
+++ b/abrt-ccpp.init
@@ -0,0 +1,129 @@
+#!/bin/bash
+# Install abrt coredump hook
+#
+# chkconfig: 35 82 16
+# description: Installs coredump handler which saves segfault data
+### BEGIN INIT INFO
+# Provides: abrt-ccpp
+# Required-Start: $abrtd
+# Default-Stop: 0 1 2 6
+# Default-Start: 3 5
+# Short-Description: Installs coredump handler which saves segfault data
+# Description: Installs coredump handler which saves segfault data
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# For debugging
+dry_run=false
+verbose=false
+
+# We don't have pid files, therefore have to use
+# a flag file in /var/lock/subsys to enable GUI service tools
+# to figure out our status
+LOCK="/var/lock/subsys/abrt-ccpp"
+
+PATTERN_FILE="/proc/sys/kernel/core_pattern"
+SAVED_PATTERN_FILE="/var/run/abrt/saved_core_pattern"
+HOOK_BIN="/usr/libexec/abrt-hook-ccpp"
+PATTERN="|$HOOK_BIN /var/spool/abrt %s %c %p %u %g %t %h %e"
+
+RETVAL=0
+
+check() {
+	# Check that we're a privileged user
+	[ "`id -u`" = 0 ] || exit 4
+}
+
+start() {
+	check
+
+	cur=`cat "$PATTERN_FILE"`
+	cur_first=`printf "%s" "$cur" | sed 's/ .*//'`
+
+	$verbose && printf "cur:'%s'\n" "$cur"
+	# Is it already installed?
+	if test x"$cur_first" != x"|$HOOK_BIN"; then   # no
+		# It is not installed
+		printf "%s\n" "$cur" >"$SAVED_PATTERN_FILE"
+		OLD_PATTERN=""
+		# Does old pattern start with '|'?
+		if test x"${cur#|}" = x"$cur"; then   # no
+			# Encode it as hex string, NUL terminated
+			OLD_PATTERN=`printf "%s" "$cur" | od -tx1 | sed 's/000[^ ]*//' | xargs | sed 's/ //g'`
+			$verbose && printf "OLD_PATTERN:'%s'\n" "$OLD_PATTERN"
+			OLD_PATTERN=" ${OLD_PATTERN}00"
+		fi
+		# Install new handler
+		$verbose && printf "Installing to %s:'%s'\n" "$PATTERN_FILE" "${PATTERN}${OLD_PATTERN}"
+		$dry_run || echo "${PATTERN}${OLD_PATTERN}" >"$PATTERN_FILE"
+		$dry_run || touch -- "$LOCK"
+	fi
+	return $RETVAL
+}
+
+stop() {
+	check
+
+	if test -f "$SAVED_PATTERN_FILE"; then
+		$verbose && printf "Restoring to %s:'%s'\n" "$PATTERN_FILE" "`cat "$SAVED_PATTERN_FILE"`"
+		$dry_run || cat "$SAVED_PATTERN_FILE" >"$PATTERN_FILE"
+	fi
+	$dry_run || rm -f -- "$LOCK"
+	return $RETVAL
+}
+
+restart() {
+	stop
+	start
+}
+
+reload() {
+	restart
+}
+
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
+	;;
+reload)
+	reload
+	;;
+force-reload)
+	echo "$0: Unimplemented feature."
+	RETVAL=3
+	;;
+restart)
+	restart
+	;;
+condrestart)
+	cur=`cat "$PATTERN_FILE"`
+	cur_first=`printf "%s" "$cur" | sed 's/ .*//'`
+	# Is it already installed?
+	if test x"$cur_first" = x"|$HOOK_BIN"; then   # yes
+		$verbose && printf "Installed, re-installing\n"
+		restart
+	fi
+	;;
+status)
+	cur=`cat "$PATTERN_FILE"`
+	cur_first=`printf "%s" "$cur" | sed 's/ .*//'`
+	# Is it already installed?
+	if test x"$cur_first" = x"|$HOOK_BIN"; then   # yes
+		$verbose && printf "Installed\n"
+		RETVAL=0
+	else
+		$verbose && printf "Not installed\n"
+		RETVAL=3  # "stopped normally"
+	fi
+	;;
+*)
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|force-reload}"
+	RETVAL=2
+esac
+
+exit $RETVAL
diff --git a/abrt.spec b/abrt.spec
index e660a74f..013c2057 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -28,6 +28,7 @@ Group: Applications/System
 URL: https://fedorahosted.org/abrt/
 Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 Source1: abrt.init
+Source2: abrt-ccpp.init
 BuildRequires: dbus-devel
 BuildRequires: gtk2-devel
 BuildRequires: curl-devel
@@ -250,6 +251,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
 install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd
+install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-ccpp
 mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di
 mkdir -p $RPM_BUILD_ROOT/var/run/abrt
 mkdir -p $RPM_BUILD_ROOT/var/spool/abrt
@@ -285,6 +287,12 @@ fi
 #fi
 %endif
 
+%post addon-ccpp
+if [ $1 -eq 1 ]; then
+/sbin/chkconfig --add abrt-ccpp
+fi
+#systemd: TODO
+
 %preun
 if [ "$1" -eq "0" ] ; then
   service abrtd stop >/dev/null 2>&1
@@ -298,6 +306,13 @@ if [ "$1" -eq "0" ] ; then
 fi
 %endif
 
+%preun addon-ccpp
+if [ "$1" -eq "0" ] ; then
+  service abrt-ccpp stop >/dev/null 2>&1
+  /sbin/chkconfig --del abrt-ccpp
+fi
+#systemd: TODO
+
 %postun
 #systemd
 %if %{?with_systemd}
@@ -335,6 +350,12 @@ if [ "$1" -eq "0" ]; then
 fi
 %endif
 
+%posttrans addon-ccpp
+if [ "$1" -eq "0" ]; then
+    service abrt-ccpp condrestart >/dev/null 2>&1 || :
+fi
+#systemd: TODO
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -410,6 +431,7 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
 %dir %{_localstatedir}/cache/abrt-di
+%{_initrddir}/abrt-ccpp
 %{_libdir}/%{name}/libCCpp.so*
 %{_libexecdir}/abrt-hook-ccpp
 %{_bindir}/abrt-action-analyze-c
diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 1516f159..6d9bd87f 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -676,10 +676,6 @@ int main(int argc, char** argv)
                                                   handle_inotify_cb,
                                                   NULL);
 
-        VERB1 log("Loading plugins from "PLUGINS_LIB_DIR);
-        g_pPluginManager = new CPluginManager();
-        g_pPluginManager->LoadPlugins();
-
         /* Add an event source which waits for INT/TERM signal */
         VERB1 log("Adding signal pipe watch to glib main loop");
         channel_signal = g_io_channel_unix_new(s_signal_pipe[0]);
@@ -771,12 +767,7 @@ int main(int argc, char** argv)
         g_io_channel_unref(channel_inotify);
 
     delete g_pCommLayer;
-    if (g_pPluginManager)
-    {
-        /* This restores /proc/sys/kernel/core_pattern, among other things: */
-        g_pPluginManager->UnLoadPlugins();
-        delete g_pPluginManager;
-    }
+
     if (pMainloop)
         g_main_loop_unref(pMainloop);