anitazha / rpms / systemd

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