0004-Build-drop-pam-nsswitch-ship-legacy-tmpfiles-disable.patch

From 818ad57591b70580930b0fe4b1cecfe0fd54b687 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Thu, 5 Apr 2018 10:02:14 -0700
Subject: [PATCH 04/38] Build: drop pam/nsswitch, ship legacy tmpfiles, disable
 resolved as default resolver at boot.

Adapted from Makefile.am patch by Dimitri John Ledkov.

Write the resolv.conf at boot immediately.

Let docker, etc, use the direct nameserver information in
/etc/resolv.conf, instead of redirecting to the stub resolver in
systemd-resolved. The stub resolver fails on CNAME resolution and
breaks various applications.

Ref: https://github.com/coreos/coreos-overlay/pull/2129/commits/76830bedf02a8c54e1d2ce30796046b86bb00b94
---
 meson.build            | 6 ++----
 tmpfiles.d/etc.conf.in | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 36cbfa4893..d6e335ee7d 100644
--- a/meson.build
+++ b/meson.build
@@ -189,7 +189,6 @@ udevhwdbdir = udevlibexecdir / 'hwdb.d'
 catalogdir = prefixdir / 'lib/systemd/catalog'
 kerneldir = prefixdir / 'lib/kernel'
 kernelinstalldir = kerneldir / 'install.d'
-factorydir = datadir / 'factory'
 bootlibdir = prefixdir / 'lib/systemd/boot/efi'
 testsdir = prefixdir / 'lib/systemd/tests'
 systemdstatedir = localstatedir / 'lib/systemd'
@@ -3901,9 +3900,8 @@ subdir('shell-completion/zsh')
 subdir('docs/sysvinit')
 subdir('docs/var-log')
 
-install_subdir('factory/etc',
-               install_dir : factorydir)
-subdir('factory/templates')
+# FIXME: figure out if the warning is true:
+# https://github.com/mesonbuild/meson/wiki/Reference-manual#install_subdir
 
 if install_sysconfdir
         install_data('xorg/50-systemd-user.sh',
diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in
index 2fdd498da5..64306e747d 100644
--- a/tmpfiles.d/etc.conf.in
+++ b/tmpfiles.d/etc.conf.in
@@ -7,12 +7,14 @@
 
 # See tmpfiles.d(5) for details
 
-L /etc/os-release - - - - ../usr/lib/os-release
 L+ /etc/mtab - - - - ../proc/self/mounts
 {% if HAVE_SMACK_RUN_LABEL %}
 t /etc/mtab - - - - security.SMACK64=_
 {% endif %}
 C! /etc/locale.conf - - - -
+{% if ENABLE_RESOLVE %}
+L+! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
+{% endif %}
 C! /etc/nsswitch.conf - - - -
 {% if HAVE_PAM %}
 C! /etc/pam.d - - - -
-- 
2.36.1