diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch index 73e65ff798..ea37680221 100644 --- a/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch +++ b/meta/recipes-core/systemd/systemd/0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch | |||
@@ -24,10 +24,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
24 | units/systemd-binfmt.service.in | 4 ++++ | 24 | units/systemd-binfmt.service.in | 4 ++++ |
25 | 3 files changed, 9 insertions(+), 4 deletions(-) | 25 | 3 files changed, 9 insertions(+), 4 deletions(-) |
26 | 26 | ||
27 | diff --git a/units/meson.build b/units/meson.build | 27 | Index: systemd-stable/units/meson.build |
28 | index e1ee9f86c3..6bb7771b36 100644 | 28 | =================================================================== |
29 | --- a/units/meson.build | 29 | --- systemd-stable.orig/units/meson.build |
30 | +++ b/units/meson.build | 30 | +++ systemd-stable/units/meson.build |
31 | @@ -46,8 +46,7 @@ units = [ | 31 | @@ -46,8 +46,7 @@ units = [ |
32 | ['poweroff.target', '', | 32 | ['poweroff.target', '', |
33 | 'runlevel0.target'], | 33 | 'runlevel0.target'], |
@@ -48,10 +48,10 @@ index e1ee9f86c3..6bb7771b36 100644 | |||
48 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], | 48 | ['systemd-bless-boot.service', 'ENABLE_EFI HAVE_BLKID'], |
49 | ['systemd-boot-check-no-failures.service', ''], | 49 | ['systemd-boot-check-no-failures.service', ''], |
50 | ['systemd-boot-system-token.service', 'ENABLE_EFI', | 50 | ['systemd-boot-system-token.service', 'ENABLE_EFI', |
51 | diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount | 51 | Index: systemd-stable/units/proc-sys-fs-binfmt_misc.automount |
52 | index 30a6bc9918..4231f3b70f 100644 | 52 | =================================================================== |
53 | --- a/units/proc-sys-fs-binfmt_misc.automount | 53 | --- systemd-stable.orig/units/proc-sys-fs-binfmt_misc.automount |
54 | +++ b/units/proc-sys-fs-binfmt_misc.automount | 54 | +++ systemd-stable/units/proc-sys-fs-binfmt_misc.automount |
55 | @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ | 55 | @@ -18,3 +18,6 @@ ConditionPathIsReadWrite=/proc/sys/ |
56 | 56 | ||
57 | [Automount] | 57 | [Automount] |
@@ -59,19 +59,19 @@ index 30a6bc9918..4231f3b70f 100644 | |||
59 | + | 59 | + |
60 | +[Install] | 60 | +[Install] |
61 | +WantedBy=sysinit.target | 61 | +WantedBy=sysinit.target |
62 | diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in | 62 | Index: systemd-stable/units/systemd-binfmt.service.in |
63 | index e940c7c9ad..6be7f5cc9b 100644 | 63 | =================================================================== |
64 | --- a/units/systemd-binfmt.service.in | 64 | --- systemd-stable.orig/units/systemd-binfmt.service.in |
65 | +++ b/units/systemd-binfmt.service.in | 65 | +++ systemd-stable/units/systemd-binfmt.service.in |
66 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.htm | 66 | @@ -14,6 +14,7 @@ Documentation=https://www.kernel.org/doc |
67 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems | 67 | Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems |
68 | DefaultDependencies=no | 68 | DefaultDependencies=no |
69 | Conflicts=shutdown.target | 69 | Conflicts=shutdown.target |
70 | +Wants=proc-sys-fs-binfmt_misc.automount | 70 | +Wants=proc-sys-fs-binfmt_misc.automount |
71 | After=proc-sys-fs-binfmt_misc.automount | 71 | After=proc-sys-fs-binfmt_misc.automount |
72 | After=proc-sys-fs-binfmt_misc.mount | ||
72 | Before=sysinit.target shutdown.target | 73 | Before=sysinit.target shutdown.target |
73 | ConditionPathIsReadWrite=/proc/sys/ | 74 | @@ -29,3 +30,6 @@ Type=oneshot |
74 | @@ -28,3 +29,6 @@ Type=oneshot | ||
75 | RemainAfterExit=yes | 75 | RemainAfterExit=yes |
76 | ExecStart=@rootlibexecdir@/systemd-binfmt | 76 | ExecStart=@rootlibexecdir@/systemd-binfmt |
77 | TimeoutSec=90s | 77 | TimeoutSec=90s |