Store RAS sqlite3 db file on a proper place

Instead of creating it on the same directory as when it
is called, put it at ${prefix}/var/lib/rasdaemon directory.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/configure.ac b/configure.ac
index 535e50f71fd23309fe3ac6f5bf6a1cf4a3e19c78..8248636064cf19205e20d40efff35f96857b2521 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,4 +57,9 @@ test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
 
 CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes"
 
+AC_SUBST([rasstatedir], [$localstatedir/lib/rasdaemon])
+AC_DEFINE_DIR([RASSTATEDIR], [rasstatedir], [rasdaemon db store state dir])
+AC_SUBST([RASSTATEDIR])
+AC_DEFINE([RAS_DB_FNAME], ["ras-mc_event.db"], [ras events database])
+
 AC_OUTPUT

diff --git a/m4/ac_define_dir.m4 b/m4/ac_define_dir.m4
new file mode 100644 (file)
index 0000000..e15cea2
--- /dev/null
+++ b/m4/ac_define_dir.m4
@@ -0,0 +1,34 @@
+dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+dnl
+dnl This macro sets VARNAME to the expansion of the DIR variable,
+dnl taking care of fixing up ${prefix} and such.
+dnl
+dnl VARNAME is then offered as both an output variable and a C
+dnl preprocessor symbol.
+dnl
+dnl Example:
+dnl
+dnl    AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+dnl
+dnl @category Misc
+dnl @author Stepan Kasal <kasal@ucw.cz>
+dnl @author Andreas Schwab <schwab@suse.de>
+dnl @author Guido U. Draheim <guidod@gmx.de>
+dnl @author Alexandre Oliva
+dnl @version 2006-10-13
+dnl @license AllPermissive
+
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])

diff --git a/misc/rasdaemon.spec.in b/misc/rasdaemon.spec.in
index 91235a40d2d5eb0cc00a8df4ba3acdfb0532d968..35edf447987b85a703b57b5056ff72a10e412304 100644 (file)
--- a/misc/rasdaemon.spec.in
+++ b/misc/rasdaemon.spec.in
@@ -29,7 +29,7 @@ an utility for reporting current error counts from the EDAC sysfs files.
 
 %build
 autoreconf -vfi
-%configure --enable-mce
+%configure --enable-mce --enable-aer --enable-sqlite3
 make %{?_smp_mflags}
 
 %install
@@ -37,6 +37,8 @@ make install DESTDIR=%{buildroot}
 install -D -p -m 0644 misc/rasdaemon.service %{buildroot}/%{_unitdir}/rasdaemon.service
 install -D -p -m 0644 misc/ras-mc-ctl.service %{buildroot}%{_unitdir}/ras-mc-ctl.service
 rm INSTALL %{buildroot}/usr/include/*.h
+mkdir -p %{buildroot}/%{_sharedstatedir}/rasdaemon
+mkdir -p %{buildroot}/%{_sysconfdir}/ras.d
 
 %files
 %doc AUTHORS ChangeLog COPYING README TODO
@@ -44,6 +46,8 @@ rm INSTALL %{buildroot}/usr/include/*.h
 %{_sbindir}/ras-mc-ctl
 %{_mandir}/*/*
 %{_unitdir}/*.service
+%{_sharedstatedir}/rasdaemon
+%{_sysconfdir}/ras.d
 
 %changelog
 * Mon May 20 2013 Mauro Carvalho Chehab <mchehab@redhat.com> @PACKAGE_VERSION@-1

diff --git a/ras-record.c b/ras-record.c
index 796df5fcf0a734846df775b5bf9f68afa4892de4..052875b87213543a0cbedcde75e176931ec91c0f 100644 (file)
--- a/ras-record.c
+++ b/ras-record.c
@@ -28,7 +28,7 @@
 #include "ras-mc-handler.h"
 #include "ras-logger.h"
 
-#define SQLITE_RAS_DB  "ras-mc_event.db"
+#define SQLITE_RAS_DB RASSTATEDIR "/" RAS_DB_FNAME
 
 const char *mc_event_db = " mc_event ";
 const char *mc_event_db_create_fields = "("