Changeset: b6d94077ee3a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6d94077ee3a
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Aug2011
buildtools/conf/Makefile.ag
buildtools/conf/monetdbd.conf
Branch: Aug2011
Log Message:
Add tmpfiles.d configuration file to create /var/run/monetdb.
This fixes bug 2850.
diffs (53 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -432,7 +432,12 @@ use SQL with MonetDB, you will need to i
%{_bindir}/monetdb
%{_bindir}/monetdbd
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
+%if ! (0%{?fedora} > 14)
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
+%exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
+%else
+%{_sysconfdir}/tmpfiles.d/monetdbd.conf
+%endif
%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/lib_sql.so
diff --git a/buildtools/ChangeLog.Aug2011 b/buildtools/ChangeLog.Aug2011
--- a/buildtools/ChangeLog.Aug2011
+++ b/buildtools/ChangeLog.Aug2011
@@ -1,6 +1,10 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Sat Aug 6 2011 Sjoerd Mullender <[email protected]>
+- Fixed Fedora 15 (and presumably later) configuration that uses a tmpfs
+ file system for /var/run. This fixes bug 2850.
+
* Wed Jul 20 2011 Sjoerd Mullender <[email protected]>
- The default OID size for 64-bit Windows is now 64 bits. Databases with
32 bit OIDs are converted automatically.
diff --git a/buildtools/conf/Makefile.ag b/buildtools/conf/Makefile.ag
--- a/buildtools/conf/Makefile.ag
+++ b/buildtools/conf/Makefile.ag
@@ -50,4 +50,11 @@ headers_html = {
SOURCES = website.html
}
+headers_systemd = {
+ COND = NOT_WIN32
+ HEADERS = conf
+ DIR = sysconfdir/tmpfiles.d
+ SOURCES = monetdbd.conf
+}
+
EXTRA_DIST = rules.mk
diff --git a/buildtools/conf/monetdbd.conf b/buildtools/conf/monetdbd.conf
new file mode 100644
--- /dev/null
+++ b/buildtools/conf/monetdbd.conf
@@ -0,0 +1,3 @@
+# this file is for systemd
+# monetdbd needs a directory in /var/run that is owned by monetdb:monetdb
+d /run/monetdb 0775 monetdb monetdb -
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
