summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch142
1 files changed, 142 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
new file mode 100644
index 0000000000..b5b0168149
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
@@ -0,0 +1,142 @@
1From aeb50ff0bd4bbbca74c4695072232348351d512d Mon Sep 17 00:00:00 2001
2From: Tom Gundersen <teg@jklm.no>
3Date: Wed, 27 Aug 2014 17:45:41 +0200
4Subject: [PATCH] tmpfiles: make resolv.conf entry conditional on resolved
5 support
6
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10---
11 Makefile.am | 15 +++++++++++++--
12 TODO | 2 --
13 configure.ac | 1 +
14 tmpfiles.d/.gitignore | 1 +
15 tmpfiles.d/{etc.conf => etc.conf.m4} | 2 ++
16 5 files changed, 17 insertions(+), 4 deletions(-)
17 create mode 100644 tmpfiles.d/.gitignore
18 rename tmpfiles.d/{etc.conf => etc.conf.m4} (95%)
19
20Index: git/Makefile.am
21===================================================================
22--- git.orig/Makefile.am 2015-01-24 00:41:20.134716451 -0800
23+++ git/Makefile.am 2015-01-24 00:41:20.126716451 -0800
24@@ -1935,14 +1935,16 @@
25 units/systemd-tmpfiles-setup.service \
26 units/systemd-tmpfiles-clean.service
27
28+nodist_tmpfiles_DATA = \
29+ tmpfiles.d/etc.conf
30+
31 dist_tmpfiles_DATA = \
32 tmpfiles.d/systemd.conf \
33 tmpfiles.d/systemd-nologin.conf \
34 tmpfiles.d/systemd-remote.conf \
35 tmpfiles.d/tmp.conf \
36 tmpfiles.d/x11.conf \
37- tmpfiles.d/var.conf \
38- tmpfiles.d/etc.conf
39+ tmpfiles.d/var.conf
40
41 if HAVE_SYSV_COMPAT
42 dist_tmpfiles_DATA += \
43@@ -1965,10 +1967,14 @@
44 endif
45
46 EXTRA_DIST += \
47+ tmpfiles.d/etc.conf.m4 \
48 units/systemd-tmpfiles-setup-dev.service.in \
49 units/systemd-tmpfiles-setup.service.in \
50 units/systemd-tmpfiles-clean.service.in
51
52+CLEANFILES += \
53+ tmpfiles.d/etc.conf
54+
55 # ------------------------------------------------------------------------------
56 if ENABLE_SYSUSERS
57 systemd_sysusers_SOURCES = \
58@@ -5684,6 +5690,11 @@
59 $(AM_V_at)$(MKDIR_P) $(dir $@)
60 $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
61
62+tmpfiles.d/%: tmpfiles.d/%.m4
63+ $(AM_V_at)$(MKDIR_P) $(dir $@)
64+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
65+
66+
67 units/%: units/%.m4
68 $(AM_V_at)$(MKDIR_P) $(dir $@)
69 $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
70Index: git/TODO
71===================================================================
72--- git.orig/TODO 2015-01-24 00:41:20.134716451 -0800
73+++ git/TODO 2015-01-24 00:41:20.126716451 -0800
74@@ -111,8 +111,6 @@
75
76 * Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
77
78-* the resolv.conf tmpfiles line should be covered by ENABLE_NETWORKD...
79-
80 * Add a new verb "systemctl top"
81
82 * logind: allow users to kill or lock their own sessions
83Index: git/configure.ac
84===================================================================
85--- git.orig/configure.ac 2015-01-24 00:41:20.134716451 -0800
86+++ git/configure.ac 2015-01-24 00:41:20.126716451 -0800
87@@ -1041,6 +1041,7 @@
88 AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
89 if test "x$enable_resolved" != "xno"; then
90 have_resolved=yes
91+ M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
92 fi
93 AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])
94
95Index: git/tmpfiles.d/.gitignore
96===================================================================
97--- /dev/null 1970-01-01 00:00:00.000000000 +0000
98+++ git/tmpfiles.d/.gitignore 2015-01-24 00:41:20.126716451 -0800
99@@ -0,0 +1 @@
100+etc.conf
101Index: git/tmpfiles.d/etc.conf
102===================================================================
103--- git.orig/tmpfiles.d/etc.conf 2015-01-24 00:41:20.134716451 -0800
104+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
105@@ -1,15 +0,0 @@
106-# This file is part of systemd.
107-#
108-# systemd is free software; you can redistribute it and/or modify it
109-# under the terms of the GNU Lesser General Public License as published by
110-# the Free Software Foundation; either version 2.1 of the License, or
111-# (at your option) any later version.
112-
113-# See tmpfiles.d(5) for details
114-
115-L /etc/os-release - - - - ../usr/lib/os-release
116-L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
117-L+ /etc/mtab - - - - ../proc/self/mounts
118-L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
119-C /etc/nsswitch.conf - - - -
120-C /etc/pam.d - - - -
121Index: git/tmpfiles.d/etc.conf.m4
122===================================================================
123--- /dev/null 1970-01-01 00:00:00.000000000 +0000
124+++ git/tmpfiles.d/etc.conf.m4 2015-01-24 00:41:20.126716451 -0800
125@@ -0,0 +1,17 @@
126+# This file is part of systemd.
127+#
128+# systemd is free software; you can redistribute it and/or modify it
129+# under the terms of the GNU Lesser General Public License as published by
130+# the Free Software Foundation; either version 2.1 of the License, or
131+# (at your option) any later version.
132+
133+# See tmpfiles.d(5) for details
134+
135+L /etc/os-release - - - - ../usr/lib/os-release
136+L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
137+L+ /etc/mtab - - - - ../proc/self/mounts
138+m4_ifdef(`ENABLE_RESOLVED',
139+L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
140+)
141+C /etc/nsswitch.conf - - - -
142+C /etc/pam.d - - - -
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-05 04:07:49 +0000