1 |
commit: 0ccf6576c110503b33b71af18649d54568fe208a |
2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
3 |
AuthorDate: Wed Aug 5 00:18:41 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 7 16:59:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccf6576 |
7 |
|
8 |
sys-kernel/dracut: Revbump 050, multiple upstream fixes |
9 |
|
10 |
* fix LVM activation |
11 |
* workaround for BTRFS mounts on slow machines |
12 |
* install NetworkManager initque/finished hook |
13 |
* POSIX shell compatibility fixes |
14 |
* remove deprecated "syslog" parameter from systemd units |
15 |
|
16 |
Closes: https://bugs.gentoo.org/724474 |
17 |
Closes: https://bugs.gentoo.org/734166 |
18 |
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> |
19 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
20 |
Closes: https://github.com/gentoo/gentoo/pull/17004 |
21 |
|
22 |
sys-kernel/dracut/dracut-050-r2.ebuild | 171 +++++++++++++++ |
23 |
.../050-btrfs-force-preload-btrfs-module.patch | 30 +++ |
24 |
...sh-quote-variables-in-parameter-expansion.patch | 111 ++++++++++ |
25 |
...lvm-fix-removal-of-pvscan-from-udev-rules.patch | 26 +++ |
26 |
...ager-ensure-that-nm-run.sh-is-executed-wh.patch | 48 ++++ |
27 |
...-systemd-remove-obsolete-syslog-parameter.patch | 241 +++++++++++++++++++++ |
28 |
6 files changed, 627 insertions(+) |
29 |
|
30 |
diff --git a/sys-kernel/dracut/dracut-050-r2.ebuild b/sys-kernel/dracut/dracut-050-r2.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..db03491b7c2 |
33 |
--- /dev/null |
34 |
+++ b/sys-kernel/dracut/dracut-050-r2.ebuild |
35 |
@@ -0,0 +1,171 @@ |
36 |
+# Copyright 1999-2020 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=7 |
40 |
+ |
41 |
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs |
42 |
+ |
43 |
+if [[ ${PV} == 9999 ]] ; then |
44 |
+ inherit git-r3 |
45 |
+ EGIT_REPO_URI="https://github.com/dracutdevs/dracut" |
46 |
+else |
47 |
+ [[ "${PV}" = *_rc* ]] || \ |
48 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
49 |
+ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz" |
50 |
+fi |
51 |
+ |
52 |
+DESCRIPTION="Generic initramfs generation tool" |
53 |
+HOMEPAGE="https://dracut.wiki.kernel.org" |
54 |
+ |
55 |
+LICENSE="GPL-2" |
56 |
+SLOT="0" |
57 |
+IUSE="selinux" |
58 |
+ |
59 |
+# Tests need root privileges, bug #298014 |
60 |
+RESTRICT="test" |
61 |
+ |
62 |
+RDEPEND=" |
63 |
+ app-arch/cpio |
64 |
+ >=app-shells/bash-4.0:0 |
65 |
+ sys-apps/coreutils[xattr(-)] |
66 |
+ >=sys-apps/kmod-23[tools] |
67 |
+ || ( |
68 |
+ >=sys-apps/sysvinit-2.87-r3 |
69 |
+ sys-apps/openrc[sysv-utils(-),selinux?] |
70 |
+ sys-apps/systemd[sysv-utils] |
71 |
+ ) |
72 |
+ >=sys-apps/util-linux-2.21 |
73 |
+ virtual/pkgconfig |
74 |
+ virtual/udev |
75 |
+ |
76 |
+ elibc_musl? ( sys-libs/fts-standalone ) |
77 |
+ selinux? ( |
78 |
+ sec-policy/selinux-dracut |
79 |
+ sys-libs/libselinux |
80 |
+ sys-libs/libsepol |
81 |
+ ) |
82 |
+" |
83 |
+DEPEND=" |
84 |
+ >=sys-apps/kmod-23 |
85 |
+ elibc_musl? ( sys-libs/fts-standalone ) |
86 |
+" |
87 |
+ |
88 |
+BDEPEND=" |
89 |
+ app-text/asciidoc |
90 |
+ app-text/docbook-xml-dtd:4.5 |
91 |
+ >=app-text/docbook-xsl-stylesheets-1.75.2 |
92 |
+ >=dev-libs/libxslt-1.1.26 |
93 |
+ virtual/pkgconfig |
94 |
+" |
95 |
+ |
96 |
+DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules |
97 |
+ README.testsuite TODO ) |
98 |
+ |
99 |
+QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
100 |
+ |
101 |
+PATCHES=( |
102 |
+ "${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch |
103 |
+ "${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch |
104 |
+ "${FILESDIR}"/050-Makefile-fix-VERSION-again.patch |
105 |
+ "${FILESDIR}"/050-btrfs-force-preload-btrfs-module.patch |
106 |
+ "${FILESDIR}"/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch |
107 |
+ "${FILESDIR}"/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch |
108 |
+ "${FILESDIR}"/050-busybox-module-fix.patch |
109 |
+ "${FILESDIR}"/050-systemd-remove-obsolete-syslog-parameter.patch |
110 |
+ "${FILESDIR}"/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch |
111 |
+ "${FILESDIR}"/050-gentoo-ldconfig-paths.patch |
112 |
+) |
113 |
+ |
114 |
+src_configure() { |
115 |
+ local myconf=( |
116 |
+ --prefix="${EPREFIX}/usr" |
117 |
+ --sysconfdir="${EPREFIX}/etc" |
118 |
+ --bashcompletiondir="$(get_bashcompdir)" |
119 |
+ --systemdsystemunitdir="$(systemd_get_systemunitdir)" |
120 |
+ ) |
121 |
+ |
122 |
+ tc-export CC PKG_CONFIG |
123 |
+ |
124 |
+ echo ./configure "${myconf[@]}" |
125 |
+ ./configure "${myconf[@]}" || die |
126 |
+ |
127 |
+ if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then |
128 |
+ # Source tarball from github doesn't include this file |
129 |
+ echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die |
130 |
+ fi |
131 |
+} |
132 |
+ |
133 |
+src_install() { |
134 |
+ default |
135 |
+ |
136 |
+ insinto /etc/logrotate.d |
137 |
+ newins dracut.logrotate dracut |
138 |
+ |
139 |
+ docinto html |
140 |
+ dodoc dracut.html |
141 |
+} |
142 |
+ |
143 |
+pkg_postinst() { |
144 |
+ if linux-info_get_any_version && linux_config_exists; then |
145 |
+ ewarn "" |
146 |
+ ewarn "If the following test report contains a missing kernel" |
147 |
+ ewarn "configuration option, you should reconfigure and rebuild your" |
148 |
+ ewarn "kernel before booting image generated with this Dracut version." |
149 |
+ ewarn "" |
150 |
+ |
151 |
+ local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
152 |
+ |
153 |
+ # Kernel configuration options descriptions: |
154 |
+ local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" ' |
155 |
+ ERROR_DEVTMPFS+='is missing and REQUIRED' |
156 |
+ local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk ' |
157 |
+ ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED' |
158 |
+ |
159 |
+ check_extra_config |
160 |
+ echo |
161 |
+ else |
162 |
+ ewarn "" |
163 |
+ ewarn "Your kernel configuration couldn't be checked." |
164 |
+ ewarn "Please check manually if following options are enabled:" |
165 |
+ ewarn "" |
166 |
+ ewarn " CONFIG_BLK_DEV_INITRD" |
167 |
+ ewarn " CONFIG_DEVTMPFS" |
168 |
+ ewarn "" |
169 |
+ fi |
170 |
+ |
171 |
+ elog "To get additional features, a number of optional runtime" |
172 |
+ elog "dependencies may be installed:" |
173 |
+ elog "" |
174 |
+ optfeature "Networking support" net-misc/networkmanager |
175 |
+ optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \ |
176 |
+ sys-apps/iproute2 "net-misc/iputils[arping]" |
177 |
+ optfeature \ |
178 |
+ "Measure performance of the boot process for later visualisation" \ |
179 |
+ app-benchmarks/bootchart2 app-admin/killproc sys-process/acct |
180 |
+ optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
181 |
+ optfeature "Load kernel modules and drop this privilege for real init" \ |
182 |
+ sys-libs/libcap |
183 |
+ optfeature "Support CIFS" net-fs/cifs-utils |
184 |
+ optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
185 |
+ "sys-fs/cryptsetup[-static-libs]" |
186 |
+ optfeature "Support for GPG-encrypted keys for crypt module" \ |
187 |
+ app-crypt/gnupg |
188 |
+ optfeature \ |
189 |
+ "Allows use of dash instead of default bash (on your own risk)" \ |
190 |
+ app-shells/dash |
191 |
+ optfeature "Support iSCSI" sys-block/open-iscsi |
192 |
+ optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
193 |
+ optfeature "Support MD devices, also known as software RAID devices" \ |
194 |
+ sys-fs/mdadm |
195 |
+ optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
196 |
+ optfeature "Plymouth boot splash" '>=sys-boot/plymouth-0.8.5-r5' |
197 |
+ optfeature "Support network block devices" sys-block/nbd |
198 |
+ optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
199 |
+ optfeature \ |
200 |
+ "Install ssh and scp along with config files and specified keys" \ |
201 |
+ net-misc/openssh |
202 |
+ optfeature "Enable logging with rsyslog" app-admin/rsyslog |
203 |
+ optfeature \ |
204 |
+ "Enable rngd service to help generating entropy early during boot" \ |
205 |
+ sys-apps/rng-tools |
206 |
+} |
207 |
|
208 |
diff --git a/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch b/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch |
209 |
new file mode 100644 |
210 |
index 00000000000..386722c2ae8 |
211 |
--- /dev/null |
212 |
+++ b/sys-kernel/dracut/files/050-btrfs-force-preload-btrfs-module.patch |
213 |
@@ -0,0 +1,30 @@ |
214 |
+From 0402b3777b1c64bd716f588ff7457b905e98489d Mon Sep 17 00:00:00 2001 |
215 |
+From: Harald Hoyer <harald@××××××.com> |
216 |
+Date: Wed, 11 Mar 2020 12:56:52 +0100 |
217 |
+Subject: [PATCH] btrfs: force preload btrfs module |
218 |
+ |
219 |
+fixes https://github.com/dracutdevs/dracut/issues/658 |
220 |
+ |
221 |
+raid6_pq and xor takes time doing benchmarking |
222 |
+ |
223 |
+[ 3.983009] request_module fs-btrfs succeeded, but still no fs? |
224 |
+--- |
225 |
+ modules.d/90btrfs/module-setup.sh | 4 +++- |
226 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
227 |
+ |
228 |
+diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh |
229 |
+index b0d0058b..66a254e1 100755 |
230 |
+--- a/modules.d/90btrfs/module-setup.sh |
231 |
++++ b/modules.d/90btrfs/module-setup.sh |
232 |
+@@ -48,5 +48,7 @@ install() { |
233 |
+ |
234 |
+ inst_multiple -o btrfsck btrfs-zero-log |
235 |
+ inst $(command -v btrfs) /sbin/btrfs |
236 |
++ # Hack for slow machines |
237 |
++ # see https://github.com/dracutdevs/dracut/issues/658 |
238 |
++ echo "rd.driver.pre=btrfs" > ${initdir}/etc/cmdline.d/00-btrfs.conf |
239 |
+ } |
240 |
+- |
241 |
+-- |
242 |
+2.26.2 |
243 |
+ |
244 |
|
245 |
diff --git a/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch b/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch |
246 |
new file mode 100644 |
247 |
index 00000000000..11ca7add6d6 |
248 |
--- /dev/null |
249 |
+++ b/sys-kernel/dracut/files/050-dracut-lib.sh-quote-variables-in-parameter-expansion.patch |
250 |
@@ -0,0 +1,111 @@ |
251 |
+From 8e1a4dc5f8a777fc718db490414ffdc9dc755f66 Mon Sep 17 00:00:00 2001 |
252 |
+From: Jonas Witschel <diabonas@×××××××××.org> |
253 |
+Date: Sat, 18 Apr 2020 14:55:41 +0200 |
254 |
+Subject: [PATCH] dracut-lib.sh: quote variables in parameter expansion |
255 |
+ patterns |
256 |
+ |
257 |
+According to POSIX.1-2017, 2.6.2 Parameter Expansion: |
258 |
+ |
259 |
+${parameter%[word]} [...] The word shall be expanded to produce a |
260 |
+pattern. |
261 |
+ |
262 |
+This means if word contains variables that itself contain special |
263 |
+characters like asterisks or backslashes, these are treated as pattern |
264 |
+characters unless the variable is quoted. Try e.g. the following example |
265 |
+in bash, dash or (busybox) ash: |
266 |
+ |
267 |
+i='a\c'; j='\'; echo "${i%$j*}" |
268 |
+ |
269 |
+This prints "a\c" because "$j*" is expanded to "\*", escaping the |
270 |
+asterisk. In contrast, |
271 |
+ |
272 |
+i='a\c'; j='\'; echo "${i%"$j"*}" |
273 |
+ |
274 |
+produces the expected result "a" because the backslash is not specially |
275 |
+treated any more after quoting. |
276 |
+ |
277 |
+The quotes that this commit adds have been previously removed in commit |
278 |
+f9c96cf56fed390841eac05c43826e62014c9188, citing issues with busybox |
279 |
+hush without further specifying the actual error. I tested a recent |
280 |
+busybox build (upstream commit 9aa751b08ab03d6396f86c3df77937a19687981b) |
281 |
+and couldn't find any problems. Note that the above example always |
282 |
+produces "a\c" in hush regardless of quoting $j, making hush unsuitable |
283 |
+for use with dracut, but using quotes in parameter expansions generally |
284 |
+works. |
285 |
+ |
286 |
+The unquoted variables break the "rd.luks.uuid/name" kernel command line |
287 |
+options in dracut 050 because |
288 |
+ |
289 |
+str_replace "$luksname" '\' '\\' |
290 |
+ |
291 |
+in modules.d/90crypt/parse-crypt.sh is not able to escape the |
292 |
+backslashes any more, see GH-723, GH-727: backslashes in the |
293 |
+systemd-cryptsetup@.service unit name stay unescaped for use in udev |
294 |
+(cf. commit 0f6d93eb9d63695a64002ec8b0421fbc9fc8a7a3), leading to |
295 |
+failures in starting the unit. |
296 |
+ |
297 |
+This partially reverts commit f9c96cf56fed390841eac05c43826e62014c9188. |
298 |
+--- |
299 |
+ modules.d/99base/dracut-lib.sh | 16 ++++++++-------- |
300 |
+ 1 file changed, 8 insertions(+), 8 deletions(-) |
301 |
+ |
302 |
+diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh |
303 |
+index c53cd13b..c57523d3 100755 |
304 |
+--- a/modules.d/99base/dracut-lib.sh |
305 |
++++ b/modules.d/99base/dracut-lib.sh |
306 |
+@@ -24,7 +24,7 @@ debug_on() { |
307 |
+ |
308 |
+ # returns OK if $1 contains literal string $2 (and isn't empty) |
309 |
+ strstr() { |
310 |
+- [ "${1##*$2*}" != "$1" ] |
311 |
++ [ "${1##*"$2"*}" != "$1" ] |
312 |
+ } |
313 |
+ |
314 |
+ # returns OK if $1 matches (completely) glob pattern $2 |
315 |
+@@ -43,18 +43,18 @@ strglobin() { |
316 |
+ |
317 |
+ # returns OK if $1 contains literal string $2 at the beginning, and isn't empty |
318 |
+ str_starts() { |
319 |
+- [ "${1#$2*}" != "$1" ] |
320 |
++ [ "${1#"$2"*}" != "$1" ] |
321 |
+ } |
322 |
+ |
323 |
+ # returns OK if $1 contains literal string $2 at the end, and isn't empty |
324 |
+ str_ends() { |
325 |
+- [ "${1%*$2}" != "$1" ] |
326 |
++ [ "${1%*"$2"}" != "$1" ] |
327 |
+ } |
328 |
+ |
329 |
+ trim() { |
330 |
+ local var="$*" |
331 |
+- var="${var#${var%%[![:space:]]*}}" # remove leading whitespace characters |
332 |
+- var="${var%${var##*[![:space:]]}}" # remove trailing whitespace characters |
333 |
++ var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters |
334 |
++ var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters |
335 |
+ printf "%s" "$var" |
336 |
+ } |
337 |
+ |
338 |
+@@ -108,9 +108,9 @@ str_replace() { |
339 |
+ local out='' |
340 |
+ |
341 |
+ while strstr "${in}" "$s"; do |
342 |
+- chop="${in%%$s*}" |
343 |
++ chop="${in%%"$s"*}" |
344 |
+ out="${out}${chop}$r" |
345 |
+- in="${in#*$s}" |
346 |
++ in="${in#*"$s"}" |
347 |
+ done |
348 |
+ echo "${out}${in}" |
349 |
+ } |
350 |
+@@ -396,7 +396,7 @@ splitsep() { |
351 |
+ while [ -n "$str" -a "$#" -gt 1 ]; do |
352 |
+ tmp="${str%%$sep*}" |
353 |
+ eval "$1='${tmp}'" |
354 |
+- str="${str#$tmp}" |
355 |
++ str="${str#"$tmp"}" |
356 |
+ str="${str#$sep}" |
357 |
+ shift |
358 |
+ done |
359 |
+-- |
360 |
+2.26.2 |
361 |
+ |
362 |
|
363 |
diff --git a/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch b/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch |
364 |
new file mode 100644 |
365 |
index 00000000000..8b93afc358e |
366 |
--- /dev/null |
367 |
+++ b/sys-kernel/dracut/files/050-lvm-fix-removal-of-pvscan-from-udev-rules.patch |
368 |
@@ -0,0 +1,26 @@ |
369 |
+From 07417b7fc5cb261187519c916e4735189f20f4c6 Mon Sep 17 00:00:00 2001 |
370 |
+From: Alexander Tsoy <alexander@××××.me> |
371 |
+Date: Sat, 23 May 2020 18:03:47 +0300 |
372 |
+Subject: [PATCH] lvm: fix removal of pvscan from udev rules |
373 |
+ |
374 |
+udev rules provided by lvm 2.02.128 and newer uses '+=' instead of '='. |
375 |
+--- |
376 |
+ modules.d/90lvm/module-setup.sh | 2 +- |
377 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
378 |
+ |
379 |
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh |
380 |
+index d6d2c185..52c803f7 100755 |
381 |
+--- a/modules.d/90lvm/module-setup.sh |
382 |
++++ b/modules.d/90lvm/module-setup.sh |
383 |
+@@ -101,7 +101,7 @@ install() { |
384 |
+ sed -i -e 's/^ENV{SYSTEMD_ALIAS}=.*/# No LVM pvscan in dracut - lvmetad is not running yet/' \ |
385 |
+ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules |
386 |
+ sed -i -e 's/^ENV{ID_MODEL}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules |
387 |
+- sed -i -e 's/^ENV{SYSTEMD_WANTS}=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules |
388 |
++ sed -i -e 's/^ENV{SYSTEMD_WANTS}+\?=.*//' ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules |
389 |
+ else |
390 |
+ sed -i -e 's/.*lvm pvscan.*/# No LVM pvscan for in dracut - lvmetad is not running yet/' \ |
391 |
+ ${initdir}/lib/udev/rules.d/69-dm-lvm-metad.rules |
392 |
+-- |
393 |
+2.26.2 |
394 |
+ |
395 |
|
396 |
diff --git a/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch b/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch |
397 |
new file mode 100644 |
398 |
index 00000000000..d97193c9b13 |
399 |
--- /dev/null |
400 |
+++ b/sys-kernel/dracut/files/050-network-manager-ensure-that-nm-run.sh-is-executed-wh.patch |
401 |
@@ -0,0 +1,48 @@ |
402 |
+From 3dcaa97ca4dcfa8092252a22df62c60941e59ce3 Mon Sep 17 00:00:00 2001 |
403 |
+From: Beniamino Galvani <bgalvani@××××××.com> |
404 |
+Date: Wed, 11 Mar 2020 09:40:50 +0100 |
405 |
+Subject: [PATCH] network-manager: ensure that nm-run.sh is executed when |
406 |
+ needed |
407 |
+ |
408 |
+The network-manager command line hook must install a |
409 |
+initqueue/finished hook to ensure that nm-run.sh is executed when |
410 |
+there are network connections to activate. |
411 |
+ |
412 |
+Fixes: #694 |
413 |
+--- |
414 |
+ modules.d/35network-manager/nm-config.sh | 11 +++++++++++ |
415 |
+ modules.d/35network-manager/nm-run.sh | 2 ++ |
416 |
+ 2 files changed, 13 insertions(+) |
417 |
+ |
418 |
+diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh |
419 |
+index 1efa737c..39a1c8bd 100755 |
420 |
+--- a/modules.d/35network-manager/nm-config.sh |
421 |
++++ b/modules.d/35network-manager/nm-config.sh |
422 |
+@@ -5,3 +5,14 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then |
423 |
+ fi |
424 |
+ |
425 |
+ /usr/libexec/nm-initrd-generator -- $(getcmdline) |
426 |
++ |
427 |
++if getargbool 0 rd.neednet; then |
428 |
++ for i in /usr/lib/NetworkManager/system-connections/* \ |
429 |
++ /run/NetworkManager/system-connections/* \ |
430 |
++ /etc/NetworkManager/system-connections/* \ |
431 |
++ /etc/sysconfig/network-scripts/ifcfg-*; do |
432 |
++ [ -f "$i" ] || continue |
433 |
++ echo '[ -f /tmp/nm.done ]' >$hookdir/initqueue/finished/nm.sh |
434 |
++ break |
435 |
++ done |
436 |
++fi |
437 |
+diff --git a/modules.d/35network-manager/nm-run.sh b/modules.d/35network-manager/nm-run.sh |
438 |
+index 4079b735..fc5280a1 100755 |
439 |
+--- a/modules.d/35network-manager/nm-run.sh |
440 |
++++ b/modules.d/35network-manager/nm-run.sh |
441 |
+@@ -22,3 +22,5 @@ do |
442 |
+ source_hook initqueue/online $ifname |
443 |
+ /sbin/netroot $ifname |
444 |
+ done |
445 |
++ |
446 |
++> /tmp/nm.done |
447 |
+-- |
448 |
+2.26.2 |
449 |
+ |
450 |
|
451 |
diff --git a/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch b/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch |
452 |
new file mode 100644 |
453 |
index 00000000000..f24cf11b37b |
454 |
--- /dev/null |
455 |
+++ b/sys-kernel/dracut/files/050-systemd-remove-obsolete-syslog-parameter.patch |
456 |
@@ -0,0 +1,241 @@ |
457 |
+From 265f696b532f63f0ac1f9f341e0469a6eafe2fdd Mon Sep 17 00:00:00 2001 |
458 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
459 |
+Date: Wed, 15 Jul 2020 14:26:00 +0000 |
460 |
+Subject: [PATCH 01/10] As of v246 of systemd "syslog" and "syslog-console" |
461 |
+ switches have been deprecated |
462 |
+ |
463 |
+--- |
464 |
+ modules.d/90stratis/stratisd-init.service | 2 -- |
465 |
+ 1 file changed, 2 deletions(-) |
466 |
+ |
467 |
+diff --git a/modules.d/90stratis/stratisd-init.service b/modules.d/90stratis/stratisd-init.service |
468 |
+index 318e8c27..1be2e33b 100644 |
469 |
+--- a/modules.d/90stratis/stratisd-init.service |
470 |
++++ b/modules.d/90stratis/stratisd-init.service |
471 |
+@@ -8,8 +8,6 @@ DefaultDependencies=no |
472 |
+ Type=simple |
473 |
+ ExecStart=/sbin/stratisd-init --debug |
474 |
+ KillSignal=SIGINT |
475 |
+-StandardOutput=syslog |
476 |
+-StandardError=syslog |
477 |
+ |
478 |
+ [Install] |
479 |
+ WantedBy=sysinit.target |
480 |
+-- |
481 |
+2.26.2 |
482 |
+ |
483 |
+From 38ba90bf88b38228e128c65be40a2da287c0b1ed Mon Sep 17 00:00:00 2001 |
484 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
485 |
+Date: Wed, 15 Jul 2020 14:29:34 +0000 |
486 |
+Subject: [PATCH 02/10] As of v246 of systemd "syslog" and "syslog-console" |
487 |
+ switches have been deprecated |
488 |
+ |
489 |
+--- |
490 |
+ modules.d/99squash/squash-mnt-clear.service | 4 ++-- |
491 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
492 |
+ |
493 |
+diff --git a/modules.d/99squash/squash-mnt-clear.service b/modules.d/99squash/squash-mnt-clear.service |
494 |
+index 84441f60..9d94c524 100644 |
495 |
+--- a/modules.d/99squash/squash-mnt-clear.service |
496 |
++++ b/modules.d/99squash/squash-mnt-clear.service |
497 |
+@@ -12,6 +12,6 @@ ConditionPathExists=/squash/root |
498 |
+ Type=oneshot |
499 |
+ RemainAfterExit=no |
500 |
+ StandardInput=null |
501 |
+-StandardOutput=syslog+console |
502 |
+-StandardError=syslog+console |
503 |
++StandardOutput=journal+console |
504 |
++StandardError=journal+console |
505 |
+ ExecStart=/squash/clear-squash.sh |
506 |
+-- |
507 |
+2.26.2 |
508 |
+ |
509 |
+From 5cb2a4004d18e4b96ddc18f221fae922350a9000 Mon Sep 17 00:00:00 2001 |
510 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
511 |
+Date: Wed, 15 Jul 2020 14:31:17 +0000 |
512 |
+Subject: [PATCH 03/10] As of v246 of systemd "syslog" and "syslog-console" |
513 |
+ switches have been deprecated |
514 |
+ |
515 |
+--- |
516 |
+ modules.d/98dracut-systemd/dracut-pre-trigger.service | 3 +-- |
517 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
518 |
+ |
519 |
+diff --git a/modules.d/98dracut-systemd/dracut-pre-trigger.service b/modules.d/98dracut-systemd/dracut-pre-trigger.service |
520 |
+index 7bf16167..6f1ba521 100644 |
521 |
+--- a/modules.d/98dracut-systemd/dracut-pre-trigger.service |
522 |
++++ b/modules.d/98dracut-systemd/dracut-pre-trigger.service |
523 |
+@@ -20,8 +20,7 @@ Environment=NEWROOT=/sysroot |
524 |
+ Type=oneshot |
525 |
+ ExecStart=-/bin/dracut-pre-trigger |
526 |
+ StandardInput=null |
527 |
+-StandardOutput=syslog |
528 |
+-StandardError=syslog+console |
529 |
++StandardError=journal+console |
530 |
+ KillMode=process |
531 |
+ RemainAfterExit=yes |
532 |
+ |
533 |
+-- |
534 |
+2.26.2 |
535 |
+ |
536 |
+From 317d841c788e841d3533515ceda5597a099eb64e Mon Sep 17 00:00:00 2001 |
537 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
538 |
+Date: Wed, 15 Jul 2020 14:31:59 +0000 |
539 |
+Subject: [PATCH 04/10] As of v246 of systemd "syslog" and "syslog-console" |
540 |
+ switches have been deprecated |
541 |
+ |
542 |
+--- |
543 |
+ modules.d/98dracut-systemd/dracut-initqueue.service | 3 +-- |
544 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
545 |
+ |
546 |
+diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service |
547 |
+index 207d545d..3a8679a5 100644 |
548 |
+--- a/modules.d/98dracut-systemd/dracut-initqueue.service |
549 |
++++ b/modules.d/98dracut-systemd/dracut-initqueue.service |
550 |
+@@ -21,8 +21,7 @@ Environment=NEWROOT=/sysroot |
551 |
+ Type=oneshot |
552 |
+ ExecStart=-/bin/dracut-initqueue |
553 |
+ StandardInput=null |
554 |
+-StandardOutput=syslog |
555 |
+-StandardError=syslog+console |
556 |
++StandardError=journal+console |
557 |
+ KillMode=process |
558 |
+ RemainAfterExit=yes |
559 |
+ |
560 |
+-- |
561 |
+2.26.2 |
562 |
+ |
563 |
+From 0c1bd016ecfb9c6d194c4356199b509d90db4071 Mon Sep 17 00:00:00 2001 |
564 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
565 |
+Date: Wed, 15 Jul 2020 14:32:44 +0000 |
566 |
+Subject: [PATCH 05/10] As of v246 of systemd "syslog" and "syslog-console" |
567 |
+ switches have been deprecated |
568 |
+ |
569 |
+--- |
570 |
+ modules.d/98dracut-systemd/dracut-pre-pivot.service | 3 +-- |
571 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
572 |
+ |
573 |
+diff --git a/modules.d/98dracut-systemd/dracut-pre-pivot.service b/modules.d/98dracut-systemd/dracut-pre-pivot.service |
574 |
+index 9a1f0854..e893d1dd 100644 |
575 |
+--- a/modules.d/98dracut-systemd/dracut-pre-pivot.service |
576 |
++++ b/modules.d/98dracut-systemd/dracut-pre-pivot.service |
577 |
+@@ -27,8 +27,7 @@ Environment=NEWROOT=/sysroot |
578 |
+ Type=oneshot |
579 |
+ ExecStart=-/bin/dracut-pre-pivot |
580 |
+ StandardInput=null |
581 |
+-StandardOutput=syslog |
582 |
+-StandardError=syslog+console |
583 |
++StandardError=journal+console |
584 |
+ KillMode=process |
585 |
+ RemainAfterExit=yes |
586 |
+ |
587 |
+-- |
588 |
+2.26.2 |
589 |
+ |
590 |
+From e1130a83405648777210fdc99f7eee087eebaadc Mon Sep 17 00:00:00 2001 |
591 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
592 |
+Date: Wed, 15 Jul 2020 14:33:33 +0000 |
593 |
+Subject: [PATCH 06/10] As of v246 of systemd "syslog" and "syslog-console" |
594 |
+ switches have been deprecated |
595 |
+ |
596 |
+--- |
597 |
+ modules.d/98dracut-systemd/dracut-pre-udev.service | 3 +-- |
598 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
599 |
+ |
600 |
+diff --git a/modules.d/98dracut-systemd/dracut-pre-udev.service b/modules.d/98dracut-systemd/dracut-pre-udev.service |
601 |
+index 570ec02d..e4092e35 100644 |
602 |
+--- a/modules.d/98dracut-systemd/dracut-pre-udev.service |
603 |
++++ b/modules.d/98dracut-systemd/dracut-pre-udev.service |
604 |
+@@ -24,8 +24,7 @@ Environment=NEWROOT=/sysroot |
605 |
+ Type=oneshot |
606 |
+ ExecStart=-/bin/dracut-pre-udev |
607 |
+ StandardInput=null |
608 |
+-StandardOutput=syslog |
609 |
+-StandardError=syslog+console |
610 |
++StandardError=journal+console |
611 |
+ KillMode=process |
612 |
+ RemainAfterExit=yes |
613 |
+ |
614 |
+-- |
615 |
+2.26.2 |
616 |
+ |
617 |
+From c437933cb0490e800e776cb7695d2ea0e95056a2 Mon Sep 17 00:00:00 2001 |
618 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
619 |
+Date: Wed, 15 Jul 2020 14:34:17 +0000 |
620 |
+Subject: [PATCH 07/10] As of v246 of systemd "syslog" and "syslog-console" |
621 |
+ switches have been deprecated |
622 |
+ |
623 |
+--- |
624 |
+ modules.d/98dracut-systemd/dracut-pre-mount.service | 3 +-- |
625 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
626 |
+ |
627 |
+diff --git a/modules.d/98dracut-systemd/dracut-pre-mount.service b/modules.d/98dracut-systemd/dracut-pre-mount.service |
628 |
+index d3909689..18c9730c 100644 |
629 |
+--- a/modules.d/98dracut-systemd/dracut-pre-mount.service |
630 |
++++ b/modules.d/98dracut-systemd/dracut-pre-mount.service |
631 |
+@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot |
632 |
+ Type=oneshot |
633 |
+ ExecStart=-/bin/dracut-pre-mount |
634 |
+ StandardInput=null |
635 |
+-StandardOutput=syslog |
636 |
+-StandardError=syslog+console |
637 |
++StandardError=journal+console |
638 |
+ KillMode=process |
639 |
+ RemainAfterExit=yes |
640 |
+ |
641 |
+-- |
642 |
+2.26.2 |
643 |
+ |
644 |
+From d9149c6ca7c52c204c1b346e9b6a32bbadd0b2ff Mon Sep 17 00:00:00 2001 |
645 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
646 |
+Date: Wed, 15 Jul 2020 14:35:02 +0000 |
647 |
+Subject: [PATCH 08/10] As of v246 of systemd "syslog" and "syslog-console" |
648 |
+ switches have been deprecated |
649 |
+ |
650 |
+--- |
651 |
+ modules.d/98dracut-systemd/dracut-cmdline.service | 3 +-- |
652 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
653 |
+ |
654 |
+diff --git a/modules.d/98dracut-systemd/dracut-cmdline.service b/modules.d/98dracut-systemd/dracut-cmdline.service |
655 |
+index e577ec88..a8078bd2 100644 |
656 |
+--- a/modules.d/98dracut-systemd/dracut-cmdline.service |
657 |
++++ b/modules.d/98dracut-systemd/dracut-cmdline.service |
658 |
+@@ -23,8 +23,7 @@ Environment=NEWROOT=/sysroot |
659 |
+ Type=oneshot |
660 |
+ ExecStart=-/bin/dracut-cmdline |
661 |
+ StandardInput=null |
662 |
+-StandardOutput=syslog |
663 |
+-StandardError=syslog+console |
664 |
++StandardError=journal+console |
665 |
+ KillMode=process |
666 |
+ RemainAfterExit=yes |
667 |
+ |
668 |
+-- |
669 |
+2.26.2 |
670 |
+ |
671 |
+From 8cb5ac1b30be458df9497911ba601d90e68f4d5b Mon Sep 17 00:00:00 2001 |
672 |
+From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= <johannbg@×××××.com> |
673 |
+Date: Wed, 15 Jul 2020 14:35:38 +0000 |
674 |
+Subject: [PATCH 09/10] As of v246 of systemd "syslog" and "syslog-console" |
675 |
+ switches have been deprecated |
676 |
+ |
677 |
+--- |
678 |
+ modules.d/98dracut-systemd/dracut-mount.service | 3 +-- |
679 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
680 |
+ |
681 |
+diff --git a/modules.d/98dracut-systemd/dracut-mount.service b/modules.d/98dracut-systemd/dracut-mount.service |
682 |
+index 77d34f62..c88e6d84 100644 |
683 |
+--- a/modules.d/98dracut-systemd/dracut-mount.service |
684 |
++++ b/modules.d/98dracut-systemd/dracut-mount.service |
685 |
+@@ -19,8 +19,7 @@ Environment=NEWROOT=/sysroot |
686 |
+ Type=oneshot |
687 |
+ ExecStart=-/bin/dracut-mount |
688 |
+ StandardInput=null |
689 |
+-StandardOutput=syslog |
690 |
+-StandardError=syslog+console |
691 |
++StandardError=journal+console |
692 |
+ KillMode=process |
693 |
+ RemainAfterExit=yes |
694 |
+ |
695 |
+-- |
696 |
+2.26.2 |
697 |
+ |