packages: systemd/systemd.spec - don't use literal /etc: subdirectories are...

[gotar]

Author: gotar                        Date: Tue Dec  6 21:34:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't use literal /etc: subdirectories are managed by systemctl,
  distribution provided files go to *lib/, so it's relocatable

---- Files affected:
packages/systemd:
   systemd.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.66 packages/systemd/systemd.spec:1.67
--- packages/systemd/systemd.spec:1.66	Tue Dec  6 22:15:57 2011
+++ packages/systemd/systemd.spec	Tue Dec  6 22:34:50 2011
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 #	- shouldn't ../bin/systemctl symlinks be absolute? -no they shouldn't (think browsing mounted as chroot and seeing all blink due invalid link targets when doing ls)
-#	- verify %_sysconfdir usage vs literal '/etc'
 #	- %post systemd-sysv-convert
 #
 # Conditional build:
@@ -117,7 +116,7 @@
 Basic configuration files, directories and installation tool for the
 systemd system and service manager.
 
-This is common config, use /etc/systemd/system to override.
+This is common config, use %{_sysconfdir}/systemd/system to override.
 
 %package gtk
 Summary:	Graphical frontend for systemd
@@ -269,7 +268,7 @@
 	fi
 
 	# And symlink what we found to the new-style default.target
-	ln -sf "$target" /etc/systemd/system/default.target >/dev/null 2>&1 || :
+	ln -s "$target" %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
 
 	# Enable the services we install by default.
 	/bin/systemctl enable \
@@ -287,7 +286,7 @@
 		systemd-readahead-replay.service \
 		systemd-readahead-collect.service >/dev/null 2>&1 || :
 
-	%{__rm} -f /etc/systemd/system/default.target >/dev/null 2>&1 || :
+	%{__rm} -f %{_sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
 fi
 
 %postun units
@@ -467,6 +466,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2011/12/06 21:34:50  gotar
+- don't use literal /etc: subdirectories are managed by systemctl,
+  distribution provided files go to *lib/, so it's relocatable
+
 Revision 1.66  2011/12/06 21:15:57  gotar
 - separated init subpackage, gtk bcond fixed again
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.66&r2=1.67&f=u