daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
803fb7
From c5177fff7f87e08175f6a5c9dba204ea31bfd13a Mon Sep 17 00:00:00 2001
803fb7
From: Lukas Nykryn <lnykryn@redhat.com>
803fb7
Date: Thu, 16 Apr 2015 11:53:05 +0200
803fb7
Subject: [PATCH] factory: we don't want that
803fb7
803fb7
---
803fb7
 Makefile.am            | 16 ++++++++--------
803fb7
 tmpfiles.d/etc.conf.m4 |  2 --
803fb7
 2 files changed, 8 insertions(+), 10 deletions(-)
803fb7
803fb7
diff --git a/Makefile.am b/Makefile.am
803fb7
index 6d6b650f2..8474b2912 100644
803fb7
--- a/Makefile.am
803fb7
+++ b/Makefile.am
803fb7
@@ -2288,14 +2288,14 @@ INSTALL_DIRS += \
803fb7
 endif
803fb7
 
803fb7
 # ------------------------------------------------------------------------------
803fb7
-dist_factory_etc_DATA = \
803fb7
-	factory/etc/nsswitch.conf
803fb7
-
803fb7
-if HAVE_PAM
803fb7
-dist_factory_pam_DATA = \
803fb7
-	factory/etc/pam.d/system-auth \
803fb7
-	factory/etc/pam.d/other
803fb7
-endif
803fb7
+#dist_factory_etc_DATA = \
803fb7
+#	factory/etc/nsswitch.conf
803fb7
+#
803fb7
+#if HAVE_PAM
803fb7
+#dist_factory_pam_DATA = \
803fb7
+#	factory/etc/pam.d/system-auth \
803fb7
+#	factory/etc/pam.d/other
803fb7
+#endif
803fb7
 
803fb7
 # ------------------------------------------------------------------------------
803fb7
 if ENABLE_FIRSTBOOT
803fb7
diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4
803fb7
index 125d6e0a1..4937719bd 100644
803fb7
--- a/tmpfiles.d/etc.conf.m4
803fb7
+++ b/tmpfiles.d/etc.conf.m4
803fb7
@@ -10,5 +10,3 @@
803fb7
 L /etc/os-release - - - - ../usr/lib/os-release
803fb7
 L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
803fb7
 L+ /etc/mtab - - - - ../proc/self/mounts
803fb7
-C /etc/nsswitch.conf - - - -
803fb7
-C /etc/pam.d - - - -