[packages/systemd] Include the 'factory' files

jajcus jajcus at pld-linux.org
Thu May 14 11:10:45 CEST 2015


commit d1ac392b29ad733f150d9c37e025b2b541a79f0d
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Thu May 14 11:07:27 2015 +0200

    Include the 'factory' files
    
    They are used by systemd only in the target files do not exist, which
    may be convenient when creating simple containers or booting a slightly
    broken system. The files provided by systemd are quite minimal, but
    should work in most case.
    
    Including that fixes another annoying error message in boot logs.

 systemd.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index a74a94f..47cd5af 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - consider providing the factory files via appropriate packages (setup, pam)
 # - merge rpm macros provided by systemd with ours
 # - handle udev package removal:
 #   - http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2014-March/023852.html
@@ -6,10 +7,6 @@
 # - dev->udev upgrade:
 #   - /dev/urandom remains missing, not created with start_udev anymore
 #
-#	/usr/share/factory/etc/nsswitch.conf
-#	/usr/share/factory/etc/pam.d/other
-#	/usr/share/factory/etc/pam.d/system-auth
-#
 # Conditional build:
 %bcond_without	audit		# without audit support
 %bcond_without	cryptsetup	# without cryptsetup support
@@ -132,7 +129,7 @@ Requires:	SysVinit-tools
 Requires:	agetty
 %{?with_cryptsetup:Requires:	cryptsetup >= 1.6.0}
 Requires:	dbus >= 1.4.16-6
-Requires:	filesystem >= 4.0-3
+Requires:	filesystem >= 4.0-39
 Requires:	kmod >= 14
 %{?with_microhttpd:Requires:	libmicrohttpd >= 0.9.33}
 Requires:	libutempter
@@ -1266,6 +1263,9 @@ fi
 %{?with_microhttpd:%{_datadir}/systemd/gatewayd}
 %{_datadir}/systemd/kbd-model-map
 %{_datadir}/systemd/language-fallback-map
+%{_datadir}/factory/etc/nsswitch.conf
+%{_datadir}/factory/etc/pam.d/other
+%{_datadir}/factory/etc/pam.d/system-auth
 %{_mandir}/man1/bootctl.1*
 %{_mandir}/man1/busctl.1*
 %{_mandir}/man1/coredumpctl.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/44a98f2cfd49009adfe502bc769eecec1965e876



More information about the pld-cvs-commit mailing list