packages: systemd/systemd.spec - preserve renamed systemd-logind.conf and s...

[baggins]

Author: baggins                      Date: Thu May 31 10:51:35 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- preserve renamed systemd-logind.conf and systemd-journald.conf

---- Files affected:
packages/systemd:
   systemd.spec (1.175 -> 1.176) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.175 packages/systemd/systemd.spec:1.176
--- packages/systemd/systemd.spec:1.175	Thu May 31 12:36:02 2012
+++ packages/systemd/systemd.spec	Thu May 31 12:51:30 2012
@@ -840,6 +840,15 @@
 %triggerpostun units -- systemd-units < 1:183
 /bin/systemctl --quiet enable systemd-udev-settle.service >/dev/null 2>&1 || :
 %{__rm} -f /etc/systemd/system/basic.target.wants/udev-settle.service >/dev/null 2>&1 || :
+# preserve renamed configs
+if [ -f /etc/systemd/systemd-journald.conf.rpmsave ]; then
+	%{__mv} /etc/systemd/journald.conf{,.rpmnew}
+	%{__mv} -f /etc/systemd/systemd-journald.conf.rpmsave /etc/systemd/journald.conf
+fi
+if [ -f /etc/systemd/systemd-logind.conf.rpmsave ]; then
+	%{__mv} /etc/systemd/logind.conf{,.rpmnew}
+	%{__mv} -f /etc/systemd/systemd-logind.conf.rpmsave /etc/systemd/logind.conf
+fi
 
 %post plymouth
 %systemd_reload
@@ -1347,6 +1356,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.176  2012/05/31 10:51:30  baggins
+- preserve renamed systemd-logind.conf and systemd-journald.conf
+
 Revision 1.175  2012/05/31 10:36:02  baggins
 - fix udev-settle service symlinks in systemd-units trigger
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/systemd/systemd.spec?r1=1.175&r2=1.176