From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 13 Dec 2012 13:36:50 +0000 (+0000)
Subject: Preserve the /var/run/glite directory for Fedora (/var/run is at tmpfs filesystem... 
X-Git-Tag: merge_32_head_take_5_dst~5
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=ab3c0354968666aee6fb33762521a50fbd7bc615;p=jra1mw.git

Preserve the /var/run/glite directory for Fedora (/var/run is at tmpfs filesystem on Fedora). This fixes startup after reboot.
---

diff --git a/org.glite.lb.harvester/project/glite-lb-harvester.spec b/org.glite.lb.harvester/project/glite-lb-harvester.spec
index 36a1e2d..4398d1c 100644
--- a/org.glite.lb.harvester/project/glite-lb-harvester.spec
+++ b/org.glite.lb.harvester/project/glite-lb-harvester.spec
@@ -54,7 +54,13 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 install -m 0644 LICENSE project/ChangeLog $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
-%if ! 0%{?fedora}
+%if 0%{?fedora}
+# preserve directory in /var/run
+mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
+cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/glite-lb-harvester.conf <<EOF
+d %{_localstatedir}/run/glite 0755 glite glite -
+EOF
+%else
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-harvester
 mkdir $RPM_BUILD_ROOT/etc/rc.d
 mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
@@ -132,6 +138,7 @@ fi
 %dir %{_datadir}/glite/
 %ghost %{_localstatedir}/run/glite/glite-lb-harvester.pid
 %if 0%{?fedora}
+%{_prefix}/lib/tmpfiles.d/glite-lb-harvester.conf
 %{_unitdir}/glite-lb-harvester.service
 %else
 %{_initrddir}/glite-lb-harvester
diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index 83c08f3..9f6570e 100644
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -62,7 +62,13 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%if ! 0%{?fedora}
+%if 0%{?fedora}
+# preserve directory in /var/run
+mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
+cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/glite-lb-logger.conf <<EOF
+d %{_localstatedir}/run/glite 0755 glite glite -
+EOF
+%else
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-locallogger
 mkdir $RPM_BUILD_ROOT/etc/rc.d
 mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
@@ -170,6 +176,7 @@ fi
 %ghost %{_localstatedir}/run/glite/glite-lb-notif-interlogd.pid
 %ghost %{_localstatedir}/run/glite/glite-lb-proxy-interlogd.pid
 %if 0%{?fedora}
+%{_prefix}/lib/tmpfiles.d/glite-lb-logger.conf
 %{_unitdir}//glite-lb-logd.service
 %{_unitdir}//glite-lb-interlogd.service
 %{_unitdir}//glite-lb-notif-interlogd.service
diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index c6e22fc..d8a9a05 100644
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -78,9 +78,14 @@ make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-%if ! 0%{?fedora}
+%if 0%{?fedora}
+# preserve directory in /var/run
+mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
+cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/glite-lb-server.conf <<EOF
+d %{_localstatedir}/run/glite 0755 glite glite -
+EOF
+%else
 sed -i 's,\(lockfile=/var/lock\),\1/subsys,' $RPM_BUILD_ROOT/etc/init.d/glite-lb-bkserverd
 mkdir $RPM_BUILD_ROOT/etc/rc.d
 mv $RPM_BUILD_ROOT/etc/init.d $RPM_BUILD_ROOT/etc/rc.d
@@ -178,6 +183,7 @@ fi
 %{_docdir}/%{name}-%{version}/LICENSE
 %{_docdir}/%{name}-%{version}/glite-lb
 %if 0%{?fedora}
+%{_prefix}/lib/tmpfiles.d/glite-lb-server.conf
 %{_unitdir}/glite-lb-bkserverd.service
 %else
 %{_initrddir}/glite-lb-bkserverd