[condor/f15] Added condor-tmpfiles.conf to create /var/run/condor
matt
matt at fedoraproject.org
Tue Jun 7 19:49:46 UTC 2011
commit 43b0ff5eef8329e54aa1d3d4d01c495a2d86b133
Author: Matthew Farrellee <matt at redhat.com>
Date: Tue Jun 7 13:43:14 2011 -0400
Added condor-tmpfiles.conf to create /var/run/condor
condor-tmpfiles.conf | 2 ++
condor.spec | 9 +++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/condor-tmpfiles.conf b/condor-tmpfiles.conf
new file mode 100644
index 0000000..2be699d
--- /dev/null
+++ b/condor-tmpfiles.conf
@@ -0,0 +1,2 @@
+# Condor needs directory in /var/run
+d /var/run/condor 0775 condor condor
diff --git a/condor.spec b/condor.spec
index 810f8f9..147ec4a 100644
--- a/condor.spec
+++ b/condor.spec
@@ -32,6 +32,7 @@ URL: http://www.cs.wisc.edu/condor/
# Note: The md5sum of each generated tarball may be different
Source0: condor-7.6.0-327697-RH.tar.gz
Source1: generate-tarball.sh
+Source2: %{name}-tmpfiles.conf
Patch0: condor_config.generic.patch
Patch3: chkconfig_off.patch
Patch4: 7.7.0-catch-up.patch
@@ -89,6 +90,8 @@ Requires: mailx
Requires: python >= 2.2
Requires: condor-classads = %{version}-%{release}
+Requires: initscripts
+
Requires(pre): shadow-utils
Requires(post):/sbin/chkconfig
@@ -389,6 +392,10 @@ rm -r %{buildroot}/%{_sysconfdir}/init.d
# install the lsb init script
install -Dp -m0755 %{buildroot}/etc/examples/condor.init %buildroot/%_initrddir/condor
+# install tmpfiles.d/condor.conf
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+
# we must place the config examples in builddir so %doc can find them
mv %{buildroot}/etc/examples %_builddir/%name-%tarball_version
@@ -409,6 +416,7 @@ rm -rf %{buildroot}
%_initrddir/condor
%dir %_sysconfdir/condor/
%config(noreplace) %_sysconfdir/condor/condor_config
+%config(noreplace) %_sysconfdir/tmpfiles.d/%{name}.conf
%dir %_datadir/condor/
%_datadir/condor/Chirp.jar
%_datadir/condor/CondorJavaInfo.class
@@ -717,6 +725,7 @@ fi
* Tue Jun 7 2011 <matt at redhat> - 7.7.0-0.3
- Fast forward to 7.7.0 pre-release at 1babb324
- Catch libdeltacloud 0.8 update
+- Added tmpfiles.d/condor.conf (BZ711456)
* Fri May 20 2011 <matt at redhat> - 7.7.0-0.2
- Added GSI support, dependency on Globus
More information about the scm-commits
mailing list