Differential D12667 Diff 31470 files/0001-Don-t-try-to-set-nsswitch-and-don-t-attempt-to-butch.patch

Changeset View

Standalone View

	From c8ddba747db9bd39cfa134bdf5a3b8f307e7f480 Mon Sep 17 00:00:00 2001			From c8ddba747db9bd39cfa134bdf5a3b8f307e7f480 Mon Sep 17 00:00:00 2001
	From: Joshua Strobl <joshua@streambits.io>			From: Joshua Strobl <joshua@streambits.io>
	Date: Mon, 13 Jan 2020 13:28:36 +0200			Date: Mon, 13 Jan 2020 13:28:36 +0200
	Subject: [PATCH 1/1] Don't try to set nsswitch and don't attempt to butcher			Subject: [PATCH 1/1] Don't try to set nsswitch and don't attempt to butcher
	our PAM.			our PAM.

	---			---
	tmpfiles.d/etc.conf.m4 \| 4 ----			tmpfiles.d/etc.conf.in \| 4 ----
	1 file changed, 4 deletions(-)			1 file changed, 4 deletions(-)

	diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4			diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in
	index f82e0b82ce..9c6e2f0bcb 100644			index ebdc699c26..d856625320 100644
	--- a/tmpfiles.d/etc.conf.m4			--- a/tmpfiles.d/etc.conf.in
	+++ b/tmpfiles.d/etc.conf.m4			+++ b/tmpfiles.d/etc.conf.in
	@@ -15,8 +15,4 @@ t /etc/mtab - - - - security.SMACK64=_			@@ -12,8 +12,4 @@ L+ /etc/mtab - - - - ../proc/self/mounts
	m4_ifdef(`ENABLE_RESOLVE',			{% if HAVE_SMACK_RUN_LABEL %}
	L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf			t /etc/mtab - - - - security.SMACK64=_
	)m4_dnl			{% endif %}
	-C! /etc/nsswitch.conf - - - -			-C! /etc/nsswitch.conf - - - -
	-m4_ifdef(`HAVE_PAM',			-{% if HAVE_PAM %}
	-C! /etc/pam.d - - - -			-C! /etc/pam.d - - - -
	-)m4_dnl			-{% endif %}
	C! /etc/issue - - - -			C! /etc/issue - - - -
	--			--
	2.24.1			2.24.1