diff --git a/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch b/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch index 8c46c98..d35373b 100644 --- a/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch +++ b/SOURCES/0001-kernel-install-add-fedora-specific-callouts-to-new-k.patch @@ -12,7 +12,7 @@ Subject: [PATCH] kernel-install: add fedora specific callouts to diff --git a/src/kernel-install/kernel-install b/src/kernel-install/kernel-install old mode 100644 new mode 100755 -index 3ae1d77..f1c74de +index 3ae1d77e3..f1c74de27 --- a/src/kernel-install/kernel-install +++ b/src/kernel-install/kernel-install @@ -71,6 +71,42 @@ fi diff --git a/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch b/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch index 75da631..8adaa52 100644 --- a/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch +++ b/SOURCES/0002-Revert-fsck-re-enable-fsck-l.patch @@ -15,7 +15,7 @@ Conflicts: 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README b/README -index c722092..5f5783a 100644 +index c72209262..5f5783a68 100644 --- a/README +++ b/README @@ -135,7 +135,8 @@ REQUIREMENTS: @@ -29,7 +29,7 @@ index c722092..5f5783a 100644 dracut (optional) PolicyKit (optional) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 78ceeb6..d897680 100644 +index 78ceeb6fa..d8976809d 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -323,11 +323,16 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch b/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch index ba1d738..b1ba2d4 100644 --- a/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch +++ b/SOURCES/0003-sysctl-bring-back-etc-sysctl.conf.patch @@ -9,7 +9,7 @@ Read /etc/sysctl.conf as the last file, overwriting everything. 1 file changed, 4 insertions(+) diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index 275a5b7..d007c93 100644 +index 275a5b74a..d007c932c 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -320,6 +320,10 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0004-remove-user-.service.patch b/SOURCES/0004-remove-user-.service.patch index 747c0da..0ea024f 100644 --- a/SOURCES/0004-remove-user-.service.patch +++ b/SOURCES/0004-remove-user-.service.patch @@ -11,7 +11,7 @@ Conflicts: 2 files changed, 40 deletions(-) diff --git a/Makefile.am b/Makefile.am -index bf04d31..75459f7 100644 +index bf04d3184..75459f74d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -535,7 +535,6 @@ nodist_systemunit_DATA = \ @@ -31,7 +31,7 @@ index bf04d31..75459f7 100644 units/systemd-suspend.service.in \ units/quotaon.service.in \ diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index f4c4490..97eb4fe 100644 +index f4c4490e8..97eb4feca 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -399,39 +399,6 @@ static int user_start_slice(User *u) { diff --git a/SOURCES/0005-logind-session-save-stopping-flag.patch b/SOURCES/0005-logind-session-save-stopping-flag.patch index 8932e2b..e478ac6 100644 --- a/SOURCES/0005-logind-session-save-stopping-flag.patch +++ b/SOURCES/0005-logind-session-save-stopping-flag.patch @@ -10,7 +10,7 @@ Conflicts: 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index a02a537..d2e7b40 100644 +index a02a537f7..d2e7b4012 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -181,12 +181,14 @@ int session_save(Session *s) { diff --git a/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch b/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch index 22b18a8..e536cd8 100644 --- a/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch +++ b/SOURCES/0006-man-mention-System-Administrator-s-Guide-in-systemct.patch @@ -10,13 +10,14 @@ Resolves: #978948 1 file changed, 11 insertions(+) diff --git a/man/systemctl.xml b/man/systemctl.xml -index 338c1d3..6f30474 100644 +index 338c1d328..6f30474c3 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml -@@ -1714,6 +1714,17 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service +@@ -1713,6 +1713,17 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service + <xi:include href="less-variables.xml" xpointer="less"/> </refsect1> - <refsect1> ++ <refsect1> + <title>Examples</title> + <para> + For examples how to use systemctl in comparsion @@ -27,7 +28,6 @@ index 338c1d3..6f30474 100644 + </para> + </refsect1> + -+ <refsect1> + <refsect1> <title>See Also</title> <para> - <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch b/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch index 260bb40..df8ec5c 100644 --- a/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch +++ b/SOURCES/0007-rules-automatically-online-hot-added-CPUs.patch @@ -16,7 +16,7 @@ Conflicts: create mode 100644 rules/40-redhat.rules diff --git a/Makefile.am b/Makefile.am -index 75459f7..a734e9c 100644 +index 75459f74d..a734e9c48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3564,7 +3564,8 @@ dist_udevrules_DATA += \ @@ -31,7 +31,7 @@ index 75459f7..a734e9c 100644 rules/99-systemd.rules diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules new file mode 100644 -index 0000000..2b494e5 +index 000000000..2b494e57c --- /dev/null +++ b/rules/40-redhat.rules @@ -0,0 +1,3 @@ diff --git a/SOURCES/0008-Revert-remove-references-of-readahead.patch b/SOURCES/0008-Revert-remove-references-of-readahead.patch index 65eee62..264938b 100644 --- a/SOURCES/0008-Revert-remove-references-of-readahead.patch +++ b/SOURCES/0008-Revert-remove-references-of-readahead.patch @@ -11,7 +11,7 @@ This reverts commit 3b71c18d3e3906f8606c66bea98b327684394e61. 3 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore -index e8a4085..0360f7c 100644 +index e8a4085a3..0360f7c6b 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,7 @@ @@ -23,7 +23,7 @@ index e8a4085..0360f7c 100644 /systemd-remount-fs /systemd-reply-password diff --git a/README b/README -index 5f5783a..287d05c 100644 +index 5f5783a68..287d05c9b 100644 --- a/README +++ b/README @@ -30,6 +30,7 @@ AUTHOR: @@ -35,7 +35,7 @@ index 5f5783a..287d05c 100644 - except src/shared/siphash24.c which is CC0 Public Domain - except src/journal/lookup3.c which is Public Domain diff --git a/TODO b/TODO -index 255a4f2..90b2c4b 100644 +index 255a4f2d0..90b2c4b30 100644 --- a/TODO +++ b/TODO @@ -786,6 +786,13 @@ Features: diff --git a/SOURCES/0009-Revert-missing-remove-fanotify.patch b/SOURCES/0009-Revert-missing-remove-fanotify.patch index 30901ad..c569464 100644 --- a/SOURCES/0009-Revert-missing-remove-fanotify.patch +++ b/SOURCES/0009-Revert-missing-remove-fanotify.patch @@ -16,7 +16,7 @@ Conflicts: create mode 100644 src/shared/linux/fanotify.h diff --git a/Makefile.am b/Makefile.am -index a734e9c..70e4fbc 100644 +index a734e9c48..70e4fbc6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -749,6 +749,7 @@ libsystemd_shared_la_SOURCES = \ @@ -28,7 +28,7 @@ index a734e9c..70e4fbc 100644 src/shared/missing.h \ src/shared/initreq.h \ diff --git a/configure.ac b/configure.ac -index 97a29d6..3f50887 100644 +index 97a29d63f..3f50887a8 100644 --- a/configure.ac +++ b/configure.ac @@ -310,6 +310,7 @@ RT_LIBS="$LIBS" @@ -41,7 +41,7 @@ index 97a29d6..3f50887 100644 AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN], diff --git a/src/shared/linux/fanotify.h b/src/shared/linux/fanotify.h new file mode 100644 -index 0000000..5cc1a7e +index 000000000..5cc1a7e67 --- /dev/null +++ b/src/shared/linux/fanotify.h @@ -0,0 +1,98 @@ @@ -144,7 +144,7 @@ index 0000000..5cc1a7e + +#endif /* _LINUX_FANOTIFY_H */ diff --git a/src/shared/missing.h b/src/shared/missing.h -index b33a70c..06a5576 100644 +index b33a70cb2..06a55769a 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -156,6 +156,70 @@ static inline int pivot_root(const char *new_root, const char *put_old) { diff --git a/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch b/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch index fdf30a8..4970ed4 100644 --- a/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch +++ b/SOURCES/0010-Revert-readahead-wipe-out-readahead.patch @@ -89,7 +89,7 @@ Conflicts: create mode 100644 units/systemd-readahead-replay.service.in diff --git a/Makefile-man.am b/Makefile-man.am -index d0fb9aa..ac6f69a 100644 +index d0fb9aa1a..ac6f69af7 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1234,6 +1234,34 @@ man/systemd-random-seed.html: man/systemd-random-seed.service.html @@ -152,7 +152,7 @@ index d0fb9aa..ac6f69a 100644 man/systemd-resolved.service.xml \ man/systemd-rfkill@.service.xml \ diff --git a/Makefile.am b/Makefile.am -index 70e4fbc..b0e4b5a 100644 +index 70e4fbc6d..b0e4b5a42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2603,7 +2603,8 @@ systemctl_LDADD = \ @@ -165,10 +165,11 @@ index 70e4fbc..b0e4b5a 100644 systemd_notify_LDADD = \ libsystemd-internal.la \ -@@ -4736,6 +4737,57 @@ EXTRA_DIST += \ +@@ -4735,6 +4736,57 @@ EXTRA_DIST += \ + src/vconsole/90-vconsole.rules.in \ units/systemd-vconsole-setup.service.in - # ------------------------------------------------------------------------------ ++# ------------------------------------------------------------------------------ +if ENABLE_READAHEAD +systemd_readahead_SOURCES = \ + src/readahead/readahead.c \ @@ -219,18 +220,18 @@ index 70e4fbc..b0e4b5a 100644 + units/systemd-readahead-replay.service.in \ + units/systemd-readahead-done.service.in + -+# ------------------------------------------------------------------------------ + # ------------------------------------------------------------------------------ if ENABLE_BOOTCHART systemd_bootchart_SOURCES = \ - src/bootchart/bootchart.c \ diff --git a/configure.ac b/configure.ac -index 3f50887..f701bcf 100644 +index 3f50887a8..f701bcf71 100644 --- a/configure.ac +++ b/configure.ac -@@ -931,6 +931,14 @@ fi +@@ -930,6 +930,14 @@ if test "x$enable_vconsole" != "xno"; then + fi AM_CONDITIONAL(ENABLE_VCONSOLE, [test "$have_vconsole" = "yes"]) - # ------------------------------------------------------------------------------ ++# ------------------------------------------------------------------------------ +have_readahead=no +AC_ARG_ENABLE(readahead, AS_HELP_STRING([--disable-readahead], [disable readahead tools])) +if test "x$enable_readahead" != "xno"; then @@ -238,10 +239,9 @@ index 3f50887..f701bcf 100644 +fi +AM_CONDITIONAL(ENABLE_READAHEAD, [test "$have_readahead" = "yes"]) + -+# ------------------------------------------------------------------------------ + # ------------------------------------------------------------------------------ have_bootchart=no AC_ARG_ENABLE(bootchart, AS_HELP_STRING([--disable-bootchart], [disable bootchart tool])) - if test "x$enable_bootchart" != "xno"; then @@ -1474,6 +1482,7 @@ AC_MSG_RESULT([ ELFUTILS: ${have_elfutils} binfmt: ${have_binfmt} @@ -251,7 +251,7 @@ index 3f50887..f701bcf 100644 quotacheck: ${have_quotacheck} tmpfiles: ${have_tmpfiles} diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml -index b7ba363..b12abe2 100644 +index b7ba36365..b12abe2dc 100644 --- a/man/sd-daemon.xml +++ b/man/sd-daemon.xml @@ -137,6 +137,7 @@ @@ -263,7 +263,7 @@ index b7ba363..b12abe2 100644 </para> </refsect1> diff --git a/man/sd-login.xml b/man/sd-login.xml -index 328f711..abcdb99 100644 +index 328f71164..abcdb99f6 100644 --- a/man/sd-login.xml +++ b/man/sd-login.xml @@ -128,6 +128,7 @@ @@ -276,7 +276,7 @@ index 328f711..abcdb99 100644 </refsect1> diff --git a/man/sd-readahead.xml b/man/sd-readahead.xml new file mode 100644 -index 0000000..bcc46b2 +index 000000000..bcc46b24d --- /dev/null +++ b/man/sd-readahead.xml @@ -0,0 +1,117 @@ @@ -399,7 +399,7 @@ index 0000000..bcc46b2 +</refentry> diff --git a/man/sd_readahead.xml b/man/sd_readahead.xml new file mode 100644 -index 0000000..9827299 +index 000000000..98272997c --- /dev/null +++ b/man/sd_readahead.xml @@ -0,0 +1,178 @@ @@ -582,7 +582,7 @@ index 0000000..9827299 + +</refentry> diff --git a/man/systemd-notify.xml b/man/systemd-notify.xml -index 06d5ae5..46ede1a 100644 +index 06d5ae531..46ede1ab8 100644 --- a/man/systemd-notify.xml +++ b/man/systemd-notify.xml @@ -127,6 +127,17 @@ @@ -605,7 +605,7 @@ index 06d5ae5..46ede1a 100644 </variablelist> diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml new file mode 100644 -index 0000000..669fe78 +index 000000000..669fe7894 --- /dev/null +++ b/man/systemd-readahead-replay.service.xml @@ -0,0 +1,203 @@ @@ -813,7 +813,7 @@ index 0000000..669fe78 + +</refentry> diff --git a/po/POTFILES.skip b/po/POTFILES.skip -index 51254ec..b552029 100644 +index 51254ec53..b552029b8 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -17,5 +17,6 @@ src/hostname/hostnamed.c @@ -824,7 +824,7 @@ index 51254ec..b552029 100644 units/user@.service.in units/debug-shell.service.in diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd -index 58b1c7b..06f03bd 100644 +index 58b1c7b4e..06f03bd1e 100644 --- a/shell-completion/zsh/_systemd +++ b/shell-completion/zsh/_systemd @@ -63,7 +63,8 @@ case "$service" in @@ -838,7 +838,7 @@ index 58b1c7b..06f03bd 100644 systemd-tty-ask-password-agent) _arguments \ diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c -index 05061c0..dfbca87 100644 +index 05061c070..dfbca8754 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -111,7 +111,7 @@ static int create_disk( @@ -851,7 +851,7 @@ index 05061c0..dfbca87 100644 if (!nofail) diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c -index 5c58b58..7d5a6c6 100644 +index 5c58b58f8..7d5a6c650 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -133,6 +133,7 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, char **devi @@ -863,7 +863,7 @@ index 5c58b58..7d5a6c6 100644 "Type=oneshot\n" "RemainAfterExit=yes\n" diff --git a/src/notify/notify.c b/src/notify/notify.c -index f98075d..e4a128b 100644 +index f98075d51..e4a128b0b 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -31,6 +31,7 @@ @@ -944,7 +944,7 @@ index f98075d..e4a128b 100644 diff --git a/src/readahead/Makefile b/src/readahead/Makefile new file mode 120000 -index 0000000..d0b0e8e +index 000000000..d0b0e8e00 --- /dev/null +++ b/src/readahead/Makefile @@ -0,0 +1 @@ @@ -952,7 +952,7 @@ index 0000000..d0b0e8e \ No newline at end of file diff --git a/src/readahead/readahead-analyze.c b/src/readahead/readahead-analyze.c new file mode 100644 -index 0000000..76db3cb +index 000000000..76db3cb7e --- /dev/null +++ b/src/readahead/readahead-analyze.c @@ -0,0 +1,146 @@ @@ -1104,7 +1104,7 @@ index 0000000..76db3cb +} diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c new file mode 100644 -index 0000000..822a803 +index 000000000..822a803a4 --- /dev/null +++ b/src/readahead/readahead-collect.c @@ -0,0 +1,650 @@ @@ -1760,7 +1760,7 @@ index 0000000..822a803 +} diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c new file mode 100644 -index 0000000..3ca48a7 +index 000000000..3ca48a725 --- /dev/null +++ b/src/readahead/readahead-common.c @@ -0,0 +1,398 @@ @@ -2164,7 +2164,7 @@ index 0000000..3ca48a7 +} diff --git a/src/readahead/readahead-common.h b/src/readahead/readahead-common.h new file mode 100644 -index 0000000..b34f3aa +index 000000000..b34f3aadd --- /dev/null +++ b/src/readahead/readahead-common.h @@ -0,0 +1,61 @@ @@ -2231,7 +2231,7 @@ index 0000000..b34f3aa +int main_analyze(const char *pack_path); diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c new file mode 100644 -index 0000000..f81e0fe +index 000000000..f81e0fe55 --- /dev/null +++ b/src/readahead/readahead-replay.c @@ -0,0 +1,281 @@ @@ -2518,7 +2518,7 @@ index 0000000..f81e0fe +} diff --git a/src/readahead/readahead.c b/src/readahead/readahead.c new file mode 100644 -index 0000000..35176e9 +index 000000000..35176e937 --- /dev/null +++ b/src/readahead/readahead.c @@ -0,0 +1,163 @@ @@ -2687,7 +2687,7 @@ index 0000000..35176e9 +} diff --git a/src/readahead/sd-readahead.c b/src/readahead/sd-readahead.c new file mode 100644 -index 0000000..675d82c +index 000000000..675d82cdd --- /dev/null +++ b/src/readahead/sd-readahead.c @@ -0,0 +1,89 @@ @@ -2782,7 +2782,7 @@ index 0000000..675d82c +} diff --git a/src/readahead/test-ssd.c b/src/readahead/test-ssd.c new file mode 100644 -index 0000000..808faf3 +index 000000000..808faf359 --- /dev/null +++ b/src/readahead/test-ssd.c @@ -0,0 +1,41 @@ @@ -2829,7 +2829,7 @@ index 0000000..808faf3 +} diff --git a/src/systemd/sd-readahead.h b/src/systemd/sd-readahead.h new file mode 100644 -index 0000000..bb30f9a +index 000000000..bb30f9a45 --- /dev/null +++ b/src/systemd/sd-readahead.h @@ -0,0 +1,73 @@ @@ -2907,7 +2907,7 @@ index 0000000..bb30f9a + +#endif diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset -index ee1b864..24963f0 100644 +index ee1b864bc..24963f062 100644 --- a/system-preset/90-systemd.preset +++ b/system-preset/90-systemd.preset @@ -12,6 +12,7 @@ enable remote-fs.target @@ -2919,7 +2919,7 @@ index ee1b864..24963f0 100644 enable systemd-networkd.service enable systemd-resolved.service diff --git a/units/.gitignore b/units/.gitignore -index 6fdb629..638a7ab 100644 +index 6fdb629c3..638a7abc4 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -52,6 +52,9 @@ @@ -2933,7 +2933,7 @@ index 6fdb629..638a7ab 100644 /systemd-remount-fs.service /systemd-resolved.service diff --git a/units/ldconfig.service b/units/ldconfig.service -index f9691e2..43c145b 100644 +index f9691e2f2..43c145b72 100644 --- a/units/ldconfig.service +++ b/units/ldconfig.service @@ -10,7 +10,7 @@ Description=Rebuild Dynamic Linker Cache @@ -2946,7 +2946,7 @@ index f9691e2..43c145b 100644 ConditionNeedsUpdate=/etc diff --git a/units/quotaon.service.in b/units/quotaon.service.in -index 7d59a40..49a50a7 100644 +index 7d59a4019..49a50a7fe 100644 --- a/units/quotaon.service.in +++ b/units/quotaon.service.in @@ -9,7 +9,7 @@ @@ -2959,7 +2959,7 @@ index 7d59a40..49a50a7 100644 ConditionPathExists=@QUOTAON@ diff --git a/units/system-update.target b/units/system-update.target -index 48d46fc..d0f847f 100644 +index 48d46fcbd..d0f847f95 100644 --- a/units/system-update.target +++ b/units/system-update.target @@ -10,7 +10,7 @@ Description=System Update @@ -2972,7 +2972,7 @@ index 48d46fc..d0f847f 100644 Before=shutdown.target AllowIsolate=yes diff --git a/units/systemd-backlight@.service.in b/units/systemd-backlight@.service.in -index 5e6706c..b146e30 100644 +index 5e6706c11..b146e30f2 100644 --- a/units/systemd-backlight@.service.in +++ b/units/systemd-backlight@.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-backlight@.service(8) @@ -2985,7 +2985,7 @@ index 5e6706c..b146e30 100644 [Service] diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index 34a5d52..02dfe77 100644 +index 34a5d5237..02dfe774d 100644 --- a/units/systemd-binfmt.service.in +++ b/units/systemd-binfmt.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) @@ -2998,7 +2998,7 @@ index 34a5d52..02dfe77 100644 ConditionPathIsReadWrite=/proc/sys/ ConditionDirectoryNotEmpty=|/lib/binfmt.d diff --git a/units/systemd-firstboot.service.in b/units/systemd-firstboot.service.in -index 405c6f3..89fa7e1 100644 +index 405c6f3fd..89fa7e1dd 100644 --- a/units/systemd-firstboot.service.in +++ b/units/systemd-firstboot.service.in @@ -10,7 +10,7 @@ Description=First Boot Wizard @@ -3011,7 +3011,7 @@ index 405c6f3..89fa7e1 100644 ConditionPathIsReadWrite=/etc ConditionFirstBoot=yes diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in -index 6d76578..26cce51 100644 +index 6d7657853..26cce5131 100644 --- a/units/systemd-fsck-root.service.in +++ b/units/systemd-fsck-root.service.in @@ -9,6 +9,7 @@ @@ -3023,7 +3023,7 @@ index 6d76578..26cce51 100644 ConditionPathIsReadWrite=!/ diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in -index 857e625..d2cda6a 100644 +index 857e62567..d2cda6a46 100644 --- a/units/systemd-fsck@.service.in +++ b/units/systemd-fsck@.service.in @@ -10,7 +10,7 @@ Description=File System Check on %f @@ -3036,7 +3036,7 @@ index 857e625..d2cda6a 100644 [Service] diff --git a/units/systemd-hwdb-update.service.in b/units/systemd-hwdb-update.service.in -index 791528e..4bed482 100644 +index 791528e2b..4bed482f8 100644 --- a/units/systemd-hwdb-update.service.in +++ b/units/systemd-hwdb-update.service.in @@ -10,7 +10,7 @@ Description=Rebuild Hardware Database @@ -3049,7 +3049,7 @@ index 791528e..4bed482 100644 ConditionNeedsUpdate=/etc ConditionPathExists=|!@udevlibexecdir@/hwdb.bin diff --git a/units/systemd-journal-catalog-update.service.in b/units/systemd-journal-catalog-update.service.in -index 6370dd4..5b85889 100644 +index 6370dd478..5b85889dd 100644 --- a/units/systemd-journal-catalog-update.service.in +++ b/units/systemd-journal-catalog-update.service.in @@ -10,7 +10,7 @@ Description=Rebuild Journal Catalog @@ -3062,7 +3062,7 @@ index 6370dd4..5b85889 100644 ConditionNeedsUpdate=/etc diff --git a/units/systemd-modules-load.service.in b/units/systemd-modules-load.service.in -index 040a0fe..32deb52 100644 +index 040a0febe..32deb52e2 100644 --- a/units/systemd-modules-load.service.in +++ b/units/systemd-modules-load.service.in @@ -10,6 +10,7 @@ Description=Load Kernel Modules @@ -3074,7 +3074,7 @@ index 040a0fe..32deb52 100644 ConditionCapability=CAP_SYS_MODULE ConditionDirectoryNotEmpty=|/lib/modules-load.d diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in -index 5cb9bc3..f726ea1 100644 +index 5cb9bc3bc..f726ea1bc 100644 --- a/units/systemd-quotacheck.service.in +++ b/units/systemd-quotacheck.service.in @@ -9,7 +9,7 @@ @@ -3087,7 +3087,7 @@ index 5cb9bc3..f726ea1 100644 ConditionPathExists=@QUOTACHECK@ diff --git a/units/systemd-random-seed.service.in b/units/systemd-random-seed.service.in -index b55844b..1879b2f 100644 +index b55844b36..1879b2f24 100644 --- a/units/systemd-random-seed.service.in +++ b/units/systemd-random-seed.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-random-seed.service(8) man:random(4) @@ -3101,7 +3101,7 @@ index b55844b..1879b2f 100644 [Service] diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in new file mode 100644 -index 0000000..d4b8e67 +index 000000000..d4b8e6793 --- /dev/null +++ b/units/systemd-readahead-collect.service.in @@ -0,0 +1,28 @@ @@ -3135,7 +3135,7 @@ index 0000000..d4b8e67 +Also=systemd-readahead-drop.service diff --git a/units/systemd-readahead-done.service.in b/units/systemd-readahead-done.service.in new file mode 100644 -index 0000000..e0d9579 +index 000000000..e0d957944 --- /dev/null +++ b/units/systemd-readahead-done.service.in @@ -0,0 +1,22 @@ @@ -3163,7 +3163,7 @@ index 0000000..e0d9579 +Also=systemd-readahead-collect.service diff --git a/units/systemd-readahead-done.timer b/units/systemd-readahead-done.timer new file mode 100644 -index 0000000..c58e096 +index 000000000..c58e09616 --- /dev/null +++ b/units/systemd-readahead-done.timer @@ -0,0 +1,22 @@ @@ -3191,7 +3191,7 @@ index 0000000..c58e096 +Also=systemd-readahead-collect.service diff --git a/units/systemd-readahead-drop.service b/units/systemd-readahead-drop.service new file mode 100644 -index 0000000..d9d12bc +index 000000000..d9d12bc53 --- /dev/null +++ b/units/systemd-readahead-drop.service @@ -0,0 +1,19 @@ @@ -3216,7 +3216,7 @@ index 0000000..d9d12bc +Also=systemd-readahead-collect.service diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in new file mode 100644 -index 0000000..c64a533 +index 000000000..c64a533e4 --- /dev/null +++ b/units/systemd-readahead-replay.service.in @@ -0,0 +1,26 @@ @@ -3247,7 +3247,7 @@ index 0000000..c64a533 +[Install] +WantedBy=default.target diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in -index 8d9daac..70e1a86 100644 +index 8d9daacaa..70e1a8680 100644 --- a/units/systemd-remount-fs.service.in +++ b/units/systemd-remount-fs.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-remount-fs.service(8) @@ -3260,7 +3260,7 @@ index 8d9daac..70e1a86 100644 Wants=local-fs-pre.target ConditionPathExists=/etc/fstab diff --git a/units/systemd-rfkill@.service.in b/units/systemd-rfkill@.service.in -index b48efe5..0d2757d 100644 +index b48efe5d9..0d2757d61 100644 --- a/units/systemd-rfkill@.service.in +++ b/units/systemd-rfkill@.service.in @@ -12,7 +12,7 @@ DefaultDependencies=no @@ -3273,7 +3273,7 @@ index b48efe5..0d2757d 100644 [Service] diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in -index fa72085..ade9dc3 100644 +index fa72085f9..ade9dc300 100644 --- a/units/systemd-sysctl.service.in +++ b/units/systemd-sysctl.service.in @@ -10,6 +10,7 @@ Description=Apply Kernel Variables @@ -3285,7 +3285,7 @@ index fa72085..ade9dc3 100644 Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ diff --git a/units/systemd-sysusers.service.in b/units/systemd-sysusers.service.in -index ffd6d77..69fea11 100644 +index ffd6d7747..69fea11fb 100644 --- a/units/systemd-sysusers.service.in +++ b/units/systemd-sysusers.service.in @@ -10,7 +10,7 @@ Description=Create System Users @@ -3298,7 +3298,7 @@ index ffd6d77..69fea11 100644 ConditionNeedsUpdate=/etc diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in -index 133c8c9..31b2378 100644 +index 133c8c94c..31b237841 100644 --- a/units/systemd-tmpfiles-clean.service.in +++ b/units/systemd-tmpfiles-clean.service.in @@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories @@ -3311,7 +3311,7 @@ index 133c8c9..31b2378 100644 [Service] diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in -index 0123a03..0b66c53 100644 +index 0123a030e..0b66c53fe 100644 --- a/units/systemd-tmpfiles-setup-dev.service.in +++ b/units/systemd-tmpfiles-setup-dev.service.in @@ -10,7 +10,7 @@ Description=Create Static Device Nodes in /dev @@ -3324,7 +3324,7 @@ index 0123a03..0b66c53 100644 ConditionCapability=CAP_SYS_MODULE diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in -index e895cda..72ab083 100644 +index e895cda0e..72ab083d5 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -10,7 +10,7 @@ Description=Create Volatile Files and Directories @@ -3337,7 +3337,7 @@ index e895cda..72ab083 100644 RefuseManualStop=yes diff --git a/units/systemd-update-done.service.in b/units/systemd-update-done.service.in -index ec7d906..7031bff 100644 +index ec7d90639..7031bff61 100644 --- a/units/systemd-update-done.service.in +++ b/units/systemd-update-done.service.in @@ -10,7 +10,7 @@ Description=Update is Completed @@ -3350,7 +3350,7 @@ index ec7d906..7031bff 100644 ConditionNeedsUpdate=|/etc ConditionNeedsUpdate=|/var diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in -index 163eccd..da7dda7 100644 +index 163eccd91..da7dda76b 100644 --- a/units/systemd-update-utmp.service.in +++ b/units/systemd-update-utmp.service.in @@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5) @@ -3363,7 +3363,7 @@ index 163eccd..da7dda7 100644 [Service] diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in -index 6160361..18faa63 100644 +index 616036187..18faa63f2 100644 --- a/units/systemd-vconsole-setup.service.in +++ b/units/systemd-vconsole-setup.service.in @@ -10,6 +10,7 @@ Description=Setup Virtual Console diff --git a/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch b/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch index 282fef7..224549e 100644 --- a/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch +++ b/SOURCES/0011-rules-add-rule-for-naming-Dell-iDRAC-USB-Virtual-NIC.patch @@ -14,7 +14,7 @@ Resolves: #1054477 create mode 100644 rules/73-idrac.rules diff --git a/Makefile.am b/Makefile.am -index b0e4b5a..9e64d6f 100644 +index b0e4b5a42..9e64d6f98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3567,7 +3567,8 @@ dist_udevrules_DATA += \ @@ -29,7 +29,7 @@ index b0e4b5a..9e64d6f 100644 rules/99-systemd.rules diff --git a/rules/73-idrac.rules b/rules/73-idrac.rules new file mode 100644 -index 0000000..d67fc42 +index 000000000..d67fc425b --- /dev/null +++ b/rules/73-idrac.rules @@ -0,0 +1,6 @@ diff --git a/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch b/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch index 049618d..8f2ca1f 100644 --- a/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch +++ b/SOURCES/0012-udev-net_id-correctly-name-netdevs-based-on-dev_port.patch @@ -25,7 +25,7 @@ Conflicts: 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 37ff1b8..99caa0a 100644 +index 37ff1b800..99caa0a2a 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -38,7 +38,7 @@ diff --git a/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch b/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch index a3ef95c..f43c278 100644 --- a/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch +++ b/SOURCES/0013-Revert-blkid-Warn-when-rejecting-a-superblock-with-a.patch @@ -12,7 +12,7 @@ This reverts commit d47f6ca5f9b7a0b400d8bdb050151a0284fb4bdb. 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/README b/README -index 287d05c..ac2a81c 100644 +index 287d05c9b..ac2a81c0c 100644 --- a/README +++ b/README @@ -115,7 +115,7 @@ REQUIREMENTS: @@ -25,7 +25,7 @@ index 287d05c..ac2a81c 100644 PAM >= 1.1.2 (optional) libcryptsetup (optional) diff --git a/configure.ac b/configure.ac -index f701bcf..9c25c3c 100644 +index f701bcf71..9c25c3c6f 100644 --- a/configure.ac +++ b/configure.ac @@ -437,7 +437,7 @@ AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"]) @@ -38,7 +38,7 @@ index f701bcf..9c25c3c 100644 if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then AC_MSG_ERROR([*** blkid support requested but libraries not found]) diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c -index 03e3dc2..8999583 100644 +index 03e3dc286..89995831b 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -221,7 +221,6 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t diff --git a/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch b/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch index 5f2abb1..74d8ed2 100644 --- a/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch +++ b/SOURCES/0014-journald-audit-exit-gracefully-in-the-case-we-can-t-.patch @@ -9,7 +9,7 @@ Subject: [PATCH] journald-audit: exit gracefully in the case we can't join 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index c2f1545..151097a 100644 +index c2f1545cc..151097a6e 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -529,8 +529,10 @@ int server_open_audit(Server *s) { diff --git a/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch b/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch index e7dd7af..12ce6da 100644 --- a/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch +++ b/SOURCES/0015-fedora-disable-resolv.conf-symlink.patch @@ -10,7 +10,7 @@ Conflicts: 1 file changed, 3 deletions(-) diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index 9b0e080..125d6e0 100644 +index 9b0e080e6..125d6e0a1 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -10,8 +10,5 @@ diff --git a/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch b/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch index d63e8ed..25d8aa6 100644 --- a/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch +++ b/SOURCES/0016-Revert-timedated-manage-systemd-timesyncd-directly-i.patch @@ -16,7 +16,7 @@ Conflicts: 2 files changed, 170 insertions(+), 91 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 9e64d6f..bf65b24 100644 +index 9e64d6f98..bf65b2406 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,6 +111,7 @@ catalogdir=$(prefix)/lib/systemd/catalog @@ -50,7 +50,7 @@ index 9e64d6f..bf65b24 100644 # ------------------------------------------------------------------------------ diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 753c3d1..66097ef 100644 +index 753c3d1d6..66097ef74 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -186,141 +186,211 @@ static int context_write_data_local_rtc(Context *c) { diff --git a/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch b/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch index 39b39a4..9d0405c 100644 --- a/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch +++ b/SOURCES/0017-journal-remote-fix-certificate-status-memory-leak.patch @@ -15,7 +15,7 @@ possibly confuse gcc5 on armv7hl to segfault during compilation. 1 file changed, 1 insertion(+) diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c -index 34d9337..de9c6ab 100644 +index 34d93379d..de9c6ab32 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -179,6 +179,7 @@ static int verify_cert_authorized(gnutls_session_t session) { diff --git a/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch b/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch index 533343a..11dbfd4 100644 --- a/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch +++ b/SOURCES/0018-journal-remote-fix-client_cert-memory-leak.patch @@ -11,7 +11,7 @@ Found by Valgrind while testing the previous memory leak fix. 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c -index de9c6ab..a95fff1 100644 +index de9c6ab32..a95fff18f 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -239,10 +239,14 @@ static int get_auth_dn(gnutls_x509_crt_t client_cert, char **buf) { diff --git a/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch b/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch index ae6e963..7df522b 100644 --- a/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch +++ b/SOURCES/0019-tmpfiles-Fix-parse_acl-error-message.patch @@ -11,7 +11,7 @@ parse_acl() returns the error instead of setting errno. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index c948d4d..88ba7e4 100644 +index c948d4d21..88ba7e46a 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -689,7 +689,7 @@ static int get_acls_from_arg(Item *item) { diff --git a/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch b/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch index 5523542..f153626 100644 --- a/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch +++ b/SOURCES/0020-test-utf8-fix-utf16-tests-on-BE-machines.patch @@ -9,7 +9,7 @@ Subject: [PATCH] test: utf8 - fix utf16 tests on BE machines 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-utf8.c b/src/test/test-utf8.c -index befa385..346f852 100644 +index befa38575..346f8524c 100644 --- a/src/test/test-utf8.c +++ b/src/test/test-utf8.c @@ -95,7 +95,7 @@ static void test_utf8_escaping_printable(void) { diff --git a/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch b/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch index 988bd03..a93fca4 100644 --- a/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch +++ b/SOURCES/0021-tmpfiles-avoid-creating-duplicate-acl-entries.patch @@ -16,7 +16,7 @@ Status quo ante can be restored with: 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c -index a4ff1ab..cbe09d7 100644 +index a4ff1ab87..cbe09d7ab 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -282,6 +282,77 @@ int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) @@ -113,7 +113,7 @@ index a4ff1ab..cbe09d7 100644 if (acl_copy_entry(j, i) < 0) return -errno; diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h -index 90e88ff..fdb9006 100644 +index 90e88ffa2..fdb90063f 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-util.h @@ -41,5 +41,9 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl); diff --git a/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch b/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch index 04ddfbe..c88d977 100644 --- a/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch +++ b/SOURCES/0022-shared-time-util-fix-gcc5-warning.patch @@ -15,7 +15,7 @@ src/shared/time-util.c:789:25: warning: logical not is only applied to the left 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/time-util.c b/src/shared/time-util.c -index 947ac1f..1c36c57 100644 +index 947ac1fcf..1c36c577c 100644 --- a/src/shared/time-util.c +++ b/src/shared/time-util.c @@ -786,7 +786,7 @@ int parse_nsec(const char *t, nsec_t *nsec) { diff --git a/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch b/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch index 9919dc0..32071ee 100644 --- a/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch +++ b/SOURCES/0023-test-time-test-infinity-parsing-in-nanoseconds.patch @@ -9,7 +9,7 @@ Subject: [PATCH] test-time: test "infinity" parsing in nanoseconds 1 file changed, 6 insertions(+) diff --git a/src/test/test-time.c b/src/test/test-time.c -index 8cfc4cc..3840fff 100644 +index 8cfc4cc4f..3840fff06 100644 --- a/src/test/test-time.c +++ b/src/test/test-time.c @@ -78,12 +78,18 @@ static void test_parse_nsec(void) { diff --git a/SOURCES/0024-bootchart-fix-default-init-path.patch b/SOURCES/0024-bootchart-fix-default-init-path.patch index a315485..5412474 100644 --- a/SOURCES/0024-bootchart-fix-default-init-path.patch +++ b/SOURCES/0024-bootchart-fix-default-init-path.patch @@ -15,7 +15,7 @@ https://launchpad.net/bugs/1423867 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index bf65b24..2e6455f 100644 +index bf65b2406..2e6455f6e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,6 +199,7 @@ AM_CPPFLAGS = \ @@ -27,7 +27,7 @@ index bf65b24..2e6455f 100644 -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c -index 64a384b..175be68 100644 +index 64a384bac..175be6868 100644 --- a/src/bootchart/bootchart.c +++ b/src/bootchart/bootchart.c @@ -76,7 +76,7 @@ int sysfd=-1; diff --git a/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch b/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch index a6593dc..711be45 100644 --- a/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch +++ b/SOURCES/0025-systemctl-bump-NOFILE-only-for-systemctl_main.patch @@ -12,7 +12,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1184712 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 21cb898..6b93ec8 100644 +index 21cb898b9..6b93ec844 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -7204,6 +7204,11 @@ found: diff --git a/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch b/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch index f7c692a..8905c89 100644 --- a/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch +++ b/SOURCES/0026-acl-util-avoid-freeing-uninitialized-pointer.patch @@ -11,7 +11,7 @@ CID#1271344/1271345 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c -index cbe09d7..e67e9ac 100644 +index cbe09d7ab..e67e9acb6 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -302,7 +302,7 @@ static int acl_entry_equal(acl_entry_t a, acl_entry_t b) { diff --git a/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch b/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch index 61bbddb..9aa8e4c 100644 --- a/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch +++ b/SOURCES/0027-bootchart-svg-fix-checking-of-list-end.patch @@ -11,7 +11,7 @@ If we have less samples than expected, systemd-bootchart will crash. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c -index e111fa9..144177c 100644 +index e111fa9cc..144177cd4 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -1170,7 +1170,7 @@ static void svg_ps_bars(void) { diff --git a/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch b/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch index 329deb4..540dc28 100644 --- a/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch +++ b/SOURCES/0028-systemd-add-getrandom-syscall-numbers-for-MIPS.patch @@ -13,7 +13,7 @@ syscalls getrandom and memfd_create"). 1 file changed, 10 insertions(+) diff --git a/src/shared/missing.h b/src/shared/missing.h -index 06a5576..8cb0b2c 100644 +index 06a55769a..8cb0b2c96 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -243,6 +243,16 @@ static inline int memfd_create(const char *name, unsigned int flags) { diff --git a/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch b/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch index 8da6b65..b0c98a8 100644 --- a/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch +++ b/SOURCES/0029-unit-use-weaker-dependencies-between-mount-and-devic.patch @@ -16,7 +16,7 @@ in --user mode, but leave a BindsTo= dependency in --system mode. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index ee8e607..9f1e55e 100644 +index ee8e607c2..9f1e55e2f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2845,7 +2845,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) { diff --git a/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch b/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch index 3fed40f..ee8e413 100644 --- a/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch +++ b/SOURCES/0030-unit-When-stopping-due-to-BindsTo-log-which-unit-cau.patch @@ -18,7 +18,7 @@ deactivate, as there's no point in further iteration. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 9f1e55e..563f6fe 100644 +index 9f1e55e2f..563f6fe85 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1648,12 +1648,14 @@ static void unit_check_binds_to(Unit *u) { diff --git a/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch b/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch index 9bf46d7..9789955 100644 --- a/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch +++ b/SOURCES/0031-sysctl-downgrade-message-about-sysctl-overrides-to-d.patch @@ -12,7 +12,7 @@ overrides. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index d007c93..b6945ed 100644 +index d007c932c..b6945eda5 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -176,7 +176,7 @@ found: diff --git a/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch b/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch index 78d7c74..e2ed67c 100644 --- a/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch +++ b/SOURCES/0032-sysctl-add-some-hints-how-to-override-settings.patch @@ -13,7 +13,7 @@ https://lists.fedoraproject.org/pipermail/devel/2015-February/208412.html 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf -index f189233..def151b 100644 +index f18923399..def151bb8 100644 --- a/sysctl.d/50-default.conf +++ b/sysctl.d/50-default.conf @@ -5,9 +5,16 @@ diff --git a/SOURCES/0033-core-rework-device-state-logic.patch b/SOURCES/0033-core-rework-device-state-logic.patch index 4c470dc..20c1f70 100644 --- a/SOURCES/0033-core-rework-device-state-logic.patch +++ b/SOURCES/0033-core-rework-device-state-logic.patch @@ -25,7 +25,7 @@ its BindTo dependency on the device would not be fulfilled. 6 files changed, 285 insertions(+), 180 deletions(-) diff --git a/src/core/device.c b/src/core/device.c -index d3deac3..75b9a46 100644 +index d3deac393..75b9a4628 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -36,7 +36,8 @@ @@ -595,7 +595,7 @@ index d3deac3..75b9a46 100644 DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState); diff --git a/src/core/device.h b/src/core/device.h -index bb7ae07..0609b20 100644 +index bb7ae0783..0609b20fd 100644 --- a/src/core/device.h +++ b/src/core/device.h @@ -29,20 +29,28 @@ typedef struct Device Device; @@ -636,7 +636,7 @@ index bb7ae07..0609b20 100644 + +int device_found_node(Manager *m, const char *node, bool add, DeviceFound found, bool now); diff --git a/src/core/mount.c b/src/core/mount.c -index f3977e6..c971330 100644 +index f3977e62d..c971330af 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1391,7 +1391,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user @@ -754,7 +754,7 @@ index f3977e6..c971330 100644 /* New or changed mount entry */ diff --git a/src/core/swap.c b/src/core/swap.c -index 6997921..5c19af5 100644 +index 6997921fd..5c19af5d9 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -338,7 +338,7 @@ static int swap_load(Unit *u) { @@ -881,7 +881,7 @@ index 6997921..5c19af5 100644 int r = 0; Swap *s; diff --git a/src/core/swap.h b/src/core/swap.h -index 73e64d8..914a2db 100644 +index 73e64d87a..914a2dbcc 100644 --- a/src/core/swap.h +++ b/src/core/swap.h @@ -116,8 +116,8 @@ struct Swap { @@ -896,7 +896,7 @@ index 73e64d8..914a2db 100644 const char* swap_state_to_string(SwapState i) _const_; SwapState swap_state_from_string(const char *s) _pure_; diff --git a/src/core/unit.c b/src/core/unit.c -index 563f6fe..a6558ee 100644 +index 563f6fe85..a6558ee23 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2843,7 +2843,6 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) { diff --git a/SOURCES/0034-core-fix-return-value-on-OOM.patch b/SOURCES/0034-core-fix-return-value-on-OOM.patch index 52fa25d..e1916e0 100644 --- a/SOURCES/0034-core-fix-return-value-on-OOM.patch +++ b/SOURCES/0034-core-fix-return-value-on-OOM.patch @@ -9,7 +9,7 @@ Subject: [PATCH] core: fix return value on OOM 1 file changed, 2 insertions(+) diff --git a/src/core/device.c b/src/core/device.c -index 75b9a46..1cc103c 100644 +index 75b9a4628..1cc103c29 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -211,6 +211,8 @@ static int device_update_description(Unit *u, struct udev_device *dev, const cha diff --git a/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch b/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch index c83a81f..65398d5 100644 --- a/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch +++ b/SOURCES/0035-machined-use-x-machine-unix-prefix-for-the-container.patch @@ -16,7 +16,7 @@ Failed to get machine PTY: Input/output error 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index b46f0a8..b0f0f66 100644 +index b46f0a8da..b0f0f66e0 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -477,7 +477,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us diff --git a/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch b/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch index 164e6e3..25f87b1 100644 --- a/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch +++ b/SOURCES/0036-shared-AFS-is-also-a-network-filesystem.patch @@ -9,7 +9,7 @@ Subject: [PATCH] shared: AFS is also a network filesystem 1 file changed, 1 insertion(+) diff --git a/src/shared/util.c b/src/shared/util.c -index ba035ca..f24b5b4 100644 +index ba035caed..f24b5b4ec 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1689,6 +1689,7 @@ bool chars_intersect(const char *a, const char *b) { diff --git a/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch b/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch index f03205a..29e00dd 100644 --- a/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch +++ b/SOURCES/0037-core-downgrade-unit-type-not-supported-message.patch @@ -14,7 +14,7 @@ systemd[1]: Unit type .swap is not supported on this system. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 4775219..bc9b7ec 100644 +index 4775219e4..bc9b7ec62 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -961,7 +961,7 @@ int manager_enumerate(Manager *m) { diff --git a/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch b/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch index 2b08bec..1fd7e48 100644 --- a/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch +++ b/SOURCES/0038-journal-remote-fix-saving-of-binary-fields.patch @@ -14,7 +14,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89391 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c -index d9dea8d..afded7e 100644 +index d9dea8deb..afded7e38 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -344,22 +344,25 @@ int process_data(RemoteSource *source) { @@ -78,7 +78,7 @@ index d9dea8d..afded7e 100644 source->state = STATE_DATA_FINISH; diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h -index 8499f4e..22db550 100644 +index 8499f4eb8..22db55091 100644 --- a/src/journal-remote/journal-remote-parse.h +++ b/src/journal-remote/journal-remote-parse.h @@ -42,7 +42,9 @@ typedef struct RemoteSource { diff --git a/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch b/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch index 9963a54..b628a6a 100644 --- a/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch +++ b/SOURCES/0039-journal-fix-Inappropriate-ioctl-for-device-on-ext4.patch @@ -18,7 +18,7 @@ This is because ext4 does not support FS_NOCOW_FL. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 2845e05..0f28718 100644 +index 2845e05ce..0f28718b0 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2611,8 +2611,8 @@ int journal_file_open( diff --git a/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch b/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch index 6361b1b..e31e45d 100644 --- a/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch +++ b/SOURCES/0040-sd-daemon-replace-VLA-with-alloca-to-make-llvm-happy.patch @@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89379 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c -index 028c2a7..22a3a53 100644 +index 028c2a7a5..22a3a5347 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -352,11 +352,7 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char diff --git a/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch b/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch index c0b94d6..a360030 100644 --- a/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch +++ b/SOURCES/0041-tmpfiles-quietly-ignore-ACLs-on-unsupported-filesyst.patch @@ -12,7 +12,7 @@ than -ENOSYS. For -ENOSYS, debug log is printed. 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 88ba7e4..187997e 100644 +index 88ba7e46a..187997e1f 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -704,6 +704,9 @@ static int path_set_acl(const char *path, acl_type_t type, acl_t acl, bool modif diff --git a/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch b/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch index d290e83..6489de5 100644 --- a/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch +++ b/SOURCES/0042-shared-util-assume-ac-when-sys-class-power_supply-is.patch @@ -13,7 +13,7 @@ treat this like if this directory was empty, and not an error. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/util.c b/src/shared/util.c -index f24b5b4..8548723 100644 +index f24b5b4ec..85487230a 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -5994,7 +5994,7 @@ int on_ac_power(void) { diff --git a/SOURCES/0043-import-remove-unused-variable.patch b/SOURCES/0043-import-remove-unused-variable.patch index 35e4fbc..2f53c5d 100644 --- a/SOURCES/0043-import-remove-unused-variable.patch +++ b/SOURCES/0043-import-remove-unused-variable.patch @@ -9,7 +9,7 @@ Subject: [PATCH] import: remove unused variable 1 file changed, 1 deletion(-) diff --git a/src/import/import-tar.c b/src/import/import-tar.c -index 999aa8a..493252a 100644 +index 999aa8ab5..493252a13 100644 --- a/src/import/import-tar.c +++ b/src/import/import-tar.c @@ -301,7 +301,6 @@ finish: diff --git a/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch b/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch index ffa17cd..ca351d0 100644 --- a/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch +++ b/SOURCES/0044-hwdb-fix-ThinkPad-X-Tablet-special-keys.patch @@ -22,7 +22,7 @@ System Information 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb -index 1b7d871..2cb9769 100644 +index 1b7d87101..2cb976923 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -586,7 +586,6 @@ keyboard:dmi:bvn*:bvr*:bd*:svnLENOVO*:pnS10-*:pvr* diff --git a/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch b/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch index 886bc89..ffc4ab6 100644 --- a/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch +++ b/SOURCES/0045-man-add-newlines-to-the-pull-raw-example-in-machinec.patch @@ -11,7 +11,7 @@ They were removed in commit 798d3a52 ("Reindent man pages to 2ch"). 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/man/machinectl.xml b/man/machinectl.xml -index 9b07af4..640cb8b 100644 +index 9b07af422..640cb8b7d 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -715,11 +715,12 @@ diff --git a/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch b/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch index c5923f4..80be3a9 100644 --- a/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch +++ b/SOURCES/0046-core-shared-in-deserializing-match-same-files-reache.patch @@ -33,7 +33,7 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1186018 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/core/socket.c b/src/core/socket.c -index 48c43a2..88aae48 100644 +index 48c43a288..88aae4815 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2100,7 +2100,7 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value, @@ -64,7 +64,7 @@ index 48c43a2..88aae48 100644 if (p) { diff --git a/src/shared/path-util.c b/src/shared/path-util.c -index b9db7f1..70bc1ca 100644 +index b9db7f104..70bc1caa2 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -436,6 +436,10 @@ bool path_equal(const char *a, const char *b) { @@ -79,7 +79,7 @@ index b9db7f1..70bc1ca 100644 assert(path); diff --git a/src/shared/path-util.h b/src/shared/path-util.h -index bd0d324..bcf116e 100644 +index bd0d32473..bcf116ed3 100644 --- a/src/shared/path-util.h +++ b/src/shared/path-util.h @@ -45,6 +45,7 @@ int path_make_relative(const char *from_dir, const char *to_path, char **_r); @@ -91,7 +91,7 @@ index bd0d324..bcf116e 100644 char** path_strv_make_absolute_cwd(char **l); diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index c6f6487..c278d6f 100644 +index c6f64876b..c278d6f9d 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -325,9 +325,6 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { diff --git a/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch b/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch index e176028..8fd388d 100644 --- a/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch +++ b/SOURCES/0047-shared-use-SocketAddress-in-socket_address_matches_f.patch @@ -11,7 +11,7 @@ Cleanup. No behavior change. 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index c278d6f..c31f60e 100644 +index c278d6f9d..c31f60ec7 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -435,48 +435,48 @@ bool socket_ipv6_is_supported(void) { diff --git a/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch b/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch index ae3495b..7bda801 100644 --- a/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch +++ b/SOURCES/0048-shared-avoid-semi-duplicating-socket_address_equal.patch @@ -12,7 +12,7 @@ instead of implementing similar comparing of addresses. 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index c31f60e..deecce8 100644 +index c31f60ec7..deecce8a8 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -464,23 +464,7 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) { diff --git a/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch b/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch index 24ca761..052866b 100644 --- a/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch +++ b/SOURCES/0049-shared-handle-unnamed-sockets-in-socket_address_equa.patch @@ -13,7 +13,7 @@ socket, just return false. 1 file changed, 4 insertions(+) diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index deecce8..a4e26b1 100644 +index deecce8a8..a4e26b1d8 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -349,6 +349,10 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { diff --git a/SOURCES/0050-man-make-bootup-graph-consistent.patch b/SOURCES/0050-man-make-bootup-graph-consistent.patch index 619887d..35d03cd 100644 --- a/SOURCES/0050-man-make-bootup-graph-consistent.patch +++ b/SOURCES/0050-man-make-bootup-graph-consistent.patch @@ -9,7 +9,7 @@ Subject: [PATCH] man: make bootup graph consistent 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/bootup.xml b/man/bootup.xml -index d97d550..b92057a 100644 +index d97d55023..b92057af2 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -134,7 +134,7 @@ diff --git a/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch b/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch index 4f45b9e..b38325f 100644 --- a/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch +++ b/SOURCES/0051-nspawn-fix-whitespace-and-typo-in-partition-table-bl.patch @@ -9,7 +9,7 @@ Subject: [PATCH] nspawn: fix whitespace and typo in partition table blurb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index fb67251..7724df9 100644 +index fb672510b..7724df96b 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2676,7 +2676,7 @@ static int setup_image(char **device_path, int *loop_nr) { diff --git a/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch b/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch index 67e2eb8..84321a7 100644 --- a/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch +++ b/SOURCES/0052-man-explain-time-units-in-tmpfiles.patch @@ -10,7 +10,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1195294 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml -index 8815bf9..4bd0fcf 100644 +index 8815bf997..4bd0fcf75 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -443,23 +443,22 @@ diff --git a/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch b/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch index 24222fb..be25640 100644 --- a/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch +++ b/SOURCES/0053-systemctl-check-validity-of-PID-we-received.patch @@ -9,7 +9,7 @@ Subject: [PATCH] systemctl: check validity of PID we received 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 6b93ec8..3da4d3d 100644 +index 6b93ec844..3da4d3d4f 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2881,6 +2881,9 @@ static int check_inhibitors(sd_bus *bus, enum action a) { diff --git a/SOURCES/0054-systemctl-support-auditd.service-better.patch b/SOURCES/0054-systemctl-support-auditd.service-better.patch index acac2ef..2f5acd4 100644 --- a/SOURCES/0054-systemctl-support-auditd.service-better.patch +++ b/SOURCES/0054-systemctl-support-auditd.service-better.patch @@ -17,7 +17,7 @@ a file. 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 3da4d3d..4ec0cff 100644 +index 3da4d3d4f..4ec0cff21 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4555,6 +4555,23 @@ static int init_home_and_lookup_paths(char **user_home, char **user_runtime, Loo diff --git a/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch b/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch index b29d183..6a35a44 100644 --- a/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch +++ b/SOURCES/0055-shared-unit-name-fix-gcc5-warning.patch @@ -17,7 +17,7 @@ src/shared/unit-name.c:102:34: warning: logical not is only applied to the left 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c -index 21b6691..f728af4 100644 +index 21b66913c..f728af4a8 100644 --- a/src/shared/unit-name.c +++ b/src/shared/unit-name.c @@ -100,7 +100,7 @@ bool unit_name_is_valid(const char *n, enum template_valid template_ok) { diff --git a/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch b/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch index f60caba..8790fa0 100644 --- a/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch +++ b/SOURCES/0056-test-hashmap-fix-gcc5-warning.patch @@ -18,7 +18,7 @@ src/test/test-hashmap.c:76:79: warning: logical not is only applied to the left 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c -index 6900da9..351563b 100644 +index 6900da9e8..351563b96 100644 --- a/src/test/test-hashmap.c +++ b/src/test/test-hashmap.c @@ -75,7 +75,7 @@ static void test_trivial_compare_func(void) { diff --git a/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch b/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch index 227f539..bb838a9 100644 --- a/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch +++ b/SOURCES/0057-shared-fix-wrong-assertion-in-barrier_set_role.patch @@ -15,7 +15,7 @@ Test the same condition twice, pretty sure we mean 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/barrier.c b/src/shared/barrier.c -index f65363a..b7dca75 100644 +index f65363a67..b7dca7509 100644 --- a/src/shared/barrier.c +++ b/src/shared/barrier.c @@ -178,7 +178,7 @@ void barrier_set_role(Barrier *b, unsigned int role) { diff --git a/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch index 3868550..0b70a55 100644 --- a/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch +++ b/SOURCES/0058-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers 1 file changed, 42 insertions(+) diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb -index fb789fd..4fd951a 100644 +index fb789fd49..4fd951a58 100644 --- a/hwdb/20-bluetooth-vendor-product.hwdb +++ b/hwdb/20-bluetooth-vendor-product.hwdb @@ -1430,3 +1430,45 @@ bluetooth:v01D9* diff --git a/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch b/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch index 160a925..7b188fa 100644 --- a/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch +++ b/SOURCES/0059-journal-make-skipping-of-exhausted-journal-files-eff.patch @@ -30,7 +30,7 @@ except that: 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 0f28718..24c49b9 100644 +index 0f28718b0..24c49b916 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2014,8 +2014,7 @@ void journal_file_reset_location(JournalFile *f) { @@ -44,7 +44,7 @@ index 0f28718..24c49b9 100644 f->current_offset = offset; f->current_seqnum = le64toh(o->entry.seqnum); diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h -index 2526e14..403c8f7 100644 +index 2526e14d6..403c8f760 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -199,7 +199,7 @@ int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t s @@ -57,7 +57,7 @@ index 2526e14..403c8f7 100644 int journal_file_next_entry(JournalFile *f, uint64_t p, direction_t direction, Object **ret, uint64_t *offset); diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 94891cd..9b57e59 100644 +index 94891cdf3..9b57e5945 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -723,13 +723,17 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc diff --git a/SOURCES/0060-shared-condition-fix-gcc5-warning.patch b/SOURCES/0060-shared-condition-fix-gcc5-warning.patch index c697235..741690b 100644 --- a/SOURCES/0060-shared-condition-fix-gcc5-warning.patch +++ b/SOURCES/0060-shared-condition-fix-gcc5-warning.patch @@ -28,7 +28,7 @@ src/shared/condition.c:47:9: note: in expansion of macro ‘assert’ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/condition.c b/src/shared/condition.c -index da7560f..796cc52 100644 +index da7560f05..796cc520d 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -46,7 +46,7 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger diff --git a/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch b/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch index 248ce01..ccf7ab1 100644 --- a/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch +++ b/SOURCES/0061-man-correct-description-of-systemd-user-sessions.patch @@ -11,7 +11,7 @@ That part of functionality was removed in 7fb3ee51c1b377. 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/man/systemd-user-sessions.service.xml b/man/systemd-user-sessions.service.xml -index 9d796b1..e75ef11 100644 +index 9d796b1ae..e75ef11c4 100644 --- a/man/systemd-user-sessions.service.xml +++ b/man/systemd-user-sessions.service.xml @@ -55,13 +55,12 @@ diff --git a/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch b/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch index 76c32f3..1e141bd 100644 --- a/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch +++ b/SOURCES/0062-build-sys-allow-lto-and-FORTIFY_SOURCE-with-O-sz.patch @@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89382 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 9c25c3c..3201428 100644 +index 9c25c3c6f..3201428c4 100644 --- a/configure.ac +++ b/configure.ac @@ -208,13 +208,13 @@ AS_CASE([$CC], [*clang*], diff --git a/SOURCES/0063-man-fix-typo.patch b/SOURCES/0063-man-fix-typo.patch index 60fe6df..08edf6c 100644 --- a/SOURCES/0063-man-fix-typo.patch +++ b/SOURCES/0063-man-fix-typo.patch @@ -9,7 +9,7 @@ Subject: [PATCH] man: fix typo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml -index 4480e19..ef58887 100644 +index 4480e1999..ef58887dc 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -108,7 +108,7 @@ diff --git a/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch b/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch index 9671e78..4156898 100644 --- a/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch +++ b/SOURCES/0064-bus-proxyd-avoid-logging-oom-twice.patch @@ -9,7 +9,7 @@ Subject: [PATCH] bus-proxyd: avoid logging oom twice 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c -index b6b0056..b6550ed 100644 +index b6b005636..b6550ed3c 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -82,7 +82,7 @@ static int client_context_new(ClientContext **out) { diff --git a/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch b/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch index 9f2a66c..c376514 100644 --- a/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch +++ b/SOURCES/0065-Do-not-run-sysv-generator-test-when-sysv-compat-is-d.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Do not run sysv-generator-test when sysv compat is disabled 1 file changed, 5 insertions(+) diff --git a/Makefile.am b/Makefile.am -index 2e6455f..4933f76 100644 +index 2e6455f6e..4933f76bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3789,9 +3789,14 @@ TESTS += \ diff --git a/SOURCES/0066-README-mention-ACLs-more.patch b/SOURCES/0066-README-mention-ACLs-more.patch index 93e5683..7785e09 100644 --- a/SOURCES/0066-README-mention-ACLs-more.patch +++ b/SOURCES/0066-README-mention-ACLs-more.patch @@ -11,7 +11,7 @@ They are now useful for any fs used for journal storage. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README -index ac2a81c..ffc2cf9 100644 +index ac2a81c0c..ffc2cf9f2 100644 --- a/README +++ b/README @@ -78,8 +78,8 @@ REQUIREMENTS: diff --git a/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch b/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch index 57e3439..cc8b568 100644 --- a/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch +++ b/SOURCES/0067-Do-not-advertise-.d-snippets-over-main-config-file.patch @@ -31,7 +31,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89397 16 files changed, 73 insertions(+), 45 deletions(-) diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml -index 8d9700d..bf6ca0b 100644 +index 8d9700d30..bf6ca0bf9 100644 --- a/man/bootchart.conf.xml +++ b/man/bootchart.conf.xml @@ -68,8 +68,7 @@ @@ -45,7 +45,7 @@ index 8d9700d..bf6ca0b 100644 <refsect1> <title>Options</title> diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml -index 3d325e6..0b7329b 100644 +index 3d325e6ad..0b7329bf5 100644 --- a/man/coredump.conf.xml +++ b/man/coredump.conf.xml @@ -63,8 +63,7 @@ @@ -59,7 +59,7 @@ index 3d325e6..0b7329b 100644 <refsect1> <title>Options</title> diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index 364b58f..85146b0 100644 +index 364b58f07..85146b0d8 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -64,8 +64,7 @@ @@ -73,7 +73,7 @@ index 364b58f..85146b0 100644 <refsect1> <title>Options</title> diff --git a/man/logind.conf.xml b/man/logind.conf.xml -index ffaec50..ca2b187 100644 +index ffaec5035..ca2b18783 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -58,11 +58,13 @@ @@ -94,7 +94,7 @@ index ffaec50..ca2b187 100644 <refsect1> <title>Options</title> diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml -index 36cae27..8047a4e 100644 +index 36cae2706..8047a4ea7 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -63,8 +63,7 @@ @@ -108,7 +108,7 @@ index 36cae27..8047a4e 100644 <refsect1> <title>Options</title> diff --git a/man/standard-conf.xml b/man/standard-conf.xml -index b87d7e9..36af459 100644 +index b87d7e955..36af45927 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -33,13 +33,39 @@ @@ -160,7 +160,7 @@ index b87d7e9..36af459 100644 </refsection> </refsection> diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml -index 433f2f8..bb17ec8 100644 +index 433f2f83a..bb17ec866 100644 --- a/man/systemd-sleep.conf.xml +++ b/man/systemd-sleep.conf.xml @@ -112,8 +112,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. @@ -174,7 +174,7 @@ index 433f2f8..bb17ec8 100644 <refsect1> <title>Options</title> diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index 7c3f237..c7bcfae 100644 +index 7c3f23756..c7bcfaee4 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -74,8 +74,7 @@ @@ -188,7 +188,7 @@ index 7c3f237..c7bcfae 100644 <refsect1> <title>Options</title> diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml -index 1127970..89a651c 100644 +index 1127970a1..89a651c66 100644 --- a/man/timesyncd.conf.xml +++ b/man/timesyncd.conf.xml @@ -63,8 +63,7 @@ @@ -202,7 +202,7 @@ index 1127970..89a651c 100644 <refsect1> <title>Options</title> diff --git a/src/bootchart/bootchart.conf b/src/bootchart/bootchart.conf -index 2d7cb61..4f5e509 100644 +index 2d7cb6121..4f5e50936 100644 --- a/src/bootchart/bootchart.conf +++ b/src/bootchart/bootchart.conf @@ -5,10 +5,11 @@ @@ -221,7 +221,7 @@ index 2d7cb61..4f5e509 100644 [Bootchart] #Samples=500 diff --git a/src/core/system.conf b/src/core/system.conf -index a372720..2316090 100644 +index a3727200d..231609033 100644 --- a/src/core/system.conf +++ b/src/core/system.conf @@ -5,10 +5,11 @@ @@ -240,7 +240,7 @@ index a372720..2316090 100644 [Manager] #LogLevel=info diff --git a/src/journal/coredump.conf b/src/journal/coredump.conf -index 0fe9fe8..c2f0643 100644 +index 0fe9fe801..c2f0643e0 100644 --- a/src/journal/coredump.conf +++ b/src/journal/coredump.conf @@ -5,10 +5,11 @@ @@ -259,7 +259,7 @@ index 0fe9fe8..c2f0643 100644 [Coredump] #Storage=external diff --git a/src/journal/journald.conf b/src/journal/journald.conf -index 29bdf8f..47eefe9 100644 +index 29bdf8f18..47eefe91c 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -5,10 +5,11 @@ @@ -278,7 +278,7 @@ index 29bdf8f..47eefe9 100644 [Journal] #Storage=auto diff --git a/src/login/logind.conf b/src/login/logind.conf -index 6b1943a..834c4c2 100644 +index 6b1943a2d..834c4c2eb 100644 --- a/src/login/logind.conf +++ b/src/login/logind.conf @@ -5,10 +5,11 @@ @@ -297,7 +297,7 @@ index 6b1943a..834c4c2 100644 [Login] #NAutoVTs=6 diff --git a/src/resolve/resolved.conf.in b/src/resolve/resolved.conf.in -index e5a19ee..3eb19e4 100644 +index e5a19ee47..3eb19e42b 100644 --- a/src/resolve/resolved.conf.in +++ b/src/resolve/resolved.conf.in @@ -5,8 +5,9 @@ @@ -313,7 +313,7 @@ index e5a19ee..3eb19e4 100644 # See resolved.conf(5) for details diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in -index fc3c6c4..b6a2ada 100644 +index fc3c6c49c..b6a2ada27 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/timesync/timesyncd.conf.in @@ -5,10 +5,11 @@ diff --git a/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch b/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch index 52dcf04..680602b 100644 --- a/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch +++ b/SOURCES/0068-hwdb-add-pnpid-for-the-T450s-touchpad.patch @@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89411 1 file changed, 2 insertions(+) diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb -index bbf44db..9fcb5fd 100644 +index bbf44db77..9fcb5fdb9 100644 --- a/hwdb/70-touchpad.hwdb +++ b/hwdb/70-touchpad.hwdb @@ -36,4 +36,6 @@ diff --git a/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch b/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch index 6a68bb0..fb5bd17 100644 --- a/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch +++ b/SOURCES/0069-networkd-netdev-inform-when-we-take-over-an-existing.patch @@ -16,7 +16,7 @@ be to simply make the kernel stop creating these devices as they are pretty usel 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c -index 8119205..7d193d0 100644 +index 8119205dd..7d193d088 100644 --- a/src/network/networkd-netdev.c +++ b/src/network/networkd-netdev.c @@ -261,7 +261,7 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda diff --git a/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch b/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch index 657c617..9bff772 100644 --- a/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch +++ b/SOURCES/0070-man-replace-obsolete-wiki-link-with-man-page.patch @@ -18,7 +18,7 @@ Subject: [PATCH] man: replace obsolete wiki link with man page 10 files changed, 18 insertions(+), 34 deletions(-) diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml -index 0e48e79..1974cd7 100644 +index 0e48e7934..1974cd7a2 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -59,10 +59,8 @@ @@ -35,7 +35,7 @@ index 0e48e79..1974cd7 100644 <refsect1> diff --git a/man/systemd-debug-generator.xml b/man/systemd-debug-generator.xml -index 74c3b26..5c5e9fc 100644 +index 74c3b2620..5c5e9fc4a 100644 --- a/man/systemd-debug-generator.xml +++ b/man/systemd-debug-generator.xml @@ -79,10 +79,8 @@ @@ -52,7 +52,7 @@ index 74c3b26..5c5e9fc 100644 <refsect1> diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml -index b2d8d65..fd7ba79 100644 +index b2d8d65e3..fd7ba7983 100644 --- a/man/systemd-efi-boot-generator.xml +++ b/man/systemd-efi-boot-generator.xml @@ -68,9 +68,7 @@ @@ -67,7 +67,7 @@ index b2d8d65..fd7ba79 100644 <refsect1> diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml -index 8f82e33..022efb4 100644 +index 8f82e3330..022efb413 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -71,10 +71,8 @@ @@ -84,7 +84,7 @@ index 8f82e33..022efb4 100644 <refsect1> diff --git a/man/systemd-getty-generator.xml b/man/systemd-getty-generator.xml -index 0b5b2f2..3389259 100644 +index 0b5b2f2a7..338925964 100644 --- a/man/systemd-getty-generator.xml +++ b/man/systemd-getty-generator.xml @@ -75,9 +75,8 @@ @@ -100,7 +100,7 @@ index 0b5b2f2..3389259 100644 <para>Further information about configuration of gettys you may find in diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml -index 9c706df..8d2eaca 100644 +index 9c706df24..8d2eaca4f 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -157,9 +157,7 @@ @@ -115,7 +115,7 @@ index 9c706df..8d2eaca 100644 <refsect1> diff --git a/man/systemd-system-update-generator.xml b/man/systemd-system-update-generator.xml -index 3eec1d7..e7fc95c 100644 +index 3eec1d7b9..e7fc95c74 100644 --- a/man/systemd-system-update-generator.xml +++ b/man/systemd-system-update-generator.xml @@ -61,10 +61,8 @@ @@ -132,7 +132,7 @@ index 3eec1d7..e7fc95c 100644 <refsect1> diff --git a/man/systemd-sysv-generator.xml b/man/systemd-sysv-generator.xml -index e619b1b..f2d56cb 100644 +index e619b1bc2..f2d56cbcd 100644 --- a/man/systemd-sysv-generator.xml +++ b/man/systemd-sysv-generator.xml @@ -81,10 +81,8 @@ @@ -149,7 +149,7 @@ index e619b1b..f2d56cb 100644 <refsect1> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml -index 09e11b4..a452f87 100644 +index 09e11b471..a452f87ba 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -357,8 +357,8 @@ @@ -164,7 +164,7 @@ index 09e11b4..a452f87 100644 </refsect1> diff --git a/man/systemd.xml b/man/systemd.xml -index 80591dc..9b92140 100644 +index 80591dc73..9b92140e6 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -415,9 +415,8 @@ diff --git a/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch b/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch index 42132df..5140e7e 100644 --- a/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch +++ b/SOURCES/0071-Use-correct-uname-identifiers-in-arch_map-for-SuperH.patch @@ -11,7 +11,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89421 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/architecture.c b/src/shared/architecture.c -index 34c5a53..884abdd 100644 +index 34c5a53fa..884abdd3e 100644 --- a/src/shared/architecture.c +++ b/src/shared/architecture.c @@ -108,8 +108,12 @@ int uname_architecture(void) { diff --git a/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch b/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch index ce15d99..6ed6bfc 100644 --- a/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch +++ b/SOURCES/0072-hwdb-fix-Dell-XPS12-9Q33-key-name.patch @@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=84437 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb -index 2cb9769..8890665 100644 +index 2cb976923..88906655e 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -259,7 +259,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS*:pvr* diff --git a/SOURCES/0073-Remove-the-cap-on-epoll-events.patch b/SOURCES/0073-Remove-the-cap-on-epoll-events.patch index 57a1a34..7ec345e 100644 --- a/SOURCES/0073-Remove-the-cap-on-epoll-events.patch +++ b/SOURCES/0073-Remove-the-cap-on-epoll-events.patch @@ -14,7 +14,7 @@ avoiding this issue. 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index 25089a0..c6350be 100644 +index 25089a033..c6350be9f 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -37,7 +37,6 @@ diff --git a/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch b/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch index e89f571..c2d7f99 100644 --- a/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch +++ b/SOURCES/0074-Allow-up-to-4096-simultaneous-connections.patch @@ -16,7 +16,7 @@ This patch raises the limit to 4096. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/dbus.c b/src/core/dbus.c -index 260775c..85b5174 100644 +index 260775cd8..85b517486 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -44,7 +44,7 @@ diff --git a/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch b/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch index bd1835b..bc2be59 100644 --- a/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch +++ b/SOURCES/0075-hwdb-add-Logitech-G5-Laser-Mouse.patch @@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: add Logitech G5 Laser Mouse 1 file changed, 2 insertions(+) diff --git a/hwdb/70-mouse.hwdb b/hwdb/70-mouse.hwdb -index a62ebc4..93ee4d9 100644 +index a62ebc497..93ee4d9fa 100644 --- a/hwdb/70-mouse.hwdb +++ b/hwdb/70-mouse.hwdb @@ -196,6 +196,8 @@ mouse:usb:v046dpc52b:name:Logitech Unifying Device. Wireless PID:4008: diff --git a/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch b/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch index ee6b829..f491d81 100644 --- a/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch +++ b/SOURCES/0076-tmpfiles-Fix-handling-of-duplicate-lines.patch @@ -14,7 +14,7 @@ https://launchpad.net/bugs/1428540 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 187997e..1e10968 100644 +index 187997e1f..1e1096816 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1750,9 +1750,11 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) { diff --git a/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch b/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch index 40c282d..5dcb3ec 100644 --- a/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch +++ b/SOURCES/0077-hwdb-add-Lenovo-W451-to-TOUCHPAD_HAS_TRACKPOINT_BUTT.patch @@ -9,7 +9,7 @@ Subject: [PATCH] hwdb: add Lenovo W451 to TOUCHPAD_HAS_TRACKPOINT_BUTTONS list 1 file changed, 2 insertions(+) diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb -index 9fcb5fd..8a32446 100644 +index 9fcb5fdb9..8a324466b 100644 --- a/hwdb/70-touchpad.hwdb +++ b/hwdb/70-touchpad.hwdb @@ -36,6 +36,8 @@ diff --git a/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch b/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch index 303208c..19d04e4 100644 --- a/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch +++ b/SOURCES/0078-vconsole-match-on-vtcon-events-not-fbcon-ones.patch @@ -23,7 +23,7 @@ into existence. (The font table is a per-vtcon property.) 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in -index 0620096..35b9ad5 100644 +index 062009640..35b9ad515 100644 --- a/src/vconsole/90-vconsole.rules.in +++ b/src/vconsole/90-vconsole.rules.in @@ -5,7 +5,6 @@ diff --git a/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch b/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch index b446593..35f5273 100644 --- a/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch +++ b/SOURCES/0079-core-do-not-spawn-jobs-or-touch-other-units-during-c.patch @@ -36,7 +36,7 @@ Fixes https://bugs.freedesktop.org/show_bug.cgi?id=88401 16 files changed, 89 insertions(+), 33 deletions(-) diff --git a/src/core/automount.c b/src/core/automount.c -index 9f6bd84..e4c7941 100644 +index 9f6bd84b2..e4c79415d 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -235,7 +235,7 @@ static void automount_set_state(Automount *a, AutomountState state) { @@ -49,7 +49,7 @@ index 9f6bd84..e4c7941 100644 int r; diff --git a/src/core/busname.c b/src/core/busname.c -index 1d77292..43d7607 100644 +index 1d77292f9..43d7607a3 100644 --- a/src/core/busname.c +++ b/src/core/busname.c @@ -335,7 +335,7 @@ static void busname_set_state(BusName *n, BusNameState state) { @@ -62,7 +62,7 @@ index 1d77292..43d7607 100644 int r; diff --git a/src/core/device.c b/src/core/device.c -index 1cc103c..4ff8827 100644 +index 1cc103c29..4ff882721 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -142,7 +142,7 @@ static void device_set_state(Device *d, DeviceState state) { @@ -75,7 +75,7 @@ index 1cc103c..4ff8827 100644 assert(d); diff --git a/src/core/manager.c b/src/core/manager.c -index bc9b7ec..203a6a0 100644 +index bc9b7ec62..203a6a0a1 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -983,7 +983,28 @@ static int manager_coldplug(Manager *m) { @@ -128,7 +128,7 @@ index bc9b7ec..203a6a0 100644 r = q; } diff --git a/src/core/mount.c b/src/core/mount.c -index c971330..3ae0eb4 100644 +index c971330af..3ae0eb462 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -617,7 +617,7 @@ static void mount_set_state(Mount *m, MountState state) { @@ -141,7 +141,7 @@ index c971330..3ae0eb4 100644 MountState new_state = MOUNT_DEAD; int r; diff --git a/src/core/path.c b/src/core/path.c -index e5ea79f..51e36fa 100644 +index e5ea79fec..51e36fa8b 100644 --- a/src/core/path.c +++ b/src/core/path.c @@ -440,7 +440,12 @@ static void path_set_state(Path *p, PathState state) { @@ -173,7 +173,7 @@ index e5ea79f..51e36fa 100644 } diff --git a/src/core/scope.c b/src/core/scope.c -index b41db78..ae6614f 100644 +index b41db7872..ae6614fbf 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -173,7 +173,7 @@ static int scope_load(Unit *u) { @@ -186,7 +186,7 @@ index b41db78..ae6614f 100644 int r; diff --git a/src/core/service.c b/src/core/service.c -index 15e29be..7781b4e 100644 +index 15e29be14..7781b4e62 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -879,7 +879,7 @@ static void service_set_state(Service *s, ServiceState state) { @@ -199,7 +199,7 @@ index 15e29be..7781b4e 100644 int r; diff --git a/src/core/slice.c b/src/core/slice.c -index ae9819d..61ff9d3 100644 +index ae9819d01..61ff9d331 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -153,7 +153,7 @@ static int slice_load(Unit *u) { @@ -212,7 +212,7 @@ index ae9819d..61ff9d3 100644 assert(t); diff --git a/src/core/snapshot.c b/src/core/snapshot.c -index b70c3be..b1d8448 100644 +index b70c3beb6..b1d844877 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -75,7 +75,7 @@ static int snapshot_load(Unit *u) { @@ -225,7 +225,7 @@ index b70c3be..b1d8448 100644 assert(s); diff --git a/src/core/socket.c b/src/core/socket.c -index 88aae48..760de02 100644 +index 88aae4815..760de0203 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1326,7 +1326,7 @@ static void socket_set_state(Socket *s, SocketState state) { @@ -238,7 +238,7 @@ index 88aae48..760de02 100644 int r; diff --git a/src/core/swap.c b/src/core/swap.c -index 5c19af5..369abf0 100644 +index 5c19af5d9..369abf0f5 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -513,7 +513,7 @@ static void swap_set_state(Swap *s, SwapState state) { @@ -251,7 +251,7 @@ index 5c19af5..369abf0 100644 SwapState new_state = SWAP_DEAD; int r; diff --git a/src/core/target.c b/src/core/target.c -index 33fb66b..2411a8e 100644 +index 33fb66bc3..2411a8e75 100644 --- a/src/core/target.c +++ b/src/core/target.c @@ -107,7 +107,7 @@ static int target_load(Unit *u) { @@ -264,7 +264,7 @@ index 33fb66b..2411a8e 100644 assert(t); diff --git a/src/core/timer.c b/src/core/timer.c -index 45744c7..48cf9c1 100644 +index 45744c7de..48cf9c16a 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -268,7 +268,12 @@ static void timer_set_state(Timer *t, TimerState state) { @@ -296,7 +296,7 @@ index 45744c7..48cf9c1 100644 } diff --git a/src/core/unit.c b/src/core/unit.c -index a6558ee..565455b 100644 +index a6558ee23..565455bd6 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2859,27 +2859,34 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) { @@ -344,7 +344,7 @@ index a6558ee..565455b 100644 return 0; } diff --git a/src/core/unit.h b/src/core/unit.h -index 291bc77..7ebc489 100644 +index 291bc77a7..7ebc489c8 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -307,8 +307,14 @@ struct UnitVTable { diff --git a/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch b/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch index 2414db8..7ed65ee 100644 --- a/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch +++ b/SOURCES/0080-firstboot-set-all-spwd-fields-to-1-for-consistency-w.patch @@ -10,7 +10,7 @@ Subject: [PATCH] firstboot: set all spwd fields to -1 for consistency with 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index a765d6d..a37ca17 100644 +index a765d6d21..a37ca170f 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -525,9 +525,9 @@ static int process_root_password(void) { diff --git a/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch b/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch index b84cd49..42754c7 100644 --- a/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch +++ b/SOURCES/0081-sysusers-do-not-reject-users-with-already-present-et.patch @@ -14,7 +14,7 @@ It's better to relax checks here than to duplicate functionality in firstboot. 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c -index e47bcb4..76b5962 100644 +index e47bcb4dc..76b5962c5 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -605,6 +605,8 @@ static int write_files(void) { diff --git a/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch b/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch index 2c64837..365ea8c 100644 --- a/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch +++ b/SOURCES/0082-nspawn-fix-use-after-free-and-leak-in-error-paths.patch @@ -11,7 +11,7 @@ CID #1257765. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 7724df9..78bd584 100644 +index 7724df96b..78bd58483 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3627,7 +3627,7 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch b/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch index 609ac40..9b65c08 100644 --- a/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch +++ b/SOURCES/0083-login-fix-copy-pasto-in-error-path.patch @@ -11,7 +11,7 @@ CID #1256583. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/login/inhibit.c b/src/login/inhibit.c -index 44bda34..88af23e 100644 +index 44bda34af..88af23e35 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -260,7 +260,7 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch b/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch index fbdd2f0..76156cb 100644 --- a/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch +++ b/SOURCES/0084-journalctl-update-hint-now-that-we-set-ACL-everywher.patch @@ -9,7 +9,7 @@ Subject: [PATCH] journalctl: update hint now that we set ACL everywhere 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 55c7786..12c869f 100644 +index 55c778633..12c869f5a 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1542,10 +1542,17 @@ static int access_check_var_log_journal(sd_journal *j) { diff --git a/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch b/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch index 71f0e41..acb14c3 100644 --- a/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch +++ b/SOURCES/0085-sd-journal-return-error-when-we-cannot-open-a-file.patch @@ -12,7 +12,7 @@ properly when the user lacks permissions. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 9b57e59..9b9e8ac 100644 +index 9b57e5945..9b9e8ac85 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1248,7 +1248,7 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) { diff --git a/SOURCES/0086-missing.h-add-NDA_.patch b/SOURCES/0086-missing.h-add-NDA_.patch index 80ace08..7a138df 100644 --- a/SOURCES/0086-missing.h-add-NDA_.patch +++ b/SOURCES/0086-missing.h-add-NDA_.patch @@ -13,7 +13,7 @@ introduced in v3.9 and NDA_PORT, NDA_VNI and NDA_IFINDEX in v3.10 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 3201428..081ed0f 100644 +index 3201428c4..081ed0f6e 100644 --- a/configure.ac +++ b/configure.ac @@ -334,7 +334,8 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE, @@ -35,7 +35,7 @@ index 3201428..081ed0f 100644 # This makes sure pkg.m4 is available. diff --git a/src/shared/missing.h b/src/shared/missing.h -index 8cb0b2c..6ef4dbd 100644 +index 8cb0b2c96..6ef4dbdf4 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -35,6 +35,7 @@ diff --git a/SOURCES/0087-udevd-close-race-in-udev-settle.patch b/SOURCES/0087-udevd-close-race-in-udev-settle.patch index 280a322..f9c94c7 100644 --- a/SOURCES/0087-udevd-close-race-in-udev-settle.patch +++ b/SOURCES/0087-udevd-close-race-in-udev-settle.patch @@ -33,7 +33,7 @@ Reported-by: Daniel Drake <drake@endlessm.com> 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 99d4c89..e98c1fd 100644 +index 99d4c8983..e98c1fd6d 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -909,6 +909,17 @@ static void handle_signal(struct udev *udev, int signo) { diff --git a/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch b/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch index c115ee4..1c575a5 100644 --- a/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch +++ b/SOURCES/0088-man-document-that-ExecStartPre-is-not-the-place-to-s.patch @@ -10,7 +10,7 @@ Subject: [PATCH] man: document that ExecStartPre= is not the place to start 1 file changed, 5 insertions(+) diff --git a/man/systemd.service.xml b/man/systemd.service.xml -index c03b4e8..f598705 100644 +index c03b4e8a5..f59870563 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -334,6 +334,11 @@ diff --git a/SOURCES/0089-journal-fix-return-code.patch b/SOURCES/0089-journal-fix-return-code.patch index 2b26cf4..181e296 100644 --- a/SOURCES/0089-journal-fix-return-code.patch +++ b/SOURCES/0089-journal-fix-return-code.patch @@ -14,7 +14,7 @@ recurse this deep. 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 24c49b9..f500568 100644 +index 24c49b916..f500568fe 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2652,10 +2652,8 @@ int journal_file_open( diff --git a/SOURCES/0090-console-fix-error-code-inversion.patch b/SOURCES/0090-console-fix-error-code-inversion.patch index b6095ee..9a1c797 100644 --- a/SOURCES/0090-console-fix-error-code-inversion.patch +++ b/SOURCES/0090-console-fix-error-code-inversion.patch @@ -13,7 +13,7 @@ instead of <0, which will not be detected as error by sysview-core. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c -index 9dd62f0..25de0a2 100644 +index 9dd62f04a..25de0a218 100644 --- a/src/console/consoled-manager.c +++ b/src/console/consoled-manager.c @@ -228,7 +228,7 @@ static int manager_sysview_session_control(Manager *m, sysview_event *event) { diff --git a/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch b/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch index d087b18..22e3e42 100644 --- a/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch +++ b/SOURCES/0091-bus-proxy-complain-only-once-about-queue-overflows.patch @@ -29,7 +29,7 @@ dbus-daemon does). 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c -index 3dea908..e13cf5e 100644 +index 3dea908f5..e13cf5e2e 100644 --- a/src/bus-proxyd/proxy.c +++ b/src/bus-proxyd/proxy.c @@ -729,13 +729,21 @@ static int proxy_process_destination_to_local(Proxy *p) { @@ -59,7 +59,7 @@ index 3dea908..e13cf5e 100644 } diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h -index 913d470..782c4e6 100644 +index 913d47071..782c4e60b 100644 --- a/src/bus-proxyd/proxy.h +++ b/src/bus-proxyd/proxy.h @@ -40,6 +40,7 @@ struct Proxy { diff --git a/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch b/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch index 1418d3d..cf4fcf0 100644 --- a/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch +++ b/SOURCES/0092-cgtop-fix-assert-when-not-on-tty.patch @@ -17,7 +17,7 @@ Aborted (core dumped) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c -index 3c7ad40..f951c37 100644 +index 3c7ad4060..f951c37cb 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -447,7 +447,7 @@ static int display(Hashmap *a) { diff --git a/SOURCES/0093-man-split-paragraph.patch b/SOURCES/0093-man-split-paragraph.patch index 8833a00..710bca8 100644 --- a/SOURCES/0093-man-split-paragraph.patch +++ b/SOURCES/0093-man-split-paragraph.patch @@ -12,7 +12,7 @@ paragraph to make it much easier to find. 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 11b160e..fdb1578 100644 +index 11b160e58..fdb157864 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -283,7 +283,9 @@ diff --git a/SOURCES/0094-hwdb-update.patch b/SOURCES/0094-hwdb-update.patch index 7b5c751..85fd5c3 100644 --- a/SOURCES/0094-hwdb-update.patch +++ b/SOURCES/0094-hwdb-update.patch @@ -12,7 +12,7 @@ Subject: [PATCH] hwdb: update 4 files changed, 1060 insertions(+), 334 deletions(-) diff --git a/hwdb/20-OUI.hwdb b/hwdb/20-OUI.hwdb -index 6976bdf..deb323d 100644 +index 6976bdf64..deb323d34 100644 --- a/hwdb/20-OUI.hwdb +++ b/hwdb/20-OUI.hwdb @@ -28829,7 +28829,7 @@ OUI:0013EB* @@ -844,7 +844,7 @@ index 6976bdf..deb323d 100644 ID_OUI_FROM_DATABASE=HBC-radiomatic diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb/20-pci-vendor-model.hwdb -index 6c22088..3b35b26 100644 +index 6c2208887..3b35b26e5 100644 --- a/hwdb/20-pci-vendor-model.hwdb +++ b/hwdb/20-pci-vendor-model.hwdb @@ -4361,6 +4361,9 @@ pci:v00001002d0000665Csv00001787sd00002329* @@ -2631,7 +2631,7 @@ index 6c22088..3b35b26 100644 ID_VENDOR_FROM_DATABASE=JusonTech Corporation diff --git a/hwdb/20-sdio-vendor-model.hwdb b/hwdb/20-sdio-vendor-model.hwdb -index 626d673..9cf34b2 100644 +index 626d673c4..9cf34b2a3 100644 --- a/hwdb/20-sdio-vendor-model.hwdb +++ b/hwdb/20-sdio-vendor-model.hwdb @@ -80,6 +80,36 @@ sdio:c*v02D0* @@ -2672,7 +2672,7 @@ index 626d673..9cf34b2 100644 ID_VENDOR_FROM_DATABASE=SyChip Inc. diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb/20-usb-vendor-model.hwdb -index 94e0269..8867531 100644 +index 94e0269ce..8867531a3 100644 --- a/hwdb/20-usb-vendor-model.hwdb +++ b/hwdb/20-usb-vendor-model.hwdb @@ -503,6 +503,9 @@ usb:v03F0p0217* diff --git a/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch b/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch index b93ebee..ee3b7cb 100644 --- a/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch +++ b/SOURCES/0095-networkd-Begin-with-serial-number-1-for-netlink-requ.patch @@ -28,7 +28,7 @@ will fail with -EBUSY. 1 file changed, 5 insertions(+) diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c -index ae49c77..7cdcc5d 100644 +index ae49c77e0..7cdcc5d96 100644 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c @@ -61,6 +61,11 @@ static int sd_rtnl_new(sd_rtnl **ret) { diff --git a/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch b/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch index 42f7036..ce6a718 100644 --- a/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch +++ b/SOURCES/0096-journal-remote-downgrade-routine-messages-to-debug.patch @@ -13,7 +13,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89486 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c -index afded7e..6c096de 100644 +index afded7e38..6c096de03 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -443,7 +443,7 @@ int process_source(RemoteSource *source, bool compress, bool seal) { @@ -26,7 +26,7 @@ index afded7e..6c096de 100644 if (!source->iovw.count) { diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c -index df30049..99820fa 100644 +index df3004939..99820fa7b 100644 --- a/src/journal-remote/journal-remote-write.c +++ b/src/journal-remote/journal-remote-write.c @@ -156,7 +156,7 @@ int writer_write(Writer *w, @@ -39,7 +39,7 @@ index df30049..99820fa 100644 log_debug("Retrying write."); r = journal_file_append_entry(w->journal, ts, iovw->iovec, iovw->count, diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index 8f32a9a..d1486e7 100644 +index 8f32a9a98..d1486e7cd 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -207,7 +207,7 @@ static int open_output(Writer *w, const char* host) { @@ -156,7 +156,7 @@ index 8f32a9a..d1486e7 100644 *hostname = b; diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c -index a95fff1..b45c38d 100644 +index a95fff18f..b45c38d68 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -178,7 +178,7 @@ static int verify_cert_authorized(gnutls_session_t session) { diff --git a/SOURCES/0097-journal-remote-process-events-without-delay.patch b/SOURCES/0097-journal-remote-process-events-without-delay.patch index 620048e..4485494 100644 --- a/SOURCES/0097-journal-remote-process-events-without-delay.patch +++ b/SOURCES/0097-journal-remote-process-events-without-delay.patch @@ -26,7 +26,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89516 3 files changed, 59 insertions(+), 8 deletions(-) diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c -index 6c096de..7e62954 100644 +index 6c096de03..7e6295435 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -41,6 +41,7 @@ void source_free(RemoteSource *source) { @@ -38,7 +38,7 @@ index 6c096de..7e62954 100644 free(source); } diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h -index 22db550..06a5029 100644 +index 22db55091..06a50296a 100644 --- a/src/journal-remote/journal-remote-parse.h +++ b/src/journal-remote/journal-remote-parse.h @@ -54,6 +54,7 @@ typedef struct RemoteSource { @@ -50,7 +50,7 @@ index 22db550..06a5029 100644 RemoteSource* source_new(int fd, bool passive_fd, char *name, Writer *writer); diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index d1486e7..b7cc6d7 100644 +index d1486e7cd..b7cc6d717 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -289,6 +289,8 @@ static int dispatch_raw_source_event(sd_event_source *event, diff --git a/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch b/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch index ff6a9b4..35908f5 100644 --- a/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch +++ b/SOURCES/0098-man-update-example-2-in-systemd.network-5.patch @@ -12,7 +12,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89221 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml -index 485876b..24f8416 100644 +index 485876b6a..24f8416ef 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -643,7 +643,7 @@ Gateway=192.168.0.1</programlisting> diff --git a/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch b/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch index b3e8549..3a73255 100644 --- a/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch +++ b/SOURCES/0099-gpt-auto-generator-fix-detection-of-srv.patch @@ -10,7 +10,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=89226 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c -index 7d5a6c6..cceeeb8 100644 +index 7d5a6c650..cceeeb845 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -549,7 +549,7 @@ static int enumerate_partitions(dev_t devnum) { diff --git a/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch b/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch index fbaa11b..09542c2 100644 --- a/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch +++ b/SOURCES/0100-sd-rtnl-never-set-serial-to-0.patch @@ -14,7 +14,7 @@ Suggested by Richard Maw. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c -index 7cdcc5d..5df39e1 100644 +index 7cdcc5d96..5df39e117 100644 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c @@ -262,7 +262,7 @@ static void rtnl_seal_message(sd_rtnl *rtnl, sd_rtnl_message *m) { diff --git a/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch b/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch index e1e35cc..0061d56 100644 --- a/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch +++ b/SOURCES/0101-gpt-auto-generator-allow-type-check-to-fail.patch @@ -12,7 +12,7 @@ the variable to NULL not to pass garbage on error. 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c -index cceeeb8..00a2141 100644 +index cceeeb845..00a2141a5 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -291,7 +291,7 @@ static int probe_and_add_mount( diff --git a/SOURCES/0102-man-fix-a-bunch-of-links.patch b/SOURCES/0102-man-fix-a-bunch-of-links.patch index 6b6b610..584f2a0 100644 --- a/SOURCES/0102-man-fix-a-bunch-of-links.patch +++ b/SOURCES/0102-man-fix-a-bunch-of-links.patch @@ -64,7 +64,7 @@ Conflicts: 51 files changed, 151 insertions(+), 151 deletions(-) diff --git a/man/busctl.xml b/man/busctl.xml -index 251233b..cc1844b 100644 +index 251233bb9..cc1844b0a 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -288,7 +288,7 @@ @@ -86,7 +86,7 @@ index 251233b..cc1844b 100644 </refsect1> </refentry> diff --git a/man/crypttab.xml b/man/crypttab.xml -index aeacc57..3e249ad 100644 +index aeacc5797..3e249ad23 100644 --- a/man/crypttab.xml +++ b/man/crypttab.xml @@ -75,7 +75,7 @@ @@ -180,7 +180,7 @@ index aeacc57..3e249ad 100644 <citerefentry project='man-pages'><refentrytitle>mke2fs</refentrytitle><manvolnum>8</manvolnum></citerefentry> </para> diff --git a/man/file-hierarchy.xml b/man/file-hierarchy.xml -index e9c894f..364e130 100644 +index e9c894f5c..364e13079 100644 --- a/man/file-hierarchy.xml +++ b/man/file-hierarchy.xml @@ -397,7 +397,7 @@ @@ -193,7 +193,7 @@ index e9c894f..364e130 100644 <literal>tmpfs</literal> file system. Since all users have write access to this directory, special care should be taken diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml -index 3741cf9..919bd13 100644 +index 3741cf9cc..919bd1374 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -336,7 +336,7 @@ @@ -206,7 +206,7 @@ index 3741cf9..919bd13 100644 <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para> </listitem> diff --git a/man/locale.conf.xml b/man/locale.conf.xml -index 48c0006..2c32d16 100644 +index 48c0006db..2c32d1609 100644 --- a/man/locale.conf.xml +++ b/man/locale.conf.xml @@ -91,7 +91,7 @@ @@ -239,7 +239,7 @@ index 48c0006..2c32d16 100644 <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> diff --git a/man/localectl.xml b/man/localectl.xml -index aae6e06..7def047 100644 +index aae6e0629..7def047f6 100644 --- a/man/localectl.xml +++ b/man/localectl.xml @@ -124,7 +124,7 @@ @@ -266,7 +266,7 @@ index aae6e06..7def047 100644 <ulink url="http://www.x.org/releases/current/doc/xorg-docs/input/XKB-Config.html"> The XKB Configuration Guide diff --git a/man/logind.conf.xml b/man/logind.conf.xml -index ca2b187..d02d573 100644 +index ca2b18783..d02d57356 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -126,7 +126,7 @@ @@ -279,7 +279,7 @@ index ca2b187..d02d573 100644 <varlistentry> diff --git a/man/machine-id.xml b/man/machine-id.xml -index 83e0b26..92d67a3 100644 +index 83e0b26ce..92d67a386 100644 --- a/man/machine-id.xml +++ b/man/machine-id.xml @@ -75,7 +75,7 @@ @@ -301,7 +301,7 @@ index 83e0b26..92d67a3 100644 <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>os-release</refentrytitle><manvolnum>5</manvolnum></citerefentry>, diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml -index 34a937d..4b722aa 100644 +index 34a937db6..4b722aa12 100644 --- a/man/modules-load.d.xml +++ b/man/modules-load.d.xml @@ -94,7 +94,7 @@ virtio-net</programlisting> @@ -314,7 +314,7 @@ index 34a937d..4b722aa 100644 </refsect1> diff --git a/man/os-release.xml b/man/os-release.xml -index 1b71a49..8f4ab10 100644 +index 1b71a49d0..8f4ab10fe 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -316,7 +316,7 @@ BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting> @@ -327,7 +327,7 @@ index 1b71a49..8f4ab10 100644 <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry> diff --git a/man/sd_bus_message_append.xml b/man/sd_bus_message_append.xml -index 0c49a0c..11fa07c 100644 +index 0c49a0c7c..11fa07c63 100644 --- a/man/sd_bus_message_append.xml +++ b/man/sd_bus_message_append.xml @@ -245,7 +245,7 @@ sd_bus_message_append(m, "ynqiuxtd", y, n, q, i, u, x, t, d);</programlisting> @@ -340,7 +340,7 @@ index 0c49a0c..11fa07c 100644 <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml -index e7a7659..2bbb010 100644 +index e7a765962..2bbb01069 100644 --- a/man/sd_bus_open_user.xml +++ b/man/sd_bus_open_user.xml @@ -208,7 +208,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. @@ -353,7 +353,7 @@ index e7a7659..2bbb010 100644 <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> diff --git a/man/sd_event_add_signal.xml b/man/sd_event_add_signal.xml -index 0299aa5..7c8df7d 100644 +index 0299aa5a5..7c8df7df8 100644 --- a/man/sd_event_add_signal.xml +++ b/man/sd_event_add_signal.xml @@ -86,7 +86,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. @@ -375,7 +375,7 @@ index 0299aa5..7c8df7d 100644 <para>Only a single handler may be installed for a specific diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml -index 1dcbadd..c19eb11 100644 +index 1dcbadd18..c19eb11b2 100644 --- a/man/sd_journal_get_catalog.xml +++ b/man/sd_journal_get_catalog.xml @@ -130,7 +130,7 @@ @@ -388,7 +388,7 @@ index 1dcbadd..c19eb11 100644 </refsect1> diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml -index 2b7f443..a400d8b 100644 +index 2b7f443f2..a400d8b1b 100644 --- a/man/sd_journal_get_cursor.xml +++ b/man/sd_journal_get_cursor.xml @@ -84,7 +84,7 @@ @@ -401,7 +401,7 @@ index 2b7f443..a400d8b 100644 <citerefentry project='man-pages'><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>.</para> diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml -index 068b10e..0cd0b45 100644 +index 068b10e7c..0cd0b45b9 100644 --- a/man/sd_journal_print.xml +++ b/man/sd_journal_print.xml @@ -119,7 +119,7 @@ @@ -456,7 +456,7 @@ index 068b10e..0cd0b45 100644 </refsect1> diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml -index 5a35cfe..8a13179 100644 +index 5a35cfe2c..8a131791a 100644 --- a/man/sysctl.d.xml +++ b/man/sysctl.d.xml @@ -57,7 +57,7 @@ @@ -482,7 +482,7 @@ index 5a35cfe..8a13179 100644 </refsect1> diff --git a/man/systemctl.xml b/man/systemctl.xml -index 6f30474..07eb431 100644 +index 6f30474c3..07eb43165 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1703,9 +1703,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service @@ -499,7 +499,7 @@ index 6f30474..07eb431 100644 </varlistentry> </variablelist> diff --git a/man/systemd-activate.xml b/man/systemd-activate.xml -index e64894a..cb68a79 100644 +index e64894a28..cb68a79be 100644 --- a/man/systemd-activate.xml +++ b/man/systemd-activate.xml @@ -165,7 +165,7 @@ @@ -512,7 +512,7 @@ index e64894a..cb68a79 100644 </refsect1> </refentry> diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml -index 1ff81d3..1983150 100644 +index 1ff81d3d5..198315052 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -145,7 +145,7 @@ @@ -534,7 +534,7 @@ index 1ff81d3..1983150 100644 left-hand and the right-hand, respectively, nodes of a relationship.</para> diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml -index 38ddf66..9b1a880 100644 +index 38ddf66d2..9b1a8809d 100644 --- a/man/systemd-cat.xml +++ b/man/systemd-cat.xml @@ -171,7 +171,7 @@ @@ -547,7 +547,7 @@ index 38ddf66..9b1a880 100644 </refsect1> diff --git a/man/systemd-cryptsetup-generator.xml b/man/systemd-cryptsetup-generator.xml -index 1974cd7..b627035 100644 +index 1974cd7a2..b6270358e 100644 --- a/man/systemd-cryptsetup-generator.xml +++ b/man/systemd-cryptsetup-generator.xml @@ -185,7 +185,7 @@ @@ -560,7 +560,7 @@ index 1974cd7..b627035 100644 </para> </refsect1> diff --git a/man/systemd-cryptsetup@.service.xml b/man/systemd-cryptsetup@.service.xml -index bd03637..ea52485 100644 +index bd03637de..ea524851e 100644 --- a/man/systemd-cryptsetup@.service.xml +++ b/man/systemd-cryptsetup@.service.xml @@ -78,7 +78,7 @@ @@ -573,7 +573,7 @@ index bd03637..ea52485 100644 </refsect1> diff --git a/man/systemd-efi-boot-generator.xml b/man/systemd-efi-boot-generator.xml -index fd7ba79..3431c3c 100644 +index fd7ba7983..3431c3ce5 100644 --- a/man/systemd-efi-boot-generator.xml +++ b/man/systemd-efi-boot-generator.xml @@ -62,7 +62,7 @@ @@ -595,7 +595,7 @@ index fd7ba79..3431c3c 100644 </refsect1> diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml -index 67d38ba..67289da 100644 +index 67d38ba31..67289daa2 100644 --- a/man/systemd-firstboot.xml +++ b/man/systemd-firstboot.xml @@ -91,7 +91,7 @@ @@ -652,7 +652,7 @@ index 67d38ba..67289da 100644 <citerefentry><refentrytitle>hostnamectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> </para> diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml -index 022efb4..bdc2dc1 100644 +index 022efb413..bdc2dc1d0 100644 --- a/man/systemd-fstab-generator.xml +++ b/man/systemd-fstab-generator.xml @@ -54,7 +54,7 @@ @@ -674,7 +674,7 @@ index 022efb4..bdc2dc1 100644 <citerefentry><refentrytitle>systemd.swap</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-cryptsetup-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry> diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml -index 8d2eaca..bcc64ec 100644 +index 8d2eaca4f..bcc64ec9b 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -66,7 +66,7 @@ @@ -700,7 +700,7 @@ index 8d2eaca..bcc64ec 100644 </refsect1> diff --git a/man/systemd-hibernate-resume-generator.xml b/man/systemd-hibernate-resume-generator.xml -index a21782c..d811b9b 100644 +index a21782cbf..d811b9b55 100644 --- a/man/systemd-hibernate-resume-generator.xml +++ b/man/systemd-hibernate-resume-generator.xml @@ -73,7 +73,7 @@ @@ -713,7 +713,7 @@ index a21782c..d811b9b 100644 supported.</para></listitem> </varlistentry> diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml -index 6b250b6..8280d6c 100644 +index 6b250b65e..8280d6c87 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -241,7 +241,7 @@ @@ -726,7 +726,7 @@ index 6b250b6..8280d6c 100644 <command>pydoc systemd.journal</command>. </para> diff --git a/man/systemd-localed.service.xml b/man/systemd-localed.service.xml -index 8999166..06aa78c 100644 +index 899916638..06aa78c0e 100644 --- a/man/systemd-localed.service.xml +++ b/man/systemd-localed.service.xml @@ -64,7 +64,7 @@ @@ -753,7 +753,7 @@ index 8999166..06aa78c 100644 </refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 4a936d3..65b4c2f 100644 +index 4a936d326..65b4c2f29 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -598,7 +598,7 @@ @@ -775,7 +775,7 @@ index 4a936d3..65b4c2f 100644 </refsect1> diff --git a/man/systemd-quotacheck.service.xml b/man/systemd-quotacheck.service.xml -index 2179f11..9d49762 100644 +index 2179f11e9..9d4976274 100644 --- a/man/systemd-quotacheck.service.xml +++ b/man/systemd-quotacheck.service.xml @@ -86,7 +86,7 @@ @@ -788,7 +788,7 @@ index 2179f11..9d49762 100644 </para> </refsect1> diff --git a/man/systemd-remount-fs.service.xml b/man/systemd-remount-fs.service.xml -index 7b88ac3..8e60e31 100644 +index 7b88ac3f3..8e60e31b5 100644 --- a/man/systemd-remount-fs.service.xml +++ b/man/systemd-remount-fs.service.xml @@ -56,7 +56,7 @@ @@ -812,7 +812,7 @@ index 7b88ac3..8e60e31 100644 </refsect1> diff --git a/man/systemd-socket-proxyd.xml b/man/systemd-socket-proxyd.xml -index 1c78b65..0b852e6 100644 +index 1c78b656e..0b852e6bc 100644 --- a/man/systemd-socket-proxyd.xml +++ b/man/systemd-socket-proxyd.xml @@ -72,7 +72,7 @@ @@ -838,7 +838,7 @@ index 1c78b65..0b852e6 100644 </refsect1> </refentry> diff --git a/man/systemd-sysctl.service.xml b/man/systemd-sysctl.service.xml -index f35a18a..d4c1a7e 100644 +index f35a18a4d..d4c1a7ebe 100644 --- a/man/systemd-sysctl.service.xml +++ b/man/systemd-sysctl.service.xml @@ -56,11 +56,11 @@ @@ -867,7 +867,7 @@ index f35a18a..d4c1a7e 100644 </refsect1> diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index c7bcfae..1b74ed3 100644 +index c7bcfaee4..1b74ed38f 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -172,7 +172,7 @@ @@ -880,7 +880,7 @@ index c7bcfae..1b74ed3 100644 others are removed. If the list of capabilities is prefixed with ~, all but the listed capabilities will be included, the diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml -index b842d29..c8a9cb7 100644 +index b842d2972..c8a9cb7c9 100644 --- a/man/systemd-update-utmp.service.xml +++ b/man/systemd-update-utmp.service.xml @@ -69,7 +69,7 @@ @@ -893,7 +893,7 @@ index b842d29..c8a9cb7 100644 </refsect1> diff --git a/man/systemd-vconsole-setup.service.xml b/man/systemd-vconsole-setup.service.xml -index 59bb5e4..7c6ed08 100644 +index 59bb5e4e8..7c6ed0899 100644 --- a/man/systemd-vconsole-setup.service.xml +++ b/man/systemd-vconsole-setup.service.xml @@ -57,9 +57,9 @@ @@ -920,7 +920,7 @@ index 59bb5e4..7c6ed08 100644 </para> </refsect1> diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml -index 3db65d9..b5b5885 100644 +index 3db65d988..b5b5885cd 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -96,7 +96,7 @@ @@ -944,7 +944,7 @@ index 3db65d9..b5b5885 100644 </para> </refsect1> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index fdb1578..56b53e6 100644 +index fdb157864..56b53e601 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -663,7 +663,7 @@ @@ -1020,7 +1020,7 @@ index fdb1578..56b53e6 100644 </varlistentry> diff --git a/man/systemd.generator.xml b/man/systemd.generator.xml -index ccb6987..9b39e73 100644 +index ccb698752..9b39e732e 100644 --- a/man/systemd.generator.xml +++ b/man/systemd.generator.xml @@ -333,7 +333,7 @@ find $dir</programlisting> @@ -1033,7 +1033,7 @@ index ccb6987..9b39e73 100644 <citerefentry><refentrytitle>systemd-gpt-auto-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-hibernate-resume-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>, diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml -index 1fd46de..7d6c5c7 100644 +index 1fd46de31..7d6c5c715 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -134,7 +134,7 @@ @@ -1046,7 +1046,7 @@ index 1fd46de..7d6c5c7 100644 </varlistentry> diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml -index c974e22..e57f0e7 100644 +index c974e2248..e57f0e724 100644 --- a/man/systemd.kill.xml +++ b/man/systemd.kill.xml @@ -135,7 +135,7 @@ @@ -1068,7 +1068,7 @@ index c974e22..e57f0e7 100644 </refsect1> diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml -index 5cbde8b..fcb9a44 100644 +index 5cbde8b84..fcb9a4416 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml @@ -68,7 +68,7 @@ @@ -1135,7 +1135,7 @@ index 5cbde8b..fcb9a44 100644 <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> diff --git a/man/systemd.network.xml b/man/systemd.network.xml -index 24f8416..9738627 100644 +index 24f8416ef..97386271d 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -286,7 +286,7 @@ @@ -1175,7 +1175,7 @@ index 24f8416..9738627 100644 given, it is derived from the <literal>Address</literal> key.</para> diff --git a/man/systemd.path.xml b/man/systemd.path.xml -index 08a7ec8..d02bc92 100644 +index 08a7ec897..d02bc92ae 100644 --- a/man/systemd.path.xml +++ b/man/systemd.path.xml @@ -74,7 +74,7 @@ @@ -1197,7 +1197,7 @@ index 08a7ec8..d02bc92 100644 </para> </refsect1> diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml -index 3938345..2f54193 100644 +index 3938345fa..2f541937f 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -265,7 +265,7 @@ @@ -1339,7 +1339,7 @@ index 3938345..2f54193 100644 </varlistentry> diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml -index 23b9c71..5016f45 100644 +index 23b9c712e..5016f453d 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -69,7 +69,7 @@ @@ -1388,7 +1388,7 @@ index 23b9c71..5016f45 100644 <citerefentry><refentrytitle>systemd.directives</refentrytitle><manvolnum>7</manvolnum></citerefentry> </para> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml -index a452f87..c2e374a 100644 +index a452f87ba..c2e374a94 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -826,7 +826,7 @@ @@ -1410,7 +1410,7 @@ index a452f87..c2e374a 100644 </refsect1> diff --git a/man/systemd.xml b/man/systemd.xml -index 9b92140..d006b0b 100644 +index 9b92140e6..d006b0bb9 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -1012,9 +1012,9 @@ @@ -1435,7 +1435,7 @@ index 9b92140..d006b0b 100644 <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>, <citerefentry><refentrytitle>systemd-notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml -index 17bea8b..27196d4 100644 +index 17bea8b68..27196d44e 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -129,9 +129,9 @@ FONT=eurlatgr</programlisting> diff --git a/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch b/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch index 9e34a20..ad0c8c1 100644 --- a/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch +++ b/SOURCES/0103-man-link-to-fd.o-for-dbus-stuff.patch @@ -13,7 +13,7 @@ Subject: [PATCH] man: link to fd.o for dbus stuff 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/man/busctl.xml b/man/busctl.xml -index cc1844b..807fc78 100644 +index cc1844b0a..807fc78e8 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -465,7 +465,7 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting> @@ -26,7 +26,7 @@ index cc1844b..807fc78 100644 <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink>, <citerefentry><refentrytitle>sd-bus</refentrytitle><manvolnum>3</manvolnum></citerefentry>, diff --git a/man/custom-html.xsl b/man/custom-html.xsl -index 32299db..706b95a 100644 +index 32299db71..706b95a1c 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -91,6 +91,19 @@ @@ -50,7 +50,7 @@ index 32299db..706b95a 100644 <!-- the ID is output in the block.object call for refsect1 --> <h2> diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml -index 2c77640..e0efe99 100644 +index 2c7764047..e0efe9985 100644 --- a/man/systemd-bus-proxyd.xml +++ b/man/systemd-bus-proxyd.xml @@ -101,7 +101,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. @@ -63,7 +63,7 @@ index 2c77640..e0efe99 100644 <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink> </para> diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml -index 141b43f..dc4f07f 100644 +index 141b43f6d..dc4f07ff1 100644 --- a/man/systemd-bus-proxyd@.service.xml +++ b/man/systemd-bus-proxyd@.service.xml @@ -73,7 +73,7 @@ @@ -76,7 +76,7 @@ index 141b43f..dc4f07f 100644 <ulink url="https://code.google.com/p/d-bus/">kdbus</ulink> </para> diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml -index 22bad3e..182717f 100644 +index 22bad3e5f..182717f52 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -122,7 +122,7 @@ diff --git a/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch b/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch index b468029..9b3e2ba 100644 --- a/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch +++ b/SOURCES/0104-man-fix-name-of-systemd.resource-control-5.patch @@ -9,7 +9,7 @@ Subject: [PATCH] man: fix name of systemd.resource-control(5) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemctl.xml b/man/systemctl.xml -index 07eb431..3c4c9cb 100644 +index 07eb43165..3c4c9cb92 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1732,7 +1732,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service diff --git a/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch b/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch index d8dfba6..80d8d4f 100644 --- a/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch +++ b/SOURCES/0105-selinux-fix-SEGV-during-switch-root-if-SELinux-polic.patch @@ -24,7 +24,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1185604 1 file changed, 1 insertion(+) diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c -index a2233e0..a46ddf8 100644 +index a2233e0cf..a46ddf849 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -117,6 +117,7 @@ void mac_selinux_finish(void) { diff --git a/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch b/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch index 3b404e3..345a3be 100644 --- a/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch +++ b/SOURCES/0106-service-don-t-add-After-dependencies-on-.busname-uni.patch @@ -10,7 +10,7 @@ Subject: [PATCH] service: don't add After= dependencies on .busname units if 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/service.c b/src/core/service.c -index 7781b4e..ae5e610 100644 +index 7781b4e62..ae5e61000 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -556,14 +556,16 @@ static int service_add_extras(Service *s) { diff --git a/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch b/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch index 41cca7b..4093a68 100644 --- a/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch +++ b/SOURCES/0107-libudev-monitor-fix-error-path-in-send_device.patch @@ -11,7 +11,7 @@ Return -errno rather than -1 in case sendmsg() fails. 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c -index 3f1fee7..d0486e3 100644 +index 3f1fee7f7..d0486e3d1 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -749,12 +749,20 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor, diff --git a/SOURCES/0108-core-remove-left-over-debug-message.patch b/SOURCES/0108-core-remove-left-over-debug-message.patch index 4774156..75fc9fa 100644 --- a/SOURCES/0108-core-remove-left-over-debug-message.patch +++ b/SOURCES/0108-core-remove-left-over-debug-message.patch @@ -9,7 +9,7 @@ Subject: [PATCH] core: remove left-over debug message 1 file changed, 2 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 90bf563..f17a82f 100644 +index 90bf5634c..f17a82fcd 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -634,8 +634,6 @@ int config_parse_exec(const char *unit, diff --git a/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch b/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch index a3e0e65..8852242 100644 --- a/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch +++ b/SOURCES/0109-units-there-is-no-systemd-udev-hwdb-update.service.patch @@ -9,7 +9,7 @@ Subject: [PATCH] units: there is no systemd-udev-hwdb-update.service 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in -index f6acd6f..2791f73 100644 +index f6acd6fe4..2791f73ac 100644 --- a/units/systemd-udevd.service.in +++ b/units/systemd-udevd.service.in @@ -10,7 +10,7 @@ Description=udev Kernel Device Manager diff --git a/SOURCES/0110-util-remove-redundant-debug-message.patch b/SOURCES/0110-util-remove-redundant-debug-message.patch index 70cfea3..ce4d068 100644 --- a/SOURCES/0110-util-remove-redundant-debug-message.patch +++ b/SOURCES/0110-util-remove-redundant-debug-message.patch @@ -14,7 +14,7 @@ The second line already says everything. 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c -index 8548723..1e1bf94 100644 +index 85487230a..1e1bf944f 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -4115,8 +4115,7 @@ static int do_execute(char **directories, usec_t timeout, char *argv[]) { diff --git a/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch b/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch index 15a637a..ea7e02e 100644 --- a/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch +++ b/SOURCES/0111-tmpfiles-remove-redundant-debug-message.patch @@ -12,7 +12,7 @@ Mar 13 19:48:30 adam.happyassassin.net systemd-tmpfiles[970]: /var/lib/machines 1 file changed, 2 deletions(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 1e10968..73a9c9d 100644 +index 1e1096816..73a9c9d5b 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1209,8 +1209,6 @@ static int create_item(Item *i) { diff --git a/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch b/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch index 453fdf9..7694f9c 100644 --- a/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch +++ b/SOURCES/0112-sysv-generator-initialize-LookupPaths-just-once.patch @@ -19,7 +19,7 @@ and constify it everywhere. 5 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 65f1c24..92b8d6e 100644 +index 65f1c245c..92b8d6e8e 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1084,7 +1084,7 @@ static int unit_file_load( @@ -159,7 +159,7 @@ index 65f1c24..92b8d6e 100644 _cleanup_strv_free_ char **files = NULL; char **p; diff --git a/src/shared/install.h b/src/shared/install.h -index 357be0f..3ca3939 100644 +index 357be0f92..3ca39397e 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -23,6 +23,7 @@ @@ -188,7 +188,7 @@ index 357be0f..3ca3939 100644 int unit_file_get_list(UnitFileScope scope, const char *root_dir, Hashmap *h); diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 291a2f4..812730b 100644 +index 291a2f405..812730be1 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -31,6 +31,7 @@ @@ -200,7 +200,7 @@ index 291a2f4..812730b 100644 int user_config_home(char **config_home) { const char *e; diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h -index 2ec888d..f1925ee 100644 +index 2ec888da8..f1925eef6 100644 --- a/src/shared/path-lookup.h +++ b/src/shared/path-lookup.h @@ -22,7 +22,8 @@ @@ -214,7 +214,7 @@ index 2ec888d..f1925ee 100644 typedef struct LookupPaths { char **unit_path; diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 6e39b44..0125ca2 100644 +index 6e39b449e..0125ca27d 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -723,10 +723,10 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { diff --git a/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch b/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch index af42855..5d3073d 100644 --- a/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch +++ b/SOURCES/0113-core-do-not-use-quotes-around-virt-and-arch.patch @@ -12,7 +12,7 @@ confusing. Not possible with those two. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/main.c b/src/core/main.c -index ba2de85..fd527d4 100644 +index ba2de85bd..fd527d4d6 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1537,11 +1537,11 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch b/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch index 097bfce..bae47f1 100644 --- a/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch +++ b/SOURCES/0114-udev-downgrade-has-devpath-and-filled-with-db-file-m.patch @@ -14,7 +14,7 @@ of debug output during boot and are rather useless. 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c -index 9863901..e408942 100644 +index 9863901a3..e40894222 100644 --- a/src/libudev/libudev-device.c +++ b/src/libudev/libudev-device.c @@ -613,7 +613,7 @@ int udev_device_read_db(struct udev_device *udev_device, const char *dbfile) diff --git a/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch b/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch index c890cfb..4b5bf95 100644 --- a/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch +++ b/SOURCES/0115-cryptsetup-generator-remove-warning-about-crypttab-a.patch @@ -17,7 +17,7 @@ the device tree anyway. 1 file changed, 7 deletions(-) diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c -index dfbca87..d191def 100644 +index dfbca8754..d191def5f 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -377,13 +377,6 @@ static int add_crypttab_devices(void) { diff --git a/SOURCES/0116-sysctl-tweak-debug-message.patch b/SOURCES/0116-sysctl-tweak-debug-message.patch index 5dbbfcf..d3cc3ec 100644 --- a/SOURCES/0116-sysctl-tweak-debug-message.patch +++ b/SOURCES/0116-sysctl-tweak-debug-message.patch @@ -9,7 +9,7 @@ Subject: [PATCH] sysctl: tweak debug message 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index b6945ed..4fb293b 100644 +index b6945eda5..4fb293b9b 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -121,7 +121,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno diff --git a/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch b/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch index 445441c..944f448 100644 --- a/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch +++ b/SOURCES/0117-journald-add-syslog-fields-for-audit-messages.patch @@ -14,7 +14,7 @@ Also specify AUTH as facility... This seems to be the closest match 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index 151097a..77abe2e 100644 +index 151097a6e..77abe2e63 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -373,7 +373,7 @@ static void process_audit_string(Server *s, int type, const char *data, size_t s diff --git a/SOURCES/0118-core-remove-useless-debug-message.patch b/SOURCES/0118-core-remove-useless-debug-message.patch index 6b942f2..493a3f2 100644 --- a/SOURCES/0118-core-remove-useless-debug-message.patch +++ b/SOURCES/0118-core-remove-useless-debug-message.patch @@ -17,7 +17,7 @@ Mar 13 19:48:28 adam.happyassassin.net systemd[1]: Collecting (null) 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 203a6a0..7483a96 100644 +index 203a6a0a1..7483a96ec 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -844,7 +844,8 @@ static unsigned manager_dispatch_gc_queue(Manager *m) { diff --git a/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch b/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch index ec222e8..557ffdb 100644 --- a/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch +++ b/SOURCES/0119-man-standard-conf-change-directory-reference-to-wild.patch @@ -9,7 +9,7 @@ Subject: [PATCH] man: standard-conf: change directory reference to wildcard 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/standard-conf.xml b/man/standard-conf.xml -index 36af459..004f53f 100644 +index 36af45927..004f53f70 100644 --- a/man/standard-conf.xml +++ b/man/standard-conf.xml @@ -54,7 +54,7 @@ diff --git a/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch b/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch index 9a27748..13f6b13 100644 --- a/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch +++ b/SOURCES/0120-core-don-t-change-removed-devices-to-state-tentative.patch @@ -19,7 +19,7 @@ so change the device state back to "dead" as before 628c89c. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/device.c b/src/core/device.c -index 4ff8827..cc4ebd2 100644 +index 4ff882721..cc4ebd2c8 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -421,7 +421,7 @@ static void device_update_found_one(Device *d, bool add, DeviceFound found, bool diff --git a/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch b/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch index 92e32d5..82f48c4 100644 --- a/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch +++ b/SOURCES/0121-fstab-generator-ignore-invalid-swap-priority.patch @@ -18,7 +18,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1204336 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 5662b5f..8e2f522 100644 +index 5662b5fde..8e2f522bd 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -54,9 +54,10 @@ static int add_swap( diff --git a/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch b/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch index 4234833..7d58872 100644 --- a/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch +++ b/SOURCES/0122-missing.h-add-more-btrfs-types-and-defines.patch @@ -9,7 +9,7 @@ Subject: [PATCH] missing.h: add more btrfs types and defines 1 file changed, 151 insertions(+) diff --git a/src/shared/missing.h b/src/shared/missing.h -index 6ef4dbd..4b36a9c 100644 +index 6ef4dbdf4..4b36a9c93 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -294,12 +294,59 @@ static inline int getrandom(void *buffer, size_t count, unsigned flags) { diff --git a/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch b/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch index d8e104b..762c23d 100644 --- a/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch +++ b/SOURCES/0123-build-sys-add-configure-option-to-disableLTO-gold.patch @@ -8,7 +8,7 @@ Subject: [PATCH] build-sys: add configure option to disableLTO/gold 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 081ed0f..9103f9b 100644 +index 081ed0f6e..9103f9b92 100644 --- a/configure.ac +++ b/configure.ac @@ -208,10 +208,15 @@ AS_CASE([$CC], [*clang*], diff --git a/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch b/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch index 2da57cf..d296b2d 100644 --- a/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch +++ b/SOURCES/0124-rules-bring-back-80-net-name-slot.rules.patch @@ -10,7 +10,7 @@ Subject: [PATCH] rules: bring back 80-net-name-slot.rules create mode 100644 rules/80-net-name-slot.rules diff --git a/Makefile.am b/Makefile.am -index 4933f76..bec32c3 100644 +index 4933f76bd..bec32c39e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3570,7 +3570,8 @@ dist_udevrules_DATA += \ @@ -25,7 +25,7 @@ index 4933f76..bec32c3 100644 rules/99-systemd.rules diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules new file mode 100644 -index 0000000..c5f1b38 +index 000000000..c5f1b3885 --- /dev/null +++ b/rules/80-net-name-slot.rules @@ -0,0 +1,14 @@ diff --git a/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch b/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch index d6f9ac8..ab625b8 100644 --- a/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch +++ b/SOURCES/0125-Revert-journald-allow-restarting-journald-without-lo.patch @@ -13,7 +13,7 @@ This reverts commit 13790add4bf648fed816361794d8277a75253410. 4 files changed, 61 insertions(+), 345 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 7ee8174..04839c9 100644 +index 7ee8174ea..04839c950 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1455,7 +1455,6 @@ static int server_open_hostname(Server *s) { @@ -68,7 +68,7 @@ index 7ee8174..04839c9 100644 return r; diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c -index 942a857..11b852d 100644 +index 942a85780..11b852d39 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -28,11 +28,8 @@ @@ -536,7 +536,7 @@ index 942a857..11b852d 100644 return 0; } diff --git a/src/journal/journald-stream.h b/src/journal/journald-stream.h -index 94bf955..8cad012 100644 +index 94bf955d7..8cad01296 100644 --- a/src/journal/journald-stream.h +++ b/src/journal/journald-stream.h @@ -21,9 +21,8 @@ @@ -551,7 +551,7 @@ index 94bf955..8cad012 100644 void stdout_stream_free(StdoutStream *s); diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index a3540c6..87704bb 100644 +index a3540c65d..87704bb9c 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -23,7 +23,6 @@ NotifyAccess=all diff --git a/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch b/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch index 5687d1f..bb8eab2 100644 --- a/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch +++ b/SOURCES/0126-Revert-man-switch-yum-to-dnf-for-Fedora.patch @@ -13,7 +13,7 @@ Conflicts: 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/man/custom-html.xsl b/man/custom-html.xsl -index 706b95a..1df824c 100644 +index 706b95a1c..1df824cbb 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -60,18 +60,6 @@ @@ -36,7 +36,7 @@ index 706b95a..1df824c 100644 <a> <xsl:attribute name="href"> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index 65b4c2f..cbd44d4 100644 +index 65b4c2f29..cbd44d4ab 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -98,7 +98,6 @@ diff --git a/SOURCES/0127-journal-remove-audit-socket-unit-files.patch b/SOURCES/0127-journal-remove-audit-socket-unit-files.patch index 6f3b6c2..2d4ab83 100644 --- a/SOURCES/0127-journal-remove-audit-socket-unit-files.patch +++ b/SOURCES/0127-journal-remove-audit-socket-unit-files.patch @@ -11,7 +11,7 @@ Subject: [PATCH] journal: remove audit socket unit-files delete mode 100644 units/systemd-journald-audit.socket diff --git a/Makefile.am b/Makefile.am -index bec32c3..6d6b650 100644 +index bec32c39e..6d6b650f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4518,8 +4518,7 @@ bin_PROGRAMS += \ @@ -36,7 +36,7 @@ index bec32c3..6d6b650 100644 systemd-journald.service \ diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket deleted file mode 100644 -index 35397aa..0000000 +index 35397aaeb..000000000 --- a/units/systemd-journald-audit.socket +++ /dev/null @@ -1,19 +0,0 @@ @@ -60,7 +60,7 @@ index 35397aa..0000000 -ListenNetlink=audit 1 -PassCredentials=yes diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 87704bb..1bcc290 100644 +index 87704bb9c..1bcc290ec 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -10,12 +10,12 @@ Description=Journal Service diff --git a/SOURCES/0128-factory-we-don-t-want-that.patch b/SOURCES/0128-factory-we-don-t-want-that.patch index 404e684..3e4c373 100644 --- a/SOURCES/0128-factory-we-don-t-want-that.patch +++ b/SOURCES/0128-factory-we-don-t-want-that.patch @@ -9,7 +9,7 @@ Subject: [PATCH] factory: we don't want that 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 6d6b650..8474b29 100644 +index 6d6b650f2..8474b2912 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2288,14 +2288,14 @@ INSTALL_DIRS += \ @@ -36,7 +36,7 @@ index 6d6b650..8474b29 100644 # ------------------------------------------------------------------------------ if ENABLE_FIRSTBOOT diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index 125d6e0..4937719 100644 +index 125d6e0a1..4937719bd 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -10,5 +10,3 @@ diff --git a/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch b/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch index a39a1a6..f072529 100644 --- a/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch +++ b/SOURCES/0129-timedated-flip-internal-status-after-executing-opera.patch @@ -15,7 +15,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1014315 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 66097ef..c3113b0 100644 +index 66097ef74..c3113b081 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -679,8 +679,6 @@ static int method_set_ntp(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus diff --git a/SOURCES/0130-timedated-fix-enable-disable-reversal.patch b/SOURCES/0130-timedated-fix-enable-disable-reversal.patch index 43d83b8..4a280d0 100644 --- a/SOURCES/0130-timedated-fix-enable-disable-reversal.patch +++ b/SOURCES/0130-timedated-fix-enable-disable-reversal.patch @@ -16,7 +16,7 @@ state directly, so the Context parameter can be removed. 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index c3113b0..f875149 100644 +index c3113b081..f87514936 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -280,39 +280,26 @@ static int context_read_ntp(Context *c, sd_bus *bus) { diff --git a/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch b/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch index 7804e00..f33144c 100644 --- a/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch +++ b/SOURCES/0131-core-make-SELinux-enable-disable-check-symmetric.patch @@ -19,7 +19,7 @@ Conflicts: 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 8ba665d..2bc37ba 100644 +index 8ba665dc3..2bc37ba60 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1772,15 +1772,15 @@ static int method_disable_unit_files_generic( diff --git a/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch b/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch index f929624..e517a72 100644 --- a/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch +++ b/SOURCES/0132-shared-add-path_compare-an-ordering-path-comparison.patch @@ -13,7 +13,7 @@ Subject: [PATCH] shared: add path_compare(), an ordering path comparison 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/src/shared/path-util.c b/src/shared/path-util.c -index 70bc1ca..d5510bf 100644 +index 70bc1caa2..d5510bf56 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -403,12 +403,18 @@ char* path_startswith(const char *path, const char *prefix) { @@ -83,7 +83,7 @@ index 70bc1ca..d5510bf 100644 return path_equal(a, b) || files_same(a, b) > 0; } diff --git a/src/shared/path-util.h b/src/shared/path-util.h -index bcf116e..ca81b49 100644 +index bcf116ed3..ca81b49cb 100644 --- a/src/shared/path-util.h +++ b/src/shared/path-util.h @@ -44,6 +44,7 @@ char* path_make_absolute_cwd(const char *p); @@ -95,7 +95,7 @@ index bcf116e..ca81b49 100644 bool path_equal_or_files_same(const char *a, const char *b); char* path_join(const char *root, const char *path, const char *rest); diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c -index 11aa52a..6396fcb 100644 +index 11aa52aae..6396fcb39 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -27,23 +27,37 @@ diff --git a/SOURCES/0133-core-namespace-fix-path-sorting.patch b/SOURCES/0133-core-namespace-fix-path-sorting.patch index c481597..49a47e6 100644 --- a/SOURCES/0133-core-namespace-fix-path-sorting.patch +++ b/SOURCES/0133-core-namespace-fix-path-sorting.patch @@ -25,7 +25,7 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1184016 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/core/namespace.c b/src/core/namespace.c -index 4fecd32..d4f1c86 100644 +index 4fecd3236..d4f1c8621 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -91,9 +91,11 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) { diff --git a/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch b/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch index bfc0060..6b99b79 100644 --- a/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch +++ b/SOURCES/0134-machine-do-not-rely-on-asprintf-setting-arg-on-error.patch @@ -12,7 +12,7 @@ We use the return value not the arg everywhere, and should we do here. 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index b0f0f66..624a99f 100644 +index b0f0f66e0..624a99f4e 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -438,6 +438,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us diff --git a/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch b/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch index 405e9d8..003982d 100644 --- a/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch +++ b/SOURCES/0135-some-compilators-don-t-support-__INCLUDE_LEVEL__.patch @@ -8,7 +8,7 @@ Subject: [PATCH] some compilators don't support __INCLUDE_LEVEL__ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemd/_sd-common.h b/src/systemd/_sd-common.h -index 896a027..e9426a4 100644 +index 896a027eb..e9426a450 100644 --- a/src/systemd/_sd-common.h +++ b/src/systemd/_sd-common.h @@ -24,7 +24,7 @@ diff --git a/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch b/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch index ad8d40b..7a4763a 100644 --- a/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch +++ b/SOURCES/0136-udev-net_id-support-multi-port-enpo-device-names.patch @@ -11,7 +11,7 @@ as we can. 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 99caa0a..6a5ada6 100644 +index 99caa0a2a..6a5ada688 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -35,7 +35,7 @@ diff --git a/SOURCES/0137-udev-net_id-improve-comments.patch b/SOURCES/0137-udev-net_id-improve-comments.patch index 7af802d..fb67f9a 100644 --- a/SOURCES/0137-udev-net_id-improve-comments.patch +++ b/SOURCES/0137-udev-net_id-improve-comments.patch @@ -12,7 +12,7 @@ Conflicts: 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 6a5ada6..2cc1fd4 100644 +index 6a5ada688..2cc1fd409 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -146,7 +146,7 @@ static int dev_pci_onboard(struct udev_device *dev, struct netnames *names) { diff --git a/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch b/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch index 3127a1c..32103df 100644 --- a/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch +++ b/SOURCES/0138-udev-restore-udevadm-settle-timeout.patch @@ -21,7 +21,7 @@ Resolves: #1210981 1 file changed, 6 insertions(+) diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c -index fff5de7..e60c462 100644 +index fff5de7a8..e60c4623b 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -56,6 +56,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) { diff --git a/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch b/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch index 90b6c7b..426c8d7 100644 --- a/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch +++ b/SOURCES/0139-udev-settle-should-return-immediately-when-timeout-i.patch @@ -24,7 +24,7 @@ Resolves: #1210981 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c -index e60c462..40e3e28 100644 +index e60c4623b..40e3e28b1 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -149,7 +149,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) { diff --git a/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch b/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch index 76f0a21..60da977 100644 --- a/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch +++ b/SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch @@ -16,7 +16,7 @@ Resolves: #1210981 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c -index 40e3e28..33597bc 100644 +index 40e3e28b1..33597bc20 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -114,7 +114,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) { diff --git a/SOURCES/0141-detect-virt-use-proc-device-tree.patch b/SOURCES/0141-detect-virt-use-proc-device-tree.patch index c284d51..04a3a33 100644 --- a/SOURCES/0141-detect-virt-use-proc-device-tree.patch +++ b/SOURCES/0141-detect-virt-use-proc-device-tree.patch @@ -15,7 +15,7 @@ Resolves: #1207773 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/virt.c b/src/shared/virt.c -index 7c1381f..aa3501f 100644 +index 7c1381f4b..aa3501f42 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -106,7 +106,7 @@ static int detect_vm_devicetree(const char **_id) { diff --git a/SOURCES/0142-ARM-detect-virt-detect-Xen.patch b/SOURCES/0142-ARM-detect-virt-detect-Xen.patch index 159288a..1948e9a 100644 --- a/SOURCES/0142-ARM-detect-virt-detect-Xen.patch +++ b/SOURCES/0142-ARM-detect-virt-detect-Xen.patch @@ -10,7 +10,7 @@ Resolves: #1207773 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/virt.c b/src/shared/virt.c -index aa3501f..7125232 100644 +index aa3501f42..712523210 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -102,7 +102,7 @@ static int detect_vm_cpuid(const char **_id) { diff --git a/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch b/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch index 9a9af94..4dc9a04 100644 --- a/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch +++ b/SOURCES/0143-ARM-detect-virt-detect-QEMU-KVM.patch @@ -26,7 +26,7 @@ Resolves: #1207773 1 file changed, 17 insertions(+) diff --git a/src/shared/virt.c b/src/shared/virt.c -index 7125232..54c4655 100644 +index 712523210..54c465520 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -115,6 +115,23 @@ static int detect_vm_devicetree(const char **_id) { diff --git a/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch b/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch index 3f83c2b..ef159bc 100644 --- a/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch +++ b/SOURCES/0144-Persistent-by_path-links-for-ata-devices.patch @@ -31,7 +31,7 @@ Resolves: #1045498 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index b6749aa..bb0a624 100644 +index b6749aab7..bb0a6242a 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -426,6 +426,46 @@ static struct udev_device *handle_scsi_hyperv(struct udev_device *parent, char * diff --git a/SOURCES/0145-man-document-forwarding-to-syslog-better.patch b/SOURCES/0145-man-document-forwarding-to-syslog-better.patch index 710eaf2..5a5e530 100644 --- a/SOURCES/0145-man-document-forwarding-to-syslog-better.patch +++ b/SOURCES/0145-man-document-forwarding-to-syslog-better.patch @@ -12,7 +12,7 @@ Resolves: #1177336 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index 85146b0..abfe313 100644 +index 85146b0d8..abfe3130d 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -97,7 +97,7 @@ @@ -83,10 +83,11 @@ index 85146b0..abfe313 100644 <literal>systemd.journald.forward_to_wall=</literal>. When forwarding to the console, the TTY to log to can be changed with <varname>TTYPath=</varname>, described -@@ -366,6 +358,32 @@ +@@ -365,6 +357,32 @@ + </refsect1> - <refsect1> ++ <refsect1> + <title>Forwarding to traditional syslog daemons</title> + + <para> @@ -112,7 +113,6 @@ index 85146b0..abfe313 100644 + </para> + </refsect1> + -+ <refsect1> + <refsect1> <title>See Also</title> <para> - <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, diff --git a/SOURCES/0146-man-fix-typos-in-previous-comimt.patch b/SOURCES/0146-man-fix-typos-in-previous-comimt.patch index 80b822d..82736f8 100644 --- a/SOURCES/0146-man-fix-typos-in-previous-comimt.patch +++ b/SOURCES/0146-man-fix-typos-in-previous-comimt.patch @@ -10,7 +10,7 @@ Resolves: #1177336 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index abfe313..2cbe58b 100644 +index abfe3130d..2cbe58bc1 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -361,7 +361,7 @@ diff --git a/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch b/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch index a277278..54b3098 100644 --- a/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch +++ b/SOURCES/0147-LSB-always-add-network-online.target-to-services-wit.patch @@ -12,7 +12,7 @@ Resolves: #1189253 1 file changed, 7 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 0125ca2..cfc4a99 100644 +index 0125ca27d..cfc4a99e4 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -692,6 +692,13 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { diff --git a/SOURCES/0148-rules-enable-memory-hotplug.patch b/SOURCES/0148-rules-enable-memory-hotplug.patch index 2583020..2b3aad8 100644 --- a/SOURCES/0148-rules-enable-memory-hotplug.patch +++ b/SOURCES/0148-rules-enable-memory-hotplug.patch @@ -11,7 +11,7 @@ Resolves: #1105020 1 file changed, 4 insertions(+) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 2b494e5..8231caa 100644 +index 2b494e57c..8231caae9 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -1,3 +1,7 @@ diff --git a/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch b/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch index 1714546..cc7d237 100644 --- a/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch +++ b/SOURCES/0149-rules-reload-sysctl-settings-when-the-bridge-module-.patch @@ -10,7 +10,7 @@ Resolves: #1182105 1 file changed, 3 insertions(+) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 8231caa..556a3a3 100644 +index 8231caae9..556a3a3a9 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -5,3 +5,6 @@ SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online} diff --git a/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch b/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch index ce00bef..16c4488 100644 --- a/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch +++ b/SOURCES/0150-console-getty.service-don-t-start-when-dev-console-i.patch @@ -41,7 +41,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+) diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in -index 8ac51a4..413d940 100644 +index 8ac51a471..413d94094 100644 --- a/units/console-getty.service.m4.in +++ b/units/console-getty.service.m4.in @@ -9,6 +9,7 @@ diff --git a/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch b/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch index 1bee381..06c76da 100644 --- a/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch +++ b/SOURCES/0151-resolved-Do-not-add-.busname-dependencies-when-compi.patch @@ -16,7 +16,7 @@ Resolves: #1222517 rename units/{systemd-resolved.service.in => systemd-resolved.service.m4.in} (96%) diff --git a/Makefile.am b/Makefile.am -index 8474b29..604eaf2 100644 +index 8474b2912..604eaf2f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5520,7 +5520,7 @@ dist_dbussystemservice_DATA += \ @@ -29,7 +29,7 @@ index 8474b29..604eaf2 100644 SYSTEM_UNIT_ALIASES += \ systemd-resolved.service dbus-org.freedesktop.resolve1.service diff --git a/units/.gitignore b/units/.gitignore -index 638a7ab..7f3e0d0 100644 +index 638a7abc4..7f3e0d093 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -58,6 +58,7 @@ @@ -44,7 +44,7 @@ diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service. similarity index 96% rename from units/systemd-resolved.service.in rename to units/systemd-resolved.service.m4.in -index b643da9..d133847 100644 +index b643da9a7..d133847d5 100644 --- a/units/systemd-resolved.service.in +++ b/units/systemd-resolved.service.m4.in @@ -10,11 +10,13 @@ Description=Network Name Resolution diff --git a/SOURCES/0152-man-add-journal-remote.conf-5.patch b/SOURCES/0152-man-add-journal-remote.conf-5.patch index 36a4b7d..f4c43f2 100644 --- a/SOURCES/0152-man-add-journal-remote.conf-5.patch +++ b/SOURCES/0152-man-add-journal-remote.conf-5.patch @@ -15,7 +15,7 @@ Resolves: #1222517 create mode 100644 man/journal-remote.conf.xml diff --git a/Makefile-man.am b/Makefile-man.am -index ac6f69a..084df75 100644 +index ac6f69af7..084df754a 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1358,14 +1358,20 @@ endif @@ -49,7 +49,7 @@ index ac6f69a..084df75 100644 man/kernel-command-line.xml \ diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml new file mode 100644 -index 0000000..a7b2227 +index 000000000..a7b222718 --- /dev/null +++ b/man/journal-remote.conf.xml @@ -0,0 +1,114 @@ @@ -168,7 +168,7 @@ index 0000000..a7b2227 + +</refentry> diff --git a/man/systemd-journal-remote.xml b/man/systemd-journal-remote.xml -index 2687662..d5bda63 100644 +index 2687662a1..d5bda635c 100644 --- a/man/systemd-journal-remote.xml +++ b/man/systemd-journal-remote.xml @@ -310,6 +310,7 @@ systemd-journal-remote --url http://some.host:19531/ diff --git a/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch b/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch index 89e0aad..8ed9da9 100644 --- a/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch +++ b/SOURCES/0153-mount-don-t-run-quotaon-only-for-network-filesystems.patch @@ -16,7 +16,7 @@ Resolves: #1222517 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c -index 3ae0eb4..3359220 100644 +index 3ae0eb462..335922025 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -107,7 +107,9 @@ static bool mount_is_auto(const MountParameters *p) { diff --git a/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch b/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch index 672e265..5eb315c 100644 --- a/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch +++ b/SOURCES/0154-mount-fix-up-wording-in-the-comment.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c -index 3359220..fd4fb6f 100644 +index 335922025..fd4fb6f1b 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -108,7 +108,7 @@ static bool needs_quota(const MountParameters *p) { diff --git a/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch b/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch index d363763..9c4f603 100644 --- a/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch +++ b/SOURCES/0155-udev-net_id-fix-copy-paste-error.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 2cc1fd4..66474f7 100644 +index 2cc1fd409..66474f772 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -271,7 +271,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { diff --git a/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch b/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch index f260b8f..a1fed43 100644 --- a/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch +++ b/SOURCES/0156-man-don-t-mention-journalctl-dev-sda.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 5 deletions(-) diff --git a/man/journalctl.xml b/man/journalctl.xml -index 770cf9b..08de0ff 100644 +index 770cf9bb2..08de0ff06 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -817,11 +817,6 @@ diff --git a/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch b/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch index 89729ac..b4b496f 100644 --- a/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch +++ b/SOURCES/0157-units-move-After-systemd-hwdb-update.service-depende.patch @@ -19,7 +19,7 @@ Resolves: #1222517 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in -index 0c33909..1e04d11 100644 +index 0c33909ce..1e04d11fe 100644 --- a/units/systemd-udev-trigger.service.in +++ b/units/systemd-udev-trigger.service.in @@ -10,7 +10,7 @@ Description=udev Coldplug all Devices @@ -32,7 +32,7 @@ index 0c33909..1e04d11 100644 ConditionPathIsReadWrite=/sys diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in -index 2791f73..a133044 100644 +index 2791f73ac..a13304400 100644 --- a/units/systemd-udevd.service.in +++ b/units/systemd-udevd.service.in @@ -10,7 +10,7 @@ Description=udev Kernel Device Manager diff --git a/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch b/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch index 11bbe9e..2b46fc8 100644 --- a/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch +++ b/SOURCES/0158-units-explicitly-order-systemd-user-sessions.service.patch @@ -15,7 +15,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in -index 0869e73..c09c05d 100644 +index 0869e7399..c09c05d4d 100644 --- a/units/systemd-user-sessions.service.in +++ b/units/systemd-user-sessions.service.in @@ -8,7 +8,7 @@ diff --git a/SOURCES/0159-zsh-completion-update-loginctl.patch b/SOURCES/0159-zsh-completion-update-loginctl.patch index 3ef5551..63511f1 100644 --- a/SOURCES/0159-zsh-completion-update-loginctl.patch +++ b/SOURCES/0159-zsh-completion-update-loginctl.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl -index 0de66e1..bd33b66 100644 +index 0de66e191..bd33b66fa 100644 --- a/shell-completion/zsh/_loginctl +++ b/shell-completion/zsh/_loginctl @@ -102,10 +102,11 @@ _arguments -s \ diff --git a/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch b/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch index 13077ec..4236c61 100644 --- a/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch +++ b/SOURCES/0160-zsh-completion-add-missing-M-completion-for-journalc.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+) diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl -index a469bbc..863348e 100644 +index a469bbc9a..863348e05 100644 --- a/shell-completion/zsh/_journalctl +++ b/shell-completion/zsh/_journalctl @@ -76,6 +76,7 @@ _arguments -s \ diff --git a/SOURCES/0161-zsh-completion-update-hostnamectl.patch b/SOURCES/0161-zsh-completion-update-hostnamectl.patch index 5c3bf36..2aa0b86 100644 --- a/SOURCES/0161-zsh-completion-update-hostnamectl.patch +++ b/SOURCES/0161-zsh-completion-update-hostnamectl.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/shell-completion/zsh/_hostnamectl b/shell-completion/zsh/_hostnamectl -index a7217a1..7528e06 100644 +index a7217a199..7528e0649 100644 --- a/shell-completion/zsh/_hostnamectl +++ b/shell-completion/zsh/_hostnamectl @@ -33,6 +33,14 @@ _hostnamectl_set-deployment() { diff --git a/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch b/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch index 0c6a788..c83141e 100644 --- a/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch +++ b/SOURCES/0162-shell-completion-systemctl-switch-root-verb.patch @@ -16,7 +16,7 @@ Resolves: #1222517 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in -index 8063316..3d787cd 100644 +index 8063316ec..3d787cdb7 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -160,7 +160,7 @@ _systemctl () { @@ -29,7 +29,7 @@ index 8063316..3d787cd 100644 ) diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in -index 7f2d5ac..82edfd3 100644 +index 7f2d5ac0f..82edfd3d7 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -59,6 +59,7 @@ diff --git a/SOURCES/0163-core-automount-beef-up-error-message.patch b/SOURCES/0163-core-automount-beef-up-error-message.patch index 48de0a5..19a415d 100644 --- a/SOURCES/0163-core-automount-beef-up-error-message.patch +++ b/SOURCES/0163-core-automount-beef-up-error-message.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/automount.c b/src/core/automount.c -index e4c7941..b391f61 100644 +index e4c79415d..b391f6198 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -734,7 +734,8 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo diff --git a/SOURCES/0164-man-remove-fs-from-rootfsflags.patch b/SOURCES/0164-man-remove-fs-from-rootfsflags.patch index bcbabfd..e95be72 100644 --- a/SOURCES/0164-man-remove-fs-from-rootfsflags.patch +++ b/SOURCES/0164-man-remove-fs-from-rootfsflags.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml -index 919bd13..eb73727 100644 +index 919bd1374..eb7372702 100644 --- a/man/kernel-command-line.xml +++ b/man/kernel-command-line.xml @@ -295,7 +295,7 @@ diff --git a/SOURCES/0165-shared-fix-memleak.patch b/SOURCES/0165-shared-fix-memleak.patch index de6d162..87de156 100644 --- a/SOURCES/0165-shared-fix-memleak.patch +++ b/SOURCES/0165-shared-fix-memleak.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 92b8d6e..efd489e 100644 +index 92b8d6e8e..efd489ec0 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -515,7 +515,7 @@ static int find_symlinks_in_scope( diff --git a/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch b/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch index 8406c23..6bbc795 100644 --- a/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch +++ b/SOURCES/0166-udevd-fix-synchronization-with-settle-when-handling-.patch @@ -41,7 +41,7 @@ Resolves: #1222517 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index e98c1fd..87a3f69 100644 +index e98c1fd6d..87a3f69e9 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1502,9 +1502,22 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch b/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch index 39a3bfa..e92f9e3 100644 --- a/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch +++ b/SOURCES/0167-python-systemd-fix-is_socket_inet-to-cope-with-ports.patch @@ -15,7 +15,7 @@ Resolves: #1222517 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c -index 65cfec7..7c5f1b2 100644 +index 65cfec7ce..7c5f1b2bb 100644 --- a/src/python-systemd/_daemon.c +++ b/src/python-systemd/_daemon.c @@ -225,7 +225,7 @@ static PyObject* is_socket_inet(PyObject *self, PyObject *args) { @@ -28,7 +28,7 @@ index 65cfec7..7c5f1b2 100644 return NULL; } diff --git a/src/python-systemd/daemon.py b/src/python-systemd/daemon.py -index 1c386bb..82011ca 100644 +index 1c386bb6f..82011ca60 100644 --- a/src/python-systemd/daemon.py +++ b/src/python-systemd/daemon.py @@ -26,7 +26,7 @@ def is_socket(fileobj, family=_AF_UNSPEC, type=0, listening=-1): diff --git a/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch b/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch index 4e35bca..d0c9c0e 100644 --- a/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch +++ b/SOURCES/0168-man-fix-examples-indentation-in-tmpfiles.d-5.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml -index 4bd0fcf..9b4e11c 100644 +index 4bd0fcf75..9b4e11c1b 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -504,15 +504,15 @@ diff --git a/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch b/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch index afe865c..1346a64 100644 --- a/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch +++ b/SOURCES/0169-systemctl-avoid-bumping-NOFILE-rlimit-unless-needed.patch @@ -16,7 +16,7 @@ Resolves: #1222517 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 4ec0cff..089c25f 100644 +index 4ec0cff21..089c25f83 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4449,6 +4449,12 @@ static int show(sd_bus *bus, char **args) { diff --git a/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch b/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch index 243ef95..c57af31 100644 --- a/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch +++ b/SOURCES/0170-exit-status-Fix-NOTINSSTALLED-typo.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c -index 5c73b4d..90c83a4 100644 +index 5c73b4d3c..90c83a47a 100644 --- a/src/shared/exit-status.c +++ b/src/shared/exit-status.c @@ -167,7 +167,7 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) { diff --git a/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch b/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch index 9eb3fd7..6d9c226 100644 --- a/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch +++ b/SOURCES/0171-tmpfiles-there-s-no-systemd-forbid-user-logins.servi.patch @@ -13,7 +13,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpfiles.d/systemd-nologin.conf b/tmpfiles.d/systemd-nologin.conf -index d61232b..a30a8da 100644 +index d61232b53..a30a8da60 100644 --- a/tmpfiles.d/systemd-nologin.conf +++ b/tmpfiles.d/systemd-nologin.conf @@ -5,7 +5,7 @@ diff --git a/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch b/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch index ced7aaf..a2eaebd 100644 --- a/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch +++ b/SOURCES/0172-kmod-setup-load-ip_tables-kmod-at-boot.patch @@ -20,7 +20,7 @@ Resolves: #1222517 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index c0a05b9..97f3b9b 100644 +index c0a05b97a..97f3b9b34 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -63,16 +63,19 @@ int kmod_setup(void) { diff --git a/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch b/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch index 54d78af..732df71 100644 --- a/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch +++ b/SOURCES/0173-util-Fix-assertion-in-split-on-missing.patch @@ -28,7 +28,7 @@ Resolves: #1222517 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c -index 1e1bf94..649344d 100644 +index 1e1bf944f..649344d88 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -571,13 +571,12 @@ const char* split(const char **state, size_t *l, const char *separator, bool quo @@ -47,7 +47,7 @@ index 1e1bf94..649344d 100644 } else if (quoted) { *l = strcspn_escaped(current, separator); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index e517f57..9f3e3a2 100644 +index e517f571d..9f3e3a227 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -92,6 +92,7 @@ static void check_execcommand(ExecCommand *c, diff --git a/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch b/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch index 9a56cb1..a9e1286 100644 --- a/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch +++ b/SOURCES/0174-units-set-KillMode-mixed-for-our-daemons-that-fork-w.patch @@ -18,7 +18,7 @@ Resolves: #1222517 2 files changed, 2 insertions(+) diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in -index 26759ea..5534a49 100644 +index 26759ea0f..5534a49ed 100644 --- a/units/systemd-importd.service.in +++ b/units/systemd-importd.service.in @@ -18,3 +18,4 @@ WatchdogSec=1min @@ -27,7 +27,7 @@ index 26759ea..5534a49 100644 ProtectHome=yes +KillMode=mixed diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in -index a133044..32f04d9 100644 +index a13304400..32f04d901 100644 --- a/units/systemd-udevd.service.in +++ b/units/systemd-udevd.service.in @@ -22,3 +22,4 @@ Restart=always diff --git a/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch b/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch index 6935a63..e257d61 100644 --- a/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch +++ b/SOURCES/0175-unit-don-t-add-automatic-dependencies-on-device-unit.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 565455b..b9e1f13 100644 +index 565455bd6..b9e1f13ea 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2830,14 +2830,18 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) { diff --git a/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch b/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch index e2e71e1..5d04190 100644 --- a/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch +++ b/SOURCES/0176-update-done-ignore-nanosecond-file-timestamp-compone.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c -index 561963e..cb5cd6f 100644 +index 561963e5e..cb5cd6f4a 100644 --- a/src/update-done/update-done.c +++ b/src/update-done/update-done.c @@ -36,9 +36,15 @@ static int apply_timestamp(const char *path, struct timespec *ts) { diff --git a/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch b/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch index feb6b73..a61fbe3 100644 --- a/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch +++ b/SOURCES/0177-sd-daemon-simplify-sd_pid_notify_with_fds.patch @@ -20,7 +20,7 @@ Resolves: #1222517 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c -index 22a3a53..1474321 100644 +index 22a3a5347..1474321c9 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -352,12 +352,10 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char diff --git a/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch b/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch index 71a910d..eb64610 100644 --- a/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch +++ b/SOURCES/0178-fstab-generator-add-x-systemd.requires-and-x-systemd.patch @@ -51,13 +51,14 @@ Resolves: #1164334 4 files changed, 138 insertions(+) diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml -index fcb9a44..8e652e1 100644 +index fcb9a4416..8e652e133 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml -@@ -139,6 +139,36 @@ +@@ -138,6 +138,36 @@ + <variablelist class='fstab-options'> - <varlistentry> ++ <varlistentry> + <term><option>x-systemd.requires=</option></term> + + <listitem><para>Configures a <varname>Requires=</varname> and @@ -87,12 +88,11 @@ index fcb9a44..8e652e1 100644 + for details.</para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><option>x-systemd.automount</option></term> - <listitem><para>An automount unit will be created for the file diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 8e2f522..65ed205 100644 +index 8e2f522bd..65ed20579 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -155,6 +155,64 @@ static bool mount_in_initrd(struct mntent *me) { @@ -193,7 +193,7 @@ index 8e2f522..65ed205 100644 "[Automount]\n" "Where=%s\n", diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index cf317e1..e231a0f 100644 +index cf317e17b..e231a0ff8 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -125,6 +125,36 @@ answer: @@ -234,7 +234,7 @@ index cf317e1..e231a0f 100644 _cleanup_free_ char *opt = NULL; int r; diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h -index 9f6b32e..387c562 100644 +index 9f6b32eaf..387c562a9 100644 --- a/src/shared/fstab-util.h +++ b/src/shared/fstab-util.h @@ -28,6 +28,8 @@ diff --git a/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch b/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch index 119d1e0..472092e 100644 --- a/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch +++ b/SOURCES/0179-core-Fix-assertion-with-empty-Exec-paths.patch @@ -28,7 +28,7 @@ Resolves: #1222517 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index f17a82f..ec4cf4e 100644 +index f17a82fcd..ec4cf4eef 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -604,7 +604,11 @@ int config_parse_exec(const char *unit, @@ -45,7 +45,7 @@ index f17a82f..ec4cf4e 100644 } else if (strneq(word, ";", MAX(l, 1U))) /* new commandline */ diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 9f3e3a2..5500983 100644 +index 9f3e3a227..550098332 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -318,6 +318,27 @@ static void test_config_parse_exec(void) { diff --git a/SOURCES/0180-rules-load-sg-module.patch b/SOURCES/0180-rules-load-sg-module.patch index 134023f..75f5835 100644 --- a/SOURCES/0180-rules-load-sg-module.patch +++ b/SOURCES/0180-rules-load-sg-module.patch @@ -12,7 +12,7 @@ Resolves: #1186462 1 file changed, 3 insertions(+) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 556a3a3..305e752 100644 +index 556a3a3a9..305e75228 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -8,3 +8,6 @@ SUBSYSTEM=="memory", ACTION=="add", ATTR{state}=="offline", ATTR{state}="online" diff --git a/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch b/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch index 838d0ee..6ab4c61 100644 --- a/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch +++ b/SOURCES/0181-util-add-shell_maybe_quote-call-for-preparing-a-stri.patch @@ -25,7 +25,7 @@ Resolves: #1016680 5 files changed, 74 insertions(+), 15 deletions(-) diff --git a/src/core/job.c b/src/core/job.c -index 4740ff1..7416386 100644 +index 4740ff18c..7416386a1 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -679,15 +679,13 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { @@ -48,7 +48,7 @@ index 4740ff1..7416386 100644 } diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 52d4ebe..b0a5a75 100644 +index 52d4ebe61..b0a5a7592 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1709,16 +1709,15 @@ static int check_wait_response(BusWaitForJobs *d, bool quiet) { @@ -76,7 +76,7 @@ index 52d4ebe..b0a5a75 100644 } diff --git a/src/shared/util.c b/src/shared/util.c -index 649344d..778c2b0 100644 +index 649344d88..778c2b0e0 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1329,7 +1329,8 @@ char *cescape(const char *s) { @@ -143,7 +143,7 @@ index 649344d..778c2b0 100644 + return r; +} diff --git a/src/shared/util.h b/src/shared/util.h -index a83b588..7ecfd85 100644 +index a83b58822..7ecfd8571 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -1078,3 +1078,5 @@ void sigkill_wait(pid_t *pid); @@ -153,7 +153,7 @@ index a83b588..7ecfd85 100644 + +char *shell_maybe_quote(const char *s); diff --git a/src/test/test-util.c b/src/test/test-util.c -index 9515a8c..9ae347b 100644 +index 9515a8cbf..9ae347b43 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -1512,6 +1512,24 @@ static void test_sparse_write(void) { diff --git a/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch b/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch index 52e8d1b..5738cf0 100644 --- a/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch +++ b/SOURCES/0182-bus-util-be-more-verbose-if-dbus-job-fails.patch @@ -16,7 +16,7 @@ Resolves: #1016680 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index b0a5a75..2e6d889 100644 +index b0a5a7592..2e6d88962 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -30,6 +30,7 @@ diff --git a/SOURCES/0183-notify-fix-badly-backported-help-message.patch b/SOURCES/0183-notify-fix-badly-backported-help-message.patch index 67c4414..cbb7045 100644 --- a/SOURCES/0183-notify-fix-badly-backported-help-message.patch +++ b/SOURCES/0183-notify-fix-badly-backported-help-message.patch @@ -11,7 +11,7 @@ Related: #1199644 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/notify/notify.c b/src/notify/notify.c -index e4a128b..c89a6cc 100644 +index e4a128b0b..c89a6cc06 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -49,7 +49,7 @@ static void help(void) { diff --git a/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch b/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch index a7207f4..7a423b1 100644 --- a/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch +++ b/SOURCES/0184-cryptsetup-craft-a-unique-ID-with-the-source-device.patch @@ -26,7 +26,7 @@ Resolves: #1226333 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c -index 3f613d9..5dedb07 100644 +index 3f613d9b6..5dedb073e 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -217,6 +217,23 @@ static void log_glue(int level, const char *msg, void *usrptr) { diff --git a/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch b/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch index f58e4c3..a1340c3 100644 --- a/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch +++ b/SOURCES/0185-systemctl-introduce-now-for-enable-disable-and-mask.patch @@ -24,7 +24,7 @@ Resolves: #1233081 8 files changed, 114 insertions(+), 72 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 604eaf2..d3fb398 100644 +index 604eaf2f1..d3fb398fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5253,6 +5253,7 @@ machinectl_LDADD = \ @@ -36,13 +36,14 @@ index 604eaf2..d3fb398 100644 rootbin_PROGRAMS += \ diff --git a/man/systemctl.xml b/man/systemctl.xml -index 3c4c9cb..44ec0d7 100644 +index 3c4c9cb92..44ec0d7bc 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml -@@ -456,6 +456,18 @@ +@@ -455,6 +455,18 @@ + </listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><option>--now</option></term> + + <listitem> @@ -54,10 +55,9 @@ index 3c4c9cb..44ec0d7 100644 + </listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><option>--root=</option></term> - <listitem> @@ -909,11 +921,12 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service the changes are taken into account immediately. Note that this does <emphasis>not</emphasis> have the effect of also @@ -101,7 +101,7 @@ index 3c4c9cb..44ec0d7 100644 </varlistentry> diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 2e6d889..fff00d9 100644 +index 2e6d88962..fff00d9f9 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1849,7 +1849,7 @@ int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path) { @@ -125,7 +125,7 @@ index 2e6d889..fff00d9 100644 if (r < 0) return bus_log_parse_error(r); diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h -index e8a97ce..21db982 100644 +index e8a97cef9..21db98228 100644 --- a/src/libsystemd/sd-bus/bus-util.h +++ b/src/libsystemd/sd-bus/bus-util.h @@ -24,6 +24,7 @@ @@ -143,7 +143,7 @@ index e8a97ce..21db982 100644 -int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet); +int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, UnitFileChange **changes, unsigned *n_changes); diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c -index 9f8c68b..f191070 100644 +index 9f8c68b18..f1910709d 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -1709,7 +1709,7 @@ static int enable_machine(int argc, char *argv[], void *userdata) { @@ -156,7 +156,7 @@ index 9f8c68b..f191070 100644 return r; diff --git a/src/shared/install.c b/src/shared/install.c -index efd489e..b62065b 100644 +index efd489ec0..b62065be5 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -113,51 +113,6 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d @@ -342,7 +342,7 @@ index efd489e..b62065b 100644 return 0; } diff --git a/src/shared/install.h b/src/shared/install.h -index 3ca3939..d729e6e 100644 +index 3ca39397e..d729e6ed1 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -112,6 +112,7 @@ UnitFileState unit_file_get_state( @@ -354,7 +354,7 @@ index 3ca3939..d729e6e 100644 int unit_file_query_preset(UnitFileScope scope, const char *root_dir, const char *name); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 089c25f..9898694 100644 +index 089c25f83..9898694d7 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -138,6 +138,7 @@ static char *arg_host = NULL; diff --git a/SOURCES/0186-udev-also-create-old-sas-paths.patch b/SOURCES/0186-udev-also-create-old-sas-paths.patch index 8109100..45ce1f4 100644 --- a/SOURCES/0186-udev-also-create-old-sas-paths.patch +++ b/SOURCES/0186-udev-also-create-old-sas-paths.patch @@ -12,7 +12,7 @@ Resolves: #957112 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index 25b44a5..71ab974 100644 +index 25b44a55c..71ab97484 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -54,7 +54,9 @@ KERNEL=="mspblk[0-9]p[0-9]", ENV{ID_NAME}=="?*", ENV{ID_SERIAL}=="?*", SYMLINK+= @@ -26,7 +26,7 @@ index 25b44a5..71ab974 100644 # skip unpartitioned removable media devices from drivers which do not send "change" events ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index bb0a624..025392d 100644 +index bb0a6242a..025392df5 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -154,7 +154,7 @@ out: diff --git a/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch b/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch index f74bb27..b6a12b9 100644 --- a/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch +++ b/SOURCES/0187-journald-do-not-strip-leading-whitespace-from-messag.patch @@ -19,7 +19,7 @@ Resolves: #1227396 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index 7d545ca..ba80941 100644 +index 7d545ca31..ba80941d7 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -232,7 +232,8 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid) diff --git a/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch b/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch index 8a758c7..d558493 100644 --- a/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch +++ b/SOURCES/0188-Revert-core-one-step-back-again-for-nspawn-we-actual.patch @@ -17,7 +17,7 @@ Resolves: #1199644 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c -index b9e1f13..fa17567 100644 +index b9e1f13ea..fa17567dd 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3546,15 +3546,7 @@ int unit_kill_context( diff --git a/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch b/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch index 39e7156..57550ea 100644 --- a/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch +++ b/SOURCES/0189-bus-creds-always-set-SD_BUS_CREDS_PID-when-we-set-pi.patch @@ -14,7 +14,7 @@ Related: #1230190 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c -index 1888874..ce4f394 100644 +index 18888747f..ce4f39459 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -240,7 +240,7 @@ int mac_selinux_generic_access_check( @@ -27,7 +27,7 @@ index 1888874..ce4f394 100644 r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "SELinux policy denies access."); diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c -index ea8a619..5b87fa9 100644 +index ea8a619c5..5b87fa950 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -698,21 +698,18 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) { diff --git a/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch b/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch index bed34e4..08e4452 100644 --- a/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch +++ b/SOURCES/0190-sd-bus-do-not-use-per-datagram-auxiliary-information.patch @@ -20,7 +20,7 @@ Related: #1230190 1 file changed, 12 insertions(+), 58 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index 52883fa..abd9ece 100644 +index 52883fa8c..abd9ece01 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -501,9 +501,7 @@ static int bus_socket_read_auth(sd_bus *b) { diff --git a/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch b/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch index c26486d..0574bce 100644 --- a/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch +++ b/SOURCES/0191-sd-bus-store-selinux-context-at-connection-time.patch @@ -21,7 +21,7 @@ Related: #1230190 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c -index 06e5b4f..8b84b94 100644 +index 06e5b4fd9..8b84b9496 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -945,8 +945,10 @@ static int bus_get_owner_creds_dbus1(sd_bus *bus, uint64_t mask, sd_bus_creds ** @@ -46,7 +46,7 @@ index 06e5b4f..8b84b94 100644 if (!c->label) return -ENOMEM; diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h -index e9f1a81..071b3da 100644 +index e9f1a816a..071b3da79 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.h @@ -262,7 +262,7 @@ struct sd_bus { @@ -59,7 +59,7 @@ index e9f1a81..071b3da 100644 uint64_t creds_mask; diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index abd9ece..d00cd01 100644 +index abd9ece01..d00cd014e 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -600,10 +600,17 @@ void bus_socket_setup(sd_bus *b) { @@ -81,7 +81,7 @@ index abd9ece..d00cd01 100644 static int bus_socket_start_auth_client(sd_bus *b) { diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c -index cac9b65..b0a3237 100644 +index cac9b6560..b0a323792 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -121,6 +121,7 @@ static void bus_free(sd_bus *b) { diff --git a/SOURCES/0192-journald-simplify-context-handling.patch b/SOURCES/0192-journald-simplify-context-handling.patch index b6e92fd..79adcd3 100644 --- a/SOURCES/0192-journald-simplify-context-handling.patch +++ b/SOURCES/0192-journald-simplify-context-handling.patch @@ -12,7 +12,7 @@ Related: #1230190 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c -index 11b852d..15a554c 100644 +index 11b852d39..15a554c34 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -57,10 +57,7 @@ struct StdoutStream { diff --git a/SOURCES/0193-bash-completion-add-verb-set-property.patch b/SOURCES/0193-bash-completion-add-verb-set-property.patch index 8bc3cda..a65df94 100644 --- a/SOURCES/0193-bash-completion-add-verb-set-property.patch +++ b/SOURCES/0193-bash-completion-add-verb-set-property.patch @@ -11,7 +11,7 @@ Resolves: #1235635 1 file changed, 14 insertions(+) diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in -index 3d787cd..496c756 100644 +index 3d787cdb7..496c756a4 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -96,6 +96,12 @@ _systemctl () { diff --git a/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch b/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch index a3e0212..a111ab0 100644 --- a/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch +++ b/SOURCES/0194-sd-bus-don-t-inherit-connection-creds-into-message-c.patch @@ -17,7 +17,7 @@ Related: #1230190 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index d00cd01..a3c3a45 100644 +index d00cd014e..a3c3a45b4 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -900,8 +900,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) { diff --git a/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch b/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch index 0234c47..d69b355 100644 --- a/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch +++ b/SOURCES/0195-udev-fix-crash-in-path_id-builtin.patch @@ -11,7 +11,7 @@ Resolves: #957112 1 file changed, 4 insertions(+) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 025392d..9ca6084 100644 +index 025392df5..9ca608468 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -737,6 +737,10 @@ out: diff --git a/SOURCES/0196-sysv-generator-test-Fix-assertion.patch b/SOURCES/0196-sysv-generator-test-Fix-assertion.patch index bc5c3c0..a5bc4cf 100644 --- a/SOURCES/0196-sysv-generator-test-Fix-assertion.patch +++ b/SOURCES/0196-sysv-generator-test-Fix-assertion.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py -index 09f5c01..509899e 100644 +index 09f5c0176..509899e0a 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -323,7 +323,7 @@ class SysvGeneratorTest(unittest.TestCase): diff --git a/SOURCES/0197-man-avoid-line-break-in-url.patch b/SOURCES/0197-man-avoid-line-break-in-url.patch index 1867541..16fc3a1 100644 --- a/SOURCES/0197-man-avoid-line-break-in-url.patch +++ b/SOURCES/0197-man-avoid-line-break-in-url.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index 8f4ab10..4f57323 100644 +index 8f4ab10fe..4f57323d4 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -104,8 +104,7 @@ diff --git a/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch b/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch index 25b66fb..01cd5f1 100644 --- a/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch +++ b/SOURCES/0198-Add-VARIANT-as-a-standard-value-for-etc-os-release.patch @@ -28,7 +28,7 @@ Resolves: #1222517 1 file changed, 35 insertions(+) diff --git a/man/os-release.xml b/man/os-release.xml -index 4f57323..4ca2e59 100644 +index 4f57323d4..4ca2e5970 100644 --- a/man/os-release.xml +++ b/man/os-release.xml @@ -273,6 +273,41 @@ diff --git a/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch b/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch index 94e9f33..4539e64 100644 --- a/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch +++ b/SOURCES/0199-Fix-permissions-on-run-systemd-nspawn-locks.patch @@ -21,7 +21,7 @@ Resolves: #1222517 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c -index 8d61507..c02ee81 100644 +index 8d61507e8..c02ee814c 100644 --- a/src/shared/machine-image.c +++ b/src/shared/machine-image.c @@ -601,7 +601,7 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile diff --git a/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch b/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch index 7ff6b9a..9d0b748 100644 --- a/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch +++ b/SOURCES/0200-generators-rename-add_-root-usr-_mount-to-add_-sysro.patch @@ -25,7 +25,7 @@ Resolves: #1222517 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 65ed205..029eb16 100644 +index 65ed20579..029eb1638 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -250,10 +250,14 @@ static int add_mount( @@ -78,7 +78,7 @@ index 65ed205..029eb16 100644 /* Honour /etc/fstab only when that's enabled */ diff --git a/src/shared/generator.c b/src/shared/generator.c -index 7f16d5c..cd37812 100644 +index 7f16d5cbe..cd37812f8 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -33,13 +33,13 @@ @@ -137,7 +137,7 @@ index 7f16d5c..cd37812 100644 /* Allow configuration how long we wait for a device that * backs a mount point to show up. This is useful to support diff --git a/src/shared/generator.h b/src/shared/generator.h -index 64bd28f..6c3f38a 100644 +index 64bd28f59..6c3f38abb 100644 --- a/src/shared/generator.h +++ b/src/shared/generator.h @@ -23,7 +23,16 @@ diff --git a/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch b/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch index 341fbb3..76c6014 100644 --- a/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch +++ b/SOURCES/0201-Generate-systemd-fsck-root.service-in-the-initramfs.patch @@ -24,7 +24,7 @@ Resolves: #1222517 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/src/shared/generator.c b/src/shared/generator.c -index cd37812..148a0b0 100644 +index cd37812f8..148a0b077 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -29,8 +29,51 @@ diff --git a/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch b/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch index 782d2d8..5682d39 100644 --- a/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch +++ b/SOURCES/0202-units-fix-typo-in-systemd-resolved.service.patch @@ -19,7 +19,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in -index d133847..98ae564 100644 +index d133847d5..98ae564af 100644 --- a/units/systemd-resolved.service.m4.in +++ b/units/systemd-resolved.service.m4.in @@ -8,7 +8,7 @@ diff --git a/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch b/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch index e97df69..23ac116 100644 --- a/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch +++ b/SOURCES/0203-core-don-t-consider-umask-for-SocketMode.patch @@ -13,7 +13,7 @@ Resolves: #1222517 1 file changed, 3 deletions(-) diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c -index 6806c51..a6289eb 100644 +index 6806c5115..a6289eb50 100644 --- a/src/shared/socket-label.c +++ b/src/shared/socket-label.c @@ -117,9 +117,6 @@ int socket_address_listen( diff --git a/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch b/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch index d037012..d1f88ab 100644 --- a/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch +++ b/SOURCES/0204-timedate-fix-memory-leak-in-timedated.patch @@ -57,7 +57,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index f875149..09d0dba 100644 +index f87514936..09d0dbabc 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -245,7 +245,7 @@ static int context_read_ntp(Context *c, sd_bus *bus) { diff --git a/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch b/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch index e9edb96..fc13b3b 100644 --- a/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch +++ b/SOURCES/0205-coredump-make-sure-we-vacuum-by-default.patch @@ -18,7 +18,7 @@ Resolves: #1222517 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml -index 0b7329b..fd54c59 100644 +index 0b7329bf5..fd54c59e6 100644 --- a/man/coredump.conf.xml +++ b/man/coredump.conf.xml @@ -134,7 +134,9 @@ @@ -33,7 +33,7 @@ index 0b7329b..fd54c59 100644 </variablelist> diff --git a/src/journal/coredump-vacuum.c b/src/journal/coredump-vacuum.c -index 9b73795..c0347ef 100644 +index 9b73795e5..c0347ef56 100644 --- a/src/journal/coredump-vacuum.c +++ b/src/journal/coredump-vacuum.c @@ -103,8 +103,7 @@ static bool vacuum_necessary(int fd, off_t sum, off_t keep_free, off_t max_use) diff --git a/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch b/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch index 84c89b6..a8fd11a 100644 --- a/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch +++ b/SOURCES/0206-tmpfiles-don-t-fail-if-we-cannot-create-a-subvolume-.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 73a9c9d..d0e6567 100644 +index 73a9c9d5b..d0e6567d8 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1002,20 +1002,25 @@ static int create_item(Item *i) { diff --git a/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch b/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch index c635021..0a28c9b 100644 --- a/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch +++ b/SOURCES/0207-resolved-fix-crash-when-shutting-down.patch @@ -23,7 +23,7 @@ Resolves: #1222517 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c -index 33ca4d1..874207c 100644 +index 33ca4d1a4..874207cfb 100644 --- a/src/resolve/resolved-dns-cache.c +++ b/src/resolve/resolved-dns-cache.c @@ -93,9 +93,7 @@ void dns_cache_flush(DnsCache *c) { @@ -38,7 +38,7 @@ index 33ca4d1..874207c 100644 static void dns_cache_remove(DnsCache *c, DnsResourceKey *key) { diff --git a/src/resolve/resolved-dns-server.c b/src/resolve/resolved-dns-server.c -index caf06fe..9a62a63 100644 +index caf06fe45..9a62a6325 100644 --- a/src/resolve/resolved-dns-server.c +++ b/src/resolve/resolved-dns-server.c @@ -78,23 +78,24 @@ DnsServer* dns_server_free(DnsServer *s) { @@ -74,7 +74,7 @@ index caf06fe..9a62a63 100644 return NULL; diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c -index f94e4bb..27d9129 100644 +index f94e4bb6f..27d9129e0 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -68,13 +68,13 @@ Link *link_free(Link *l) { @@ -95,7 +95,7 @@ index f94e4bb..27d9129 100644 return NULL; } diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c -index b5ad701..7c253aa 100644 +index b5ad70161..7c253aa13 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -536,11 +536,11 @@ Manager *manager_free(Manager *m) { @@ -113,7 +113,7 @@ index b5ad701..7c253aa 100644 hashmap_free(m->dns_transactions); diff --git a/src/shared/prioq.c b/src/shared/prioq.c -index 8af4c51..b89888b 100644 +index 8af4c51c2..b89888be0 100644 --- a/src/shared/prioq.c +++ b/src/shared/prioq.c @@ -45,12 +45,14 @@ Prioq *prioq_new(compare_func_t compare_func) { @@ -134,7 +134,7 @@ index 8af4c51..b89888b 100644 int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) { diff --git a/src/shared/prioq.h b/src/shared/prioq.h -index d836b36..1c044b1 100644 +index d836b36cd..1c044b135 100644 --- a/src/shared/prioq.h +++ b/src/shared/prioq.h @@ -28,7 +28,7 @@ typedef struct Prioq Prioq; diff --git a/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch b/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch index 64d5902..0603cc1 100644 --- a/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch +++ b/SOURCES/0208-resolved-allow-DnsAnswer-objects-with-no-space-for-R.patch @@ -16,7 +16,7 @@ Resolves: #1222517 1 file changed, 2 deletions(-) diff --git a/src/resolve/resolved-dns-answer.c b/src/resolve/resolved-dns-answer.c -index 7c4ab18..e08eb66 100644 +index 7c4ab18b5..e08eb667c 100644 --- a/src/resolve/resolved-dns-answer.c +++ b/src/resolve/resolved-dns-answer.c @@ -25,8 +25,6 @@ diff --git a/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch b/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch index 1801a9a..25f0d07 100644 --- a/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch +++ b/SOURCES/0209-id128-add-new-sd_id128_is_null-call.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 4 insertions(+) diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h -index 48fd876..9f44527 100644 +index 48fd87671..9f445278b 100644 --- a/src/systemd/sd-id128.h +++ b/src/systemd/sd-id128.h @@ -106,6 +106,10 @@ _sd_pure_ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) { diff --git a/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch b/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch index b1c78f9..1916e7e 100644 --- a/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch +++ b/SOURCES/0210-journalctl-Improve-boot-ID-lookup.patch @@ -33,7 +33,7 @@ Resolves: #1222517 1 file changed, 174 insertions(+), 101 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 12c869f..c26cc00 100644 +index 12c869f5a..c26cc00f5 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -131,6 +131,7 @@ typedef struct boot_id_t { diff --git a/SOURCES/0211-test-hashmap-fix-an-assert.patch b/SOURCES/0211-test-hashmap-fix-an-assert.patch index 4d3dbd1..13170b6 100644 --- a/SOURCES/0211-test-hashmap-fix-an-assert.patch +++ b/SOURCES/0211-test-hashmap-fix-an-assert.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c -index 84b508f..c1a5ccf 100644 +index 84b508f87..c1a5ccf1f 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -682,7 +682,7 @@ static void test_hashmap_get2(void) { diff --git a/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch b/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch index d6c0ec5..b8574b6 100644 --- a/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch +++ b/SOURCES/0212-units-make-sure-systemd-nspawn-.slice-instances-are-.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+) diff --git a/units/systemd-nspawn@.service.in b/units/systemd-nspawn@.service.in -index 3e26b53..5e86121 100644 +index 3e26b53fd..5e8612113 100644 --- a/units/systemd-nspawn@.service.in +++ b/units/systemd-nspawn@.service.in @@ -17,6 +17,7 @@ KillMode=mixed diff --git a/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch b/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch index a5caea0..59b2d07 100644 --- a/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch +++ b/SOURCES/0213-Revert-journald-audit-exit-gracefully-in-the-case-we.patch @@ -13,7 +13,7 @@ Resolves: #1222517 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index 77abe2e..46eb82f 100644 +index 77abe2e63..46eb82fa3 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -533,10 +533,8 @@ int server_open_audit(Server *s) { diff --git a/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch b/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch index b4688c3..575c51c 100644 --- a/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch +++ b/SOURCES/0214-journald-handle-more-gracefully-when-bind-fails-on-a.patch @@ -13,7 +13,7 @@ Resolves: #1222517 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index 46eb82f..0e739a2 100644 +index 46eb82fa3..0e739a23a 100644 --- a/src/journal/journald-audit.c +++ b/src/journal/journald-audit.c @@ -532,9 +532,14 @@ int server_open_audit(Server *s) { diff --git a/SOURCES/0215-udev-link-config-fix-corruption.patch b/SOURCES/0215-udev-link-config-fix-corruption.patch index 5ddb976..4d66798 100644 --- a/SOURCES/0215-udev-link-config-fix-corruption.patch +++ b/SOURCES/0215-udev-link-config-fix-corruption.patch @@ -19,7 +19,7 @@ Resolves: #1222517 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index 8b3dc45..489593f 100644 +index 8b3dc45d4..489593f4f 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -177,6 +177,9 @@ static int load_link(link_config_ctx *ctx, const char *filename) { @@ -56,7 +56,7 @@ index 8b3dc45..489593f 100644 return log_warning_errno(r, "Could not set Alias, MACAddress or MTU on %s: %m", old_name); diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h -index cb434d1..f2e9174 100644 +index cb434d1ae..f2e917488 100644 --- a/src/udev/net/link-config.h +++ b/src/udev/net/link-config.h @@ -67,8 +67,8 @@ struct link_config { diff --git a/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch b/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch index 37d3d53..2c73bd6 100644 --- a/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch +++ b/SOURCES/0216-udev-net_id-Only-read-the-first-64-bytes-of-PCI-conf.patch @@ -26,7 +26,7 @@ Resolves: #1222517 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 66474f7..dd2886c 100644 +index 66474f772..dd2886caf 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -91,6 +91,7 @@ diff --git a/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch b/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch index d63575e..717005a 100644 --- a/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch +++ b/SOURCES/0217-shared-generator-correct-path-to-systemd-fsck.patch @@ -18,7 +18,7 @@ Resolves: #1222517 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index d3fb398..a81d3c1 100644 +index d3fb398fe..a81d3c131 100644 --- a/Makefile.am +++ b/Makefile.am @@ -177,6 +177,7 @@ AM_CPPFLAGS = \ @@ -30,7 +30,7 @@ index d3fb398..a81d3c1 100644 -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ diff --git a/src/shared/generator.c b/src/shared/generator.c -index 148a0b0..3af84a3 100644 +index 148a0b077..3af84a325 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -61,7 +61,7 @@ static int write_fsck_sysroot_service(const char *dir, const char *what) { diff --git a/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch b/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch index 3127350..7934dff 100644 --- a/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch +++ b/SOURCES/0218-logind-Save-the-user-s-state-when-a-session-enters-S.patch @@ -34,7 +34,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index 8b0bafd..fb84e92 100644 +index 8b0bafd49..fb84e92e5 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2124,6 +2124,7 @@ int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_b diff --git a/SOURCES/0219-small-fix-ru-translation.patch b/SOURCES/0219-small-fix-ru-translation.patch index 7a484c1..fc3c0af 100644 --- a/SOURCES/0219-small-fix-ru-translation.patch +++ b/SOURCES/0219-small-fix-ru-translation.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalog/systemd.ru.catalog b/catalog/systemd.ru.catalog -index f995324..03eea04 100644 +index f99532469..03eea04c9 100644 --- a/catalog/systemd.ru.catalog +++ b/catalog/systemd.ru.catalog @@ -81,7 +81,7 @@ Documentation: man:core(5) diff --git a/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch b/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch index fd3e4ac..50a966e 100644 --- a/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch +++ b/SOURCES/0220-kmod-setup-don-t-warn-when-ipv6-can-t-be-loaded.patch @@ -19,7 +19,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c -index 97f3b9b..6b2f295 100644 +index 97f3b9b34..6b2f29585 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -66,7 +66,7 @@ int kmod_setup(void) { diff --git a/SOURCES/0221-Partially-revert-ma-setup-simplify.patch b/SOURCES/0221-Partially-revert-ma-setup-simplify.patch index df497de..7adc24d 100644 --- a/SOURCES/0221-Partially-revert-ma-setup-simplify.patch +++ b/SOURCES/0221-Partially-revert-ma-setup-simplify.patch @@ -19,7 +19,7 @@ Resolves: #1222517 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c -index 0e0d16a..1d4acfa 100644 +index 0e0d16a7c..1d4acfa3b 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -27,9 +27,10 @@ diff --git a/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch b/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch index cd5d2f0..ba92b4d 100644 --- a/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch +++ b/SOURCES/0222-ima-setup-write-policy-one-line-at-a-time.patch @@ -18,7 +18,7 @@ Resolves: #1222517 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c -index 1d4acfa..81ce2cd 100644 +index 1d4acfa3b..81ce2cda9 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -24,11 +24,6 @@ diff --git a/SOURCES/0223-ata_id-unbotch-format-specifier.patch b/SOURCES/0223-ata_id-unbotch-format-specifier.patch index c388f3a..902564c 100644 --- a/SOURCES/0223-ata_id-unbotch-format-specifier.patch +++ b/SOURCES/0223-ata_id-unbotch-format-specifier.patch @@ -18,7 +18,7 @@ Resolves: #1222517 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c -index 9e4f674..b6f28c6 100644 +index 9e4f674a9..b6f28c6f5 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -639,8 +639,8 @@ int main(int argc, char *argv[]) diff --git a/SOURCES/0224-install-explicitly-return-0-on-success.patch b/SOURCES/0224-install-explicitly-return-0-on-success.patch index b3073af..8fb15c1 100644 --- a/SOURCES/0224-install-explicitly-return-0-on-success.patch +++ b/SOURCES/0224-install-explicitly-return-0-on-success.patch @@ -21,7 +21,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/install.c b/src/shared/install.c -index b62065b..aa197e9 100644 +index b62065be5..aa197e91b 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -2265,7 +2265,7 @@ int unit_file_get_list( diff --git a/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch b/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch index c7623d2..a1a653e 100644 --- a/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch +++ b/SOURCES/0225-systemd.service.xml-document-that-systemd-removes-th.patch @@ -13,7 +13,7 @@ Resolves: #1222517 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/man/systemd.service.xml b/man/systemd.service.xml -index f598705..a274db4 100644 +index f59870563..a274db480 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -226,7 +226,10 @@ diff --git a/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch b/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch index 5fb2cb4..95faaa2 100644 --- a/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch +++ b/SOURCES/0226-core-handle-log-target-null-when-calling-systemd-shu.patch @@ -15,7 +15,7 @@ Resolves: #1222517 1 file changed, 4 insertions(+) diff --git a/src/core/main.c b/src/core/main.c -index fd527d4..1c8d67d 100644 +index fd527d4d6..1c8d67dac 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2001,6 +2001,10 @@ finish: diff --git a/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch b/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch index 5fe757e..9ca7371 100644 --- a/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch +++ b/SOURCES/0227-man-ProtectHome-protects-root-as-well.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 56b53e6..5b93aa7 100644 +index 56b53e601..5b93aa71e 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -858,9 +858,10 @@ diff --git a/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch b/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch index 3f3d9af..4ba38fe 100644 --- a/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch +++ b/SOURCES/0228-timedatectl-trim-non-local-RTC-warning-to-80-chars-w.patch @@ -12,7 +12,7 @@ Resolves: #1222517 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c -index 4d89886..1accccb 100644 +index 4d8988673..1accccb68 100644 --- a/src/timedate/timedatectl.c +++ b/src/timedate/timedatectl.c @@ -190,11 +190,12 @@ static void print_status_info(const StatusInfo *i) { diff --git a/SOURCES/0229-escape-fix-exit-code.patch b/SOURCES/0229-escape-fix-exit-code.patch index 1c00f1d..da36667 100644 --- a/SOURCES/0229-escape-fix-exit-code.patch +++ b/SOURCES/0229-escape-fix-exit-code.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/escape/escape.c b/src/escape/escape.c -index f2a0721..766a2c2 100644 +index f2a072186..766a2c2c6 100644 --- a/src/escape/escape.c +++ b/src/escape/escape.c @@ -232,5 +232,5 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0230-man-information-about-available-properties.patch b/SOURCES/0230-man-information-about-available-properties.patch index 38a7d09..2987ae7 100644 --- a/SOURCES/0230-man-information-about-available-properties.patch +++ b/SOURCES/0230-man-information-about-available-properties.patch @@ -13,7 +13,7 @@ Resolves: #1222517 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml -index 44ec0d7..6b29b8c 100644 +index 44ec0d7bc..6b29b8cd0 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -111,12 +111,30 @@ diff --git a/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch b/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch index 717b98a..45a5e2a 100644 --- a/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch +++ b/SOURCES/0231-journal-in-persistent-mode-create-var-log-journal-wi.patch @@ -22,7 +22,7 @@ Resolves: #1222517 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 04839c9..d692c06 100644 +index 04839c950..d692c06ef 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -942,7 +942,7 @@ static int system_journal_open(Server *s, bool flush_requested) { diff --git a/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch b/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch index 6b64911..84b2206 100644 --- a/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch +++ b/SOURCES/0232-sysv-generator-fix-wrong-Overwriting-existing-symlin.patch @@ -22,7 +22,7 @@ Resolves: #1222517 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index cfc4a99..3c6cb8f 100644 +index cfc4a99e4..3c6cb8f10 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -166,7 +166,7 @@ static int generate_unit_file(SysvStub *s) { @@ -35,7 +35,7 @@ index cfc4a99..3c6cb8f 100644 (void) unlink(unit); } diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py -index 509899e..e716d70 100644 +index 509899e0a..e716d705c 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -178,6 +178,8 @@ class SysvGeneratorTest(unittest.TestCase): diff --git a/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch b/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch index a060bfe..7378faa 100644 --- a/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch +++ b/SOURCES/0233-mount-don-t-claim-a-device-is-gone-from-proc-self-mo.patch @@ -18,7 +18,7 @@ Resolves: #1222517 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c -index fd4fb6f..fa63f24 100644 +index fd4fb6f1b..fa63f2426 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1698,7 +1698,10 @@ fail: diff --git a/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch b/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch index d9a2ab9..a7d8fe5 100644 --- a/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch +++ b/SOURCES/0234-mount-properly-check-for-mounts-currently-in-proc-se.patch @@ -14,7 +14,7 @@ Resolves: #1222517 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c -index fa63f24..1f1a41a 100644 +index fa63f2426..1f1a41ab6 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1768,7 +1768,18 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents, diff --git a/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch b/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch index 3952ccd..79ac5ab 100644 --- a/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch +++ b/SOURCES/0235-units-add-Install-section-to-tmp.mount.patch @@ -13,7 +13,7 @@ Resolves: #1199644 1 file changed, 4 insertions(+) diff --git a/units/tmp.mount b/units/tmp.mount -index 00a0d28..af0cf4a 100644 +index 00a0d2872..af0cf4a55 100644 --- a/units/tmp.mount +++ b/units/tmp.mount @@ -19,3 +19,7 @@ What=tmpfs diff --git a/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch b/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch index 25946c4..d802365 100644 --- a/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch +++ b/SOURCES/0236-bus-util-add-articles-to-explanation-messages.patch @@ -16,7 +16,7 @@ Related: #1016680 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index fff00d9..017fbaf 100644 +index fff00d9f9..017fbaf2a 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1714,13 +1714,13 @@ static int bus_job_get_service_result(BusWaitForJobs *d, char **result) { diff --git a/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch b/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch index 1cde3b7..781ef43 100644 --- a/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch +++ b/SOURCES/0237-bus-util-print-correct-warnings-for-units-that-fail-.patch @@ -11,7 +11,7 @@ Related: #1016680 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 017fbaf..e48abf5 100644 +index 017fbaf2a..e48abf55a 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1724,28 +1724,34 @@ static const struct { diff --git a/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch b/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch index a60581a..2d566a1 100644 --- a/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch +++ b/SOURCES/0238-Revert-journald-move-dev-log-socket-to-run.patch @@ -22,7 +22,7 @@ Resolves: #1249968 delete mode 100644 units/systemd-journald-dev-log.socket diff --git a/Makefile-man.am b/Makefile-man.am -index 084df75..497be66 100644 +index 084df754a..497be6612 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -214,7 +214,6 @@ MANPAGES_ALIAS += \ @@ -52,7 +52,7 @@ index 084df75..497be66 100644 $(html-alias) diff --git a/Makefile.am b/Makefile.am -index a81d3c1..58bcc2c 100644 +index a81d3c131..58bcc2c42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4518,8 +4518,7 @@ bin_PROGRAMS += \ @@ -77,7 +77,7 @@ index a81d3c1..58bcc2c 100644 systemd-journald.service \ systemd-journal-flush.service \ diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml -index 8280d6c..fe99ce9 100644 +index 8280d6c87..fe99ce9bc 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -45,7 +45,6 @@ @@ -97,7 +97,7 @@ index 8280d6c..fe99ce9 100644 </refsynopsisdiv> diff --git a/src/core/namespace.c b/src/core/namespace.c -index d4f1c86..ebd5fb3 100644 +index d4f1c8621..ebd5fb334 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -187,7 +187,8 @@ static int mount_dev(BindMount *m) { @@ -111,7 +111,7 @@ index d4f1c86..ebd5fb3 100644 NULSTR_FOREACH(d, devnodes) { _cleanup_free_ char *dn = NULL; diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index d692c06..fb7aae3 100644 +index d692c06ef..fb7aae309 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1531,8 +1531,7 @@ int server_init(Server *s) { @@ -125,7 +125,7 @@ index d692c06..fb7aae3 100644 if (s->syslog_fd >= 0) { log_error("Too many /dev/log sockets passed."); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index ba80941..4e118aa 100644 +index ba80941d7..4e118aabc 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -384,7 +384,7 @@ int server_open_syslog_socket(Server *s) { @@ -139,7 +139,7 @@ index ba80941..4e118aa 100644 s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket deleted file mode 100644 -index ffd44bb..0000000 +index ffd44bb50..000000000 --- a/units/systemd-journald-dev-log.socket +++ /dev/null @@ -1,32 +0,0 @@ @@ -176,7 +176,7 @@ index ffd44bb..0000000 -ReceiveBuffer=8M -SendBuffer=8M diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 1bcc290..9d44622 100644 +index 1bcc290ec..9d4462283 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -10,12 +10,12 @@ Description=Journal Service @@ -195,7 +195,7 @@ index 1bcc290..9d44622 100644 Restart=always RestartSec=0 diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket -index 7173701..fbeb10b 100644 +index 71737014c..fbeb10baa 100644 --- a/units/systemd-journald.socket +++ b/units/systemd-journald.socket @@ -19,8 +19,8 @@ IgnoreOnIsolate=yes diff --git a/SOURCES/0239-journald-server-don-t-read-audit-events.patch b/SOURCES/0239-journald-server-don-t-read-audit-events.patch index 83465f7..ee0deb1 100644 --- a/SOURCES/0239-journald-server-don-t-read-audit-events.patch +++ b/SOURCES/0239-journald-server-don-t-read-audit-events.patch @@ -9,7 +9,7 @@ Resolves: #1252409 1 file changed, 4 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index fb7aae3..f13147f 100644 +index fb7aae309..f13147f65 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1577,10 +1577,6 @@ int server_init(Server *s) { diff --git a/SOURCES/0240-everything-remove-traces-of-user.patch b/SOURCES/0240-everything-remove-traces-of-user.patch index 1c38e23..b9e15b4 100644 --- a/SOURCES/0240-everything-remove-traces-of-user.patch +++ b/SOURCES/0240-everything-remove-traces-of-user.patch @@ -32,7 +32,7 @@ Resolves: #1071363 24 files changed, 40 insertions(+), 290 deletions(-) diff --git a/man/busctl.xml b/man/busctl.xml -index 807fc78..0635280 100644 +index 807fc78e8..0635280ea 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -75,9 +75,8 @@ @@ -56,13 +56,14 @@ index 807fc78..0635280 100644 <xi:include href="user-system-options.xml" xpointer="host" /> <xi:include href="user-system-options.xml" xpointer="machine" /> diff --git a/man/journalctl.xml b/man/journalctl.xml -index 08de0ff..2764f66 100644 +index 08de0ff06..2764f66ed 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml -@@ -470,20 +470,6 @@ +@@ -469,20 +469,6 @@ + </listitem> </varlistentry> - <varlistentry> +- <varlistentry> - <term><option>--user-unit=</option></term> - - <listitem><para>Show messages for the specified user session @@ -76,12 +77,11 @@ index 08de0ff..2764f66 100644 - </listitem> - </varlistentry> - -- <varlistentry> + <varlistentry> <term><option>-p</option></term> <term><option>--priority=</option></term> - diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml -index b4a3f50..a448aed 100644 +index b4a3f502b..a448aed02 100644 --- a/man/pam_systemd.xml +++ b/man/pam_systemd.xml @@ -78,9 +78,7 @@ @@ -106,7 +106,7 @@ index b4a3f50..a448aed 100644 <listitem><para>If the last concurrent session of a user ends, the <varname>$XDG_RUNTIME_DIR</varname> directory and all its diff --git a/man/systemctl.xml b/man/systemctl.xml -index 6b29b8c..c6f5842 100644 +index 6b29b8cd0..c6f584278 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -339,7 +339,6 @@ @@ -117,10 +117,11 @@ index 6b29b8c..c6f5842 100644 <xi:include href="user-system-options.xml" xpointer="system" /> <!-- we do not document -failed here, as it has been made -@@ -357,17 +356,6 @@ +@@ -356,17 +355,6 @@ + </listitem> </varlistentry> - <varlistentry> +- <varlistentry> - <term><option>--global</option></term> - - <listitem> @@ -131,10 +132,9 @@ index 6b29b8c..c6f5842 100644 - </listitem> - </varlistentry> - -- <varlistentry> + <varlistentry> <term><option>--no-reload</option></term> - <listitem> @@ -795,9 +783,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service lines to fit in the terminal window. This can be changes with <option>--lines</option> and <option>--full</option>, @@ -202,10 +202,11 @@ index 6b29b8c..c6f5842 100644 temporary files which will be written to the real location if the editor exits successfully.</para> -@@ -1597,17 +1571,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service +@@ -1596,17 +1570,6 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service + </listitem> </varlistentry> - <varlistentry> +- <varlistentry> - <term><command>exit</command></term> - - <listitem> @@ -216,12 +217,11 @@ index 6b29b8c..c6f5842 100644 - </listitem> - </varlistentry> - -- <varlistentry> + <varlistentry> <term><command>switch-root <replaceable>ROOT</replaceable> <optional><replaceable>INIT</replaceable></optional></command></term> - <listitem> diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml -index 1983150..b2e0f42 100644 +index 198315052..b2e0f42d5 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -188,12 +188,6 @@ @@ -238,7 +238,7 @@ index 1983150..b2e0f42 100644 <varlistentry> <term><option>--system</option></term> diff --git a/man/systemd-run.xml b/man/systemd-run.xml -index febcdb0..f46fc3a 100644 +index febcdb026..f46fc3abf 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -294,7 +294,6 @@ @@ -250,7 +250,7 @@ index febcdb0..f46fc3a 100644 <xi:include href="user-system-options.xml" xpointer="host" /> <xi:include href="user-system-options.xml" xpointer="machine" /> diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index 1b74ed3..ca25c93 100644 +index 1b74ed38f..ca25c93a1 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -66,10 +66,7 @@ @@ -266,7 +266,7 @@ index 1b74ed3..ca25c93 100644 operations.</para> </refsect1> diff --git a/man/systemd.device.xml b/man/systemd.device.xml -index ac6deaf..d6b6a7c 100644 +index ac6deafb1..d6b6a7ce4 100644 --- a/man/systemd.device.xml +++ b/man/systemd.device.xml @@ -97,11 +97,9 @@ @@ -283,7 +283,7 @@ index ac6deaf..d6b6a7c 100644 becomes available.</para> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 5b93aa7..6af7c7a 100644 +index 5b93aa71e..6af7c7ae5 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -1148,9 +1148,7 @@ @@ -317,28 +317,29 @@ index 5b93aa7..6af7c7a 100644 sessions. See <citerefentry><refentrytitle>pam_systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>. </para></listitem> -@@ -1221,13 +1217,6 @@ +@@ -1220,13 +1216,6 @@ + <varname>ExecReload=</varname> and similar. </para></listitem> </varlistentry> - <varlistentry> +- <varlistentry> - <term><varname>$MANAGERPID</varname></term> - - <listitem><para>The PID of the user <command>systemd</command> - instance, set for processes spawned by it. </para></listitem> - </varlistentry> - -- <varlistentry> + <varlistentry> <term><varname>$LISTEN_FDS</varname></term> <term><varname>$LISTEN_PID</varname></term> - diff --git a/man/systemd.special.xml b/man/systemd.special.xml -index cf76aaf..553197d 100644 +index cf76aaf60..553197d66 100644 --- a/man/systemd.special.xml +++ b/man/systemd.special.xml -@@ -773,47 +773,6 @@ +@@ -772,47 +772,6 @@ + </variablelist> </refsect1> - <refsect1> +- <refsect1> - <title>Special User Units</title> - - <para>When systemd runs as a user instance, the following special @@ -379,10 +380,9 @@ index cf76aaf..553197d 100644 - </variablelist> - </refsect1> - -- <refsect1> + <refsect1> <title>Special Slice Units</title> - <para>There are four <literal>.slice</literal> units which form @@ -841,9 +800,8 @@ <varlistentry> <term><filename>user.slice</filename></term> @@ -396,7 +396,7 @@ index cf76aaf..553197d 100644 </varlistentry> diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml -index c2e374a..414749b 100644 +index c2e374a94..414749bae 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -263,14 +263,6 @@ @@ -494,7 +494,7 @@ index c2e374a..414749b 100644 <filename>/usr/lib/systemd/system/httpd.service</filename> with the following contents:</para> diff --git a/man/systemd.xml b/man/systemd.xml -index d006b0b..eb289f0 100644 +index d006b0bb9..eb289f03b 100644 --- a/man/systemd.xml +++ b/man/systemd.xml @@ -77,10 +77,7 @@ @@ -562,10 +562,12 @@ index d006b0b..eb289f0 100644 Takes a boolean argument which may be omitted which is interpreted as <option>true</option>.</para></listitem> </varlistentry> -@@ -454,30 +444,6 @@ +@@ -452,30 +442,6 @@ + </varlistentry> + </variablelist> - <variablelist> - <varlistentry> +- <variablelist> +- <varlistentry> - <term>User unit directories</term> - - <listitem><para>Similar rules apply for the user unit @@ -588,11 +590,9 @@ index d006b0b..eb289f0 100644 - </varlistentry> - </variablelist> - -- <variablelist> -- <varlistentry> + <variablelist> + <varlistentry> <term>SysV init scripts directory</term> - - <listitem><para>The location of the SysV init script directory @@ -514,11 +480,7 @@ manager serializes its state, reexecutes itself and deserializes the saved state again. This is mostly equivalent @@ -606,22 +606,22 @@ index d006b0b..eb289f0 100644 </varlistentry> <varlistentry> -@@ -707,13 +669,6 @@ +@@ -706,13 +668,6 @@ + line.</para></listitem> </varlistentry> - <varlistentry> +- <varlistentry> - <term><constant>SIGRTMIN+24</constant></term> - - <listitem><para>Immediately exits the manager (only available - for --user instances).</para></listitem> - </varlistentry> - -- <varlistentry> + <varlistentry> <term><constant>SIGRTMIN+26</constant></term> <term><constant>SIGRTMIN+27</constant></term> - <term><constant>SIGRTMIN+28</constant></term> diff --git a/man/user-system-options.xml b/man/user-system-options.xml -index 8616c54..ae911a9 100644 +index 8616c5424..ae911a975 100644 --- a/man/user-system-options.xml +++ b/man/user-system-options.xml @@ -3,15 +3,6 @@ @@ -641,7 +641,7 @@ index 8616c54..ae911a9 100644 <term><option>--system</option></term> diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl -index 6a770b1..027dfdf 100644 +index 6a770b1b8..027dfdf67 100644 --- a/shell-completion/bash/busctl +++ b/shell-completion/bash/busctl @@ -75,7 +75,7 @@ _busctl() { @@ -654,7 +654,7 @@ index 6a770b1..027dfdf 100644 --quiet --verbose --expect-reply=no --auto-start=no --allow-interactive-authorization=yes --augment-creds=no' diff --git a/shell-completion/bash/journalctl b/shell-completion/bash/journalctl -index 1387524..91cb369 100644 +index 1387524a8..91cb369ec 100644 --- a/shell-completion/bash/journalctl +++ b/shell-completion/bash/journalctl @@ -49,7 +49,7 @@ _journalctl() { @@ -677,7 +677,7 @@ index 1387524..91cb369 100644 return 0 ;; diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in -index 496c756..0a022c4 100644 +index 496c756a4..0a022c4cf 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -92,7 +92,7 @@ _systemctl () { @@ -690,7 +690,7 @@ index 496c756..0a022c4 100644 ) diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze -index 0094702..1c4fe40 100644 +index 00947029c..1c4fe4017 100644 --- a/shell-completion/bash/systemd-analyze +++ b/shell-completion/bash/systemd-analyze @@ -35,7 +35,7 @@ _systemd_analyze() { @@ -738,7 +738,7 @@ index 0094702..1c4fe40 100644 comps=$( compgen -A file -- "$cur" ) compopt -o filenames diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run -index 712655c..5145cd3 100644 +index 712655caf..5145cd3f2 100644 --- a/shell-completion/bash/systemd-run +++ b/shell-completion/bash/systemd-run @@ -32,7 +32,7 @@ __get_machines() { @@ -760,7 +760,7 @@ index 712655c..5145cd3 100644 done diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c -index 591b4ab..ff84f68 100644 +index 591b4ab14..ff84f6894 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1170,7 +1170,6 @@ static void help(void) { @@ -772,7 +772,7 @@ index 591b4ab..ff84f68 100644 " -M --machine=CONTAINER Operate on local container\n" " --order Show only order in the graph\n" diff --git a/src/core/main.c b/src/core/main.c -index 1c8d67d..2aec40b 100644 +index 1c8d67dac..2aec40b0b 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -956,7 +956,6 @@ static int help(void) { @@ -784,7 +784,7 @@ index 1c8d67d..2aec40b 100644 " --crash-shell[=0|1] Run shell on crash\n" " --confirm-spawn[=0|1] Ask for confirmation when spawning processes\n" diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index c26cc00..8236d08 100644 +index c26cc00f5..8236d0810 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -204,7 +204,6 @@ static void help(void) { @@ -796,7 +796,7 @@ index c26cc00..8236d08 100644 " -p --priority=RANGE Show entries with the specified priority\n" " -e --pager-end Immediately jump to the end in the pager\n" diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c -index d3c1772..bffbf4a 100644 +index d3c177201..bffbf4a0e 100644 --- a/src/libsystemd/sd-bus/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c @@ -1688,7 +1688,6 @@ static int help(void) { @@ -808,7 +808,7 @@ index d3c1772..bffbf4a 100644 " -M --machine=CONTAINER Operate on local container\n" " --address=ADDRESS Connect to bus specified by address\n" diff --git a/src/run/run.c b/src/run/run.c -index 0661b3b..0e5bde2 100644 +index 0661b3bee..0e5bde23d 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -68,7 +68,6 @@ static void help(void) { @@ -820,7 +820,7 @@ index 0661b3b..0e5bde2 100644 " -M --machine=CONTAINER Operate on local container\n" " --scope Run this as scope rather than service\n" diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 9898694..89d0b3b 100644 +index 9898694d7..89d0b3b39 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -6050,7 +6050,6 @@ static void systemctl_help(void) { diff --git a/SOURCES/0241-selinux-fix-check-for-transient-units.patch b/SOURCES/0241-selinux-fix-check-for-transient-units.patch index fb51e7e..5a3e6d9 100644 --- a/SOURCES/0241-selinux-fix-check-for-transient-units.patch +++ b/SOURCES/0241-selinux-fix-check-for-transient-units.patch @@ -21,7 +21,7 @@ Resolves: #1255129 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 2bc37ba..1ec350e 100644 +index 2bc37ba60..1ec350e03 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -734,7 +734,7 @@ static int method_start_transient_unit(sd_bus *bus, sd_bus_message *message, voi @@ -43,7 +43,7 @@ index 2bc37ba..1ec350e 100644 return r; diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c -index ce4f394..91460b8 100644 +index ce4f39459..91460b8af 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -175,6 +175,7 @@ void mac_selinux_access_free(void) { @@ -85,7 +85,7 @@ index ce4f394..91460b8 100644 sd_bus_creds_get_cmdline(creds, &cmdline); diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h -index dd1e8bb..7dc271b 100644 +index dd1e8bb9d..7dc271b35 100644 --- a/src/core/selinux-access.h +++ b/src/core/selinux-access.h @@ -28,21 +28,24 @@ diff --git a/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch b/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch index d3e32fd..2766dd7 100644 --- a/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch +++ b/SOURCES/0242-socket-fix-setsockopt-call.-SOL_SOCKET-changed-to-SO.patch @@ -10,7 +10,7 @@ Resolves: #1135599 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/socket.c b/src/core/socket.c -index 760de02..7022e77 100644 +index 760de0203..7022e77b5 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -833,7 +833,7 @@ static void socket_apply_socket_options(Socket *s, int fd) { diff --git a/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch b/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch index 6537d6c..e497457 100644 --- a/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch +++ b/SOURCES/0243-selinux-fix-missing-SELinux-unit-access-check.patch @@ -16,7 +16,7 @@ Resolves: #1185120 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c -index 91460b8..f11247c 100644 +index 91460b8af..f11247c09 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -272,12 +272,12 @@ int mac_selinux_unit_access_check_strv(char **units, diff --git a/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch b/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch index 2ac6330..496d57a 100644 --- a/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch +++ b/SOURCES/0244-selinux-always-use-_raw-API-from-libselinux.patch @@ -23,7 +23,7 @@ Resolves: #1256888 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c -index f11247c..297372d 100644 +index f11247c09..297372d12 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -219,13 +219,13 @@ int mac_selinux_generic_access_check( @@ -43,7 +43,7 @@ index f11247c..297372d 100644 r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get current context."); goto finish; diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c -index a46ddf8..4c2e1b0 100644 +index a46ddf849..4c2e1b0b4 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -200,11 +200,11 @@ int mac_selinux_get_create_label_from_exe(const char *exe, char **label) { diff --git a/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch b/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch index 82e7fe5..4c3b63b 100644 --- a/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch +++ b/SOURCES/0245-udev-net_id-support-predictable-ifnames-on-virtio-bu.patch @@ -15,7 +15,7 @@ Resolves: #1259015 1 file changed, 8 insertions(+) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index dd2886c..ddd83d4 100644 +index dd2886caf..ddd83d4f1 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -283,8 +283,16 @@ static int names_pci(struct udev_device *dev, struct netnames *names) { diff --git a/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch b/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch index 50cf72c..ba8a8dd 100644 --- a/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch +++ b/SOURCES/0246-Revert-sysctl.d-default-to-fq_codel-fight-bufferbloa.patch @@ -13,7 +13,7 @@ Resolves: #1263158 2 files changed, 15 deletions(-) diff --git a/NEWS b/NEWS -index d788749..ee976d4 100644 +index d78874924..ee976d44b 100644 --- a/NEWS +++ b/NEWS @@ -619,18 +619,6 @@ CHANGES WITH 217: @@ -36,7 +36,7 @@ index d788749..ee976d4 100644 available for service units, that allows locking all service processes into a stricter bus policy, in order to limit diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf -index def151b..44c4823 100644 +index def151bb8..44c48236c 100644 --- a/sysctl.d/50-default.conf +++ b/sysctl.d/50-default.conf @@ -32,9 +32,6 @@ net.ipv4.conf.all.accept_source_route = 0 diff --git a/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch b/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch index a09e4a8..6ac2b40 100644 --- a/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch +++ b/SOURCES/0247-loginctl-print-nontrivial-properties-in-logictl-show.patch @@ -11,7 +11,7 @@ Resolves: #1260465 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/src/login/loginctl.c b/src/login/loginctl.c -index b0eede9..6c8a59e 100644 +index b0eede9a3..6c8a59e7c 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -657,19 +657,165 @@ finish: @@ -184,7 +184,7 @@ index b0eede9..6c8a59e 100644 static int show_session(int argc, char *argv[], void *userdata) { diff --git a/src/shared/macro.h b/src/shared/macro.h -index 7f89951..9d857dc 100644 +index 7f89951d6..9d857dc8d 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -26,6 +26,7 @@ diff --git a/SOURCES/0248-login-fix-label-on-run-nologin.patch b/SOURCES/0248-login-fix-label-on-run-nologin.patch index 696c201..9f9578b 100644 --- a/SOURCES/0248-login-fix-label-on-run-nologin.patch +++ b/SOURCES/0248-login-fix-label-on-run-nologin.patch @@ -12,7 +12,7 @@ Resolves: #1264073 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 58bcc2c..0fcb737 100644 +index 58bcc2c42..0fcb73750 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5829,7 +5829,8 @@ systemd_user_sessions_SOURCES = \ @@ -26,7 +26,7 @@ index 58bcc2c..0fcb737 100644 rootlibexec_PROGRAMS += \ systemd-logind \ diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c -index 6edb823..d1d429c 100644 +index 6edb823e8..d1d429c0d 100644 --- a/src/login/user-sessions.c +++ b/src/login/user-sessions.c @@ -26,6 +26,7 @@ diff --git a/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch b/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch index 7c015a2..196532a 100644 --- a/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch +++ b/SOURCES/0249-udev-rules-prandom-character-device-node-permissions.patch @@ -10,7 +10,7 @@ Resolves: #1264112 1 file changed, 3 insertions(+) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 305e752..9a48add 100644 +index 305e75228..9a48adde1 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -11,3 +11,6 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/sys diff --git a/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch b/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch index ccf144c..374b9e8 100644 --- a/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch +++ b/SOURCES/0250-login-fix-gcc-warning-include-missing-header-file.patch @@ -9,7 +9,7 @@ Related: #1264073 1 file changed, 1 insertion(+) diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c -index d1d429c..9710524 100644 +index d1d429c0d..9710524da 100644 --- a/src/login/user-sessions.c +++ b/src/login/user-sessions.c @@ -26,6 +26,7 @@ diff --git a/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch b/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch index 630666d..3e7c818 100644 --- a/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch +++ b/SOURCES/0251-shutdown-make-sure-run-nologin-has-correct-label.patch @@ -11,7 +11,7 @@ Related: #1264073 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c -index 701882b..e1917a6 100644 +index 701882b96..e1917a626 100644 --- a/src/shutdownd/shutdownd.c +++ b/src/shutdownd/shutdownd.c @@ -39,6 +39,8 @@ diff --git a/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch b/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch index a2cee8d..1df2e5a 100644 --- a/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch +++ b/SOURCES/0252-sd-event-fix-prepare-priority-queue-comparison-funct.patch @@ -15,7 +15,7 @@ Resolves: #1266479 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index c6350be..1f1e6fe 100644 +index c6350be9f..1f1e6fe91 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -231,6 +231,12 @@ static int prepare_prioq_compare(const void *a, const void *b) { diff --git a/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch b/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch index 3ef74cc..7822a6f 100644 --- a/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch +++ b/SOURCES/0253-units-run-ldconfig-also-when-cache-is-unpopulated.patch @@ -10,7 +10,7 @@ Resolves: #1265539 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/units/ldconfig.service b/units/ldconfig.service -index 43c145b..8600b13 100644 +index 43c145b72..8600b1327 100644 --- a/units/ldconfig.service +++ b/units/ldconfig.service @@ -12,7 +12,8 @@ DefaultDependencies=no diff --git a/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch b/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch index 77bb7ee..f4089fe 100644 --- a/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch +++ b/SOURCES/0254-selinux-fix-regression-of-systemctl-subcommands-when.patch @@ -52,7 +52,7 @@ Related: #1185120 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c -index 297372d..6cc0a49 100644 +index 297372d12..6cc0a49b9 100644 --- a/src/core/selinux-access.c +++ b/src/core/selinux-access.c @@ -42,6 +42,7 @@ diff --git a/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch b/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch index 1f4250c..848f76c 100644 --- a/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch +++ b/SOURCES/0255-tmpfiles.d-don-t-clean-SAP-lockfiles-and-logs.patch @@ -13,7 +13,7 @@ Resolves: #1186044 create mode 100644 tmpfiles.d/sap.conf diff --git a/Makefile.am b/Makefile.am -index 0fcb737..887e70a 100644 +index 0fcb73750..887e70a95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2220,7 +2220,8 @@ dist_tmpfiles_DATA = \ @@ -28,7 +28,7 @@ index 0fcb737..887e70a 100644 dist_tmpfiles_DATA += \ diff --git a/tmpfiles.d/sap.conf b/tmpfiles.d/sap.conf new file mode 100644 -index 0000000..01ace42 +index 000000000..01ace42c4 --- /dev/null +++ b/tmpfiles.d/sap.conf @@ -0,0 +1,3 @@ diff --git a/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch b/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch index d8e46f5..6c8b5b5 100644 --- a/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch +++ b/SOURCES/0256-udev-make-naming-for-virtio-devices-opt-in.patch @@ -12,7 +12,7 @@ Resolves: #1269216 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index ddd83d4..ffd6ea4 100644 +index ddd83d4f1..ffd6ea416 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -281,14 +281,29 @@ out: @@ -48,7 +48,7 @@ index ddd83d4..ffd6ea4 100644 if (!parent) return -ENOENT; diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 87a3f69..21e7e7f 100644 +index 87a3f69e9..21e7e7f9a 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1003,10 +1003,10 @@ static void kernel_cmdline_options(struct udev *udev) { diff --git a/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch b/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch index 52a77a1..1a5980f 100644 --- a/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch +++ b/SOURCES/0257-tmpfiles.d-don-t-clean-SAP-sockets-either.patch @@ -11,7 +11,7 @@ Resolves: #1186044 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tmpfiles.d/sap.conf b/tmpfiles.d/sap.conf -index 01ace42..1cdca52 100644 +index 01ace42c4..1cdca5263 100644 --- a/tmpfiles.d/sap.conf +++ b/tmpfiles.d/sap.conf @@ -1,3 +1,9 @@ diff --git a/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch b/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch index 2634ba1..c69e166 100644 --- a/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch +++ b/SOURCES/0258-run-synchronously-wait-until-the-scope-unit-we-creat.patch @@ -19,7 +19,7 @@ Resolves: #1272368 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index e48abf5..6d56150 100644 +index e48abf55a..6d5615082 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1854,6 +1854,16 @@ int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path) { @@ -40,7 +40,7 @@ index e48abf5..6d56150 100644 const char *type, *path, *source; int r; diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h -index 21db982..8c8846c 100644 +index 21db98228..8c8846c6e 100644 --- a/src/libsystemd/sd-bus/bus-util.h +++ b/src/libsystemd/sd-bus/bus-util.h @@ -209,6 +209,7 @@ int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret); @@ -52,7 +52,7 @@ index 21db982..8c8846c 100644 DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free); diff --git a/src/run/run.c b/src/run/run.c -index 0e5bde2..dd1338f 100644 +index 0e5bde23d..dd1338f3b 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -806,14 +806,20 @@ static int start_transient_scope( diff --git a/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch b/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch index b866e07..4f083e7 100644 --- a/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch +++ b/SOURCES/0259-device-rework-how-we-enter-tentative-state.patch @@ -18,7 +18,7 @@ Resolves: #1283579 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/src/core/device.c b/src/core/device.c -index cc4ebd2..8a6855d 100644 +index cc4ebd2c8..8a6855dfc 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -151,14 +151,47 @@ static int device_coldplug(Unit *u, Hashmap *deferred_work) { @@ -144,7 +144,7 @@ index cc4ebd2..8a6855d 100644 .active_state = device_active_state, diff --git a/src/core/device.h b/src/core/device.h -index 0609b20..6724ab2 100644 +index 0609b20fd..6724ab21e 100644 --- a/src/core/device.h +++ b/src/core/device.h @@ -53,7 +53,7 @@ struct Device { diff --git a/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch b/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch index c1a9ea1..cbc8f7c 100644 --- a/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch +++ b/SOURCES/0260-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch @@ -52,7 +52,7 @@ Resolves: #1283579 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c -index 1f1a41a..23f63ce 100644 +index 1f1a41ab6..23f63ce32 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -321,7 +321,7 @@ static int mount_add_device_links(Mount *m) { @@ -65,7 +65,7 @@ index 1f1a41a..23f63ce 100644 return r; diff --git a/src/core/socket.c b/src/core/socket.c -index 7022e77..bc677a2 100644 +index 7022e77b5..bc677a20f 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -267,7 +267,7 @@ static int socket_add_device_link(Socket *s) { @@ -78,7 +78,7 @@ index 7022e77..bc677a2 100644 static int socket_add_default_dependencies(Socket *s) { diff --git a/src/core/swap.c b/src/core/swap.c -index 369abf0..34a2c40 100644 +index 369abf0f5..34a2c406d 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -201,7 +201,7 @@ static int swap_add_device_links(Swap *s) { @@ -91,7 +91,7 @@ index 369abf0..34a2c40 100644 /* File based swap devices need to be ordered after * systemd-remount-fs.service, since they might need a diff --git a/src/core/unit.c b/src/core/unit.c -index fa17567..ae47a28 100644 +index fa17567dd..ae47a2876 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2823,7 +2823,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { @@ -113,7 +113,7 @@ index fa17567..ae47a28 100644 return r; diff --git a/src/core/unit.h b/src/core/unit.h -index 7ebc489..0eebc0b 100644 +index 7ebc489c8..0eebc0b89 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -548,7 +548,7 @@ void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *v diff --git a/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch b/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch index bce797f..5bfbff0 100644 --- a/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch +++ b/SOURCES/0261-logind-set-RemoveIPC-no-by-default.patch @@ -12,7 +12,7 @@ Resolves: #1284588 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/login/logind.c b/src/login/logind.c -index b44f376..3afbf34 100644 +index b44f37642..3afbf34a1 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -49,7 +49,7 @@ Manager *manager_new(void) { @@ -25,7 +25,7 @@ index b44f376..3afbf34 100644 m->handle_power_key = HANDLE_POWEROFF; m->handle_suspend_key = HANDLE_SUSPEND; diff --git a/src/login/logind.conf b/src/login/logind.conf -index 834c4c2..be8d7df 100644 +index 834c4c2eb..be8d7dff2 100644 --- a/src/login/logind.conf +++ b/src/login/logind.conf @@ -30,4 +30,4 @@ diff --git a/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch b/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch index e435f0e..9d8d834 100644 --- a/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch +++ b/SOURCES/0262-sysv-generator-follow-symlinks-in-etc-rc.d-init.d.patch @@ -17,7 +17,7 @@ Resolves: #1285492 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 3c6cb8f..0a8a528 100644 +index 3c6cb8f10..0a8a528bd 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -753,7 +753,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { diff --git a/SOURCES/0263-sysv-generator-test-always-log-to-console.patch b/SOURCES/0263-sysv-generator-test-always-log-to-console.patch index b6f4daf..455c5a5 100644 --- a/SOURCES/0263-sysv-generator-test-always-log-to-console.patch +++ b/SOURCES/0263-sysv-generator-test-always-log-to-console.patch @@ -15,7 +15,7 @@ Resolves: #1279034 1 file changed, 1 insertion(+) diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py -index e716d70..1537864 100644 +index e716d705c..153786417 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -60,6 +60,7 @@ class SysvGeneratorTest(unittest.TestCase): diff --git a/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch b/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch index 2a6d56c..3a39f2b 100644 --- a/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch +++ b/SOURCES/0264-man-RemoveIPC-is-set-to-no-on-rhel.patch @@ -11,7 +11,7 @@ Related: #1284588 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/logind.conf.xml b/man/logind.conf.xml -index d02d573..54651f0 100644 +index d02d57356..54651f07d 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -276,7 +276,7 @@ diff --git a/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch b/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch index 7933126..c5026c5 100644 --- a/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch +++ b/SOURCES/0265-Avoid-tmp-being-mounted-as-tmpfs-without-the-user-s-.patch @@ -14,7 +14,7 @@ Resolves: #1298109 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index ae47a28..4fb2fd3 100644 +index ae47a2876..4fb2fd300 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -807,7 +807,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) { diff --git a/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch b/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch index db2ca26..86e73cc 100644 --- a/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch +++ b/SOURCES/0266-test-sysv-generator-Check-for-network-online.target.patch @@ -9,7 +9,7 @@ Resolves: #1279034 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py -index 1537864..2060ad7 100644 +index 153786417..2060ad754 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -225,21 +225,27 @@ class SysvGeneratorTest(unittest.TestCase): diff --git a/SOURCES/0267-makefile-disable-udev-tests.patch b/SOURCES/0267-makefile-disable-udev-tests.patch index 4379d44..d914f35 100644 --- a/SOURCES/0267-makefile-disable-udev-tests.patch +++ b/SOURCES/0267-makefile-disable-udev-tests.patch @@ -9,7 +9,7 @@ RHEL-only 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 887e70a..2645f66 100644 +index 887e70a95..2645f66bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3785,9 +3785,9 @@ hwdb-remove-hook: diff --git a/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch b/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch index 59389fd..5d58977 100644 --- a/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch +++ b/SOURCES/0268-arm-aarch64-detect-virt-check-dmi.patch @@ -16,7 +16,7 @@ Resolves: #1278165 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/shared/virt.c b/src/shared/virt.c -index 54c4655..d3ce8dd 100644 +index 54c465520..d3ce8dda7 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -29,7 +29,7 @@ diff --git a/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch b/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch index b33108a..a3a6fc8 100644 --- a/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch +++ b/SOURCES/0269-detect-virt-dmi-look-for-KVM.patch @@ -20,7 +20,7 @@ Resolves: #1278165 1 file changed, 2 insertions(+) diff --git a/src/shared/virt.c b/src/shared/virt.c -index d3ce8dd..55a6ca9 100644 +index d3ce8dda7..55a6ca90f 100644 --- a/src/shared/virt.c +++ b/src/shared/virt.c @@ -142,12 +142,14 @@ static int detect_vm_dmi(const char **_id) { diff --git a/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch b/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch index 499e9a7..c36129e 100644 --- a/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch +++ b/SOURCES/0270-Revert-journald-turn-ForwardToSyslog-off-by-default.patch @@ -15,7 +15,7 @@ Resolves: #1285642 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index 2cbe58b..c4f71e8 100644 +index 2cbe58bc1..c4f71e887 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -302,7 +302,7 @@ @@ -28,7 +28,7 @@ index 2cbe58b..c4f71e8 100644 <literal>systemd.journald.forward_to_syslog=</literal>, <literal>systemd.journald.forward_to_kmsg=</literal>, diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index f13147f..6a35ebb 100644 +index f13147f65..6a35ebbde 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1470,6 +1470,7 @@ int server_init(Server *s) { @@ -40,7 +40,7 @@ index f13147f..6a35ebb 100644 s->max_file_usec = DEFAULT_MAX_FILE_USEC; diff --git a/src/journal/journald.conf b/src/journal/journald.conf -index 47eefe9..3907dfb 100644 +index 47eefe91c..3907dfb7f 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -27,7 +27,7 @@ diff --git a/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch b/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch index 62276b3..c711f5b 100644 --- a/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch +++ b/SOURCES/0271-terminal-util-when-resetting-terminals-don-t-wait-fo.patch @@ -21,7 +21,7 @@ Resolves: #1266745 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c -index 778c2b0..5092588 100644 +index 778c2b0e0..50925888d 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1713,7 +1713,7 @@ bool fstype_is_network(const char *fstype) { diff --git a/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch b/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch index e4546ec..b41cccd 100644 --- a/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch +++ b/SOURCES/0272-basic-terminal-util-introduce-SYSTEMD_COLORS-environ.patch @@ -21,25 +21,25 @@ Resolves: #1247963 7 files changed, 31 insertions(+), 10 deletions(-) diff --git a/man/systemd.xml b/man/systemd.xml -index eb289f0..30005b1 100644 +index eb289f03b..30005b1ef 100644 --- a/man/systemd.xml +++ b/man/systemd.xml -@@ -755,6 +755,13 @@ +@@ -754,6 +754,13 @@ + script runlevel link farms.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>$SYSTEMD_COLORS</varname></term> + + <listitem><para>Controls whether colorized output should be generated. + </para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>$LISTEN_PID</varname></term> <term><varname>$LISTEN_FDS</varname></term> - diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 8236d08..7058788 100644 +index 8236d0810..7058788ef 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2140,7 +2140,7 @@ int main(int argc, char *argv[]) { @@ -52,7 +52,7 @@ index 8236d08..7058788 100644 arg_utc * OUTPUT_UTC; diff --git a/src/login/loginctl.c b/src/login/loginctl.c -index 6c8a59e..8e3bfbe 100644 +index 6c8a59e7c..8e3bfbea8 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -83,7 +83,7 @@ static OutputFlags get_output_flags(void) { @@ -65,7 +65,7 @@ index 6c8a59e..8e3bfbe 100644 static int list_sessions(int argc, char *argv[], void *userdata) { diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c -index f191070..ef1214a 100644 +index f1910709d..ef1214a66 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -105,7 +105,7 @@ static OutputFlags get_output_flags(void) { @@ -78,7 +78,7 @@ index f191070..ef1214a 100644 } diff --git a/src/shared/util.c b/src/shared/util.c -index 5092588..dc51852 100644 +index 50925888d..dc5185269 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -8146,3 +8146,16 @@ char *shell_maybe_quote(const char *s) { @@ -99,7 +99,7 @@ index 5092588..dc51852 100644 + return parse_boolean(colors) != 0; +} diff --git a/src/shared/util.h b/src/shared/util.h -index 7ecfd85..b4a4a49 100644 +index 7ecfd8571..b4a4a491f 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -485,29 +485,30 @@ unsigned lines(void); @@ -140,7 +140,7 @@ index 7ecfd85..b4a4a49 100644 int files_same(const char *filea, const char *fileb); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 89d0b3b..5d3a85f 100644 +index 89d0b3b39..5d3a85fd9 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -197,7 +197,7 @@ static OutputFlags get_output_flags(void) { diff --git a/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch b/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch index 2cd79fe..2befa76 100644 --- a/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch +++ b/SOURCES/0273-ask-password-don-t-abort-when-message-is-missing.patch @@ -17,7 +17,7 @@ Resolves: #1261136 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c -index 0a61daf..19baa6b 100644 +index 0a61dafc5..19baa6b55 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -70,9 +70,11 @@ int ask_password_tty( diff --git a/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch b/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch index 99ffbe7..b5f17df 100644 --- a/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch +++ b/SOURCES/0274-sysv-generator-do-not-join-dependencies-on-one-line-.patch @@ -18,7 +18,7 @@ Resolves: #1288600 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 0a8a528..d60e75a 100644 +index 0a8a528bd..d60e75a06 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -134,34 +134,14 @@ static int add_alias(const char *service, const char *alias) { @@ -84,7 +84,7 @@ index 0a8a528..d60e75a 100644 fprintf(f, "\n[Service]\n" diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py -index 2060ad7..25a35da 100644 +index 2060ad754..25a35da47 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -23,6 +23,7 @@ import subprocess diff --git a/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch b/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch index 5258624..eb148fc 100644 --- a/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch +++ b/SOURCES/0275-udev-fibre-channel-fix-NPIV-support.patch @@ -23,7 +23,7 @@ Resolves: #1266934 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 9ca6084..695ac7f 100644 +index 9ca608468..695ac7fc1 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -92,6 +92,9 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s diff --git a/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch b/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch index afde9b5..a76c549 100644 --- a/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch +++ b/SOURCES/0276-ata_id-unreverse-WWN-identifier.patch @@ -15,7 +15,7 @@ Resolves: #1273306 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c -index b6f28c6..4adec44 100644 +index b6f28c6f5..4adec4496 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -638,10 +638,20 @@ int main(int argc, char *argv[]) diff --git a/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch b/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch index 1ed0185..31b1885 100644 --- a/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch +++ b/SOURCES/0277-Fixup-WWN-bytes-for-big-endian-systems.patch @@ -10,7 +10,7 @@ Resolves: #1273306 1 file changed, 4 insertions(+) diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c -index 4adec44..ef05fba 100644 +index 4adec4496..ef05fba26 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -485,6 +485,10 @@ int main(int argc, char *argv[]) diff --git a/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch b/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch index bd281be..2ed9cc5 100644 --- a/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch +++ b/SOURCES/0278-sd-journal-introduce-has_runtime_files-and-has_persi.patch @@ -22,7 +22,7 @@ Resolves: #1082179 create mode 100644 man/sd_journal_has_runtime_files.xml diff --git a/Makefile-man.am b/Makefile-man.am -index 497be66..7ec709c 100644 +index 497be6612..7ec709c8b 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -40,6 +40,7 @@ MANPAGES += \ @@ -68,7 +68,7 @@ index 497be66..7ec709c 100644 man/sd_journal_open.xml \ man/sd_journal_print.xml \ diff --git a/man/sd-journal.xml b/man/sd-journal.xml -index 9b1a522..a1185d3 100644 +index 9b1a52207..a1185d372 100644 --- a/man/sd-journal.xml +++ b/man/sd-journal.xml @@ -81,9 +81,11 @@ @@ -96,7 +96,7 @@ index 9b1a522..a1185d3 100644 <citerefentry project='die-net'><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry> diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml new file mode 100644 -index 0000000..237e649 +index 000000000..237e64920 --- /dev/null +++ b/man/sd_journal_has_runtime_files.xml @@ -0,0 +1,95 @@ @@ -196,7 +196,7 @@ index 0000000..237e649 + +</refentry> diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h -index b51ecdb..115d777 100644 +index b51ecdb60..115d7776d 100644 --- a/src/journal/journal-internal.h +++ b/src/journal/journal-internal.h @@ -115,6 +115,8 @@ struct sd_journal { @@ -209,7 +209,7 @@ index b51ecdb..115d777 100644 size_t data_threshold; diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 9b9e8ac..20456c3 100644 +index 9b9e8ac85..20456c3a1 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -1230,8 +1230,7 @@ static int add_any_file(sd_journal *j, const char *path) { @@ -261,7 +261,7 @@ index 9b9e8ac..20456c3 100644 + return j->has_persistent_files; +} diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h -index 00237a2..d5fd46e 100644 +index 00237a215..d5fd46eea 100644 --- a/src/systemd/sd-journal.h +++ b/src/systemd/sd-journal.h @@ -138,6 +138,9 @@ int sd_journal_reliable_fd(sd_journal *j); diff --git a/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch b/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch index d79bc02..f6355dd 100644 --- a/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch +++ b/SOURCES/0279-journalctl-improve-error-messages-when-the-specified.patch @@ -11,7 +11,7 @@ Resolves: #1082179 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 7058788..964f849 100644 +index 7058788ef..964f849ee 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1090,10 +1090,11 @@ static int add_boot(sd_journal *j) { diff --git a/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch b/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch index 1938244..3275d86 100644 --- a/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch +++ b/SOURCES/0280-journalctl-show-friendly-info-when-using-b-on-runtim.patch @@ -14,7 +14,7 @@ Resolves: #1082179 1 file changed, 7 insertions(+) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 964f849..836d7d2 100644 +index 964f849ee..836d7d214 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1905,6 +1905,13 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch b/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch index 5ce2fbb..1ae56c8 100644 --- a/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch +++ b/SOURCES/0281-journalctl-make-journalctl-dev-sda-work.patch @@ -23,7 +23,7 @@ Resolves: #947636 2 files changed, 97 insertions(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 2645f66..2559376 100644 +index 2645f66bc..255937643 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4245,7 +4245,8 @@ journalctl_LDADD = \ @@ -37,7 +37,7 @@ index 2645f66..2559376 100644 if HAVE_ACL journalctl_LDADD += \ diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 836d7d2..3db1cd2 100644 +index 836d7d214..3db1cd24e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -63,6 +63,8 @@ diff --git a/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch b/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch index 60736b2..5ac2fc2 100644 --- a/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch +++ b/SOURCES/0282-journalctl-add-match-for-the-current-boot-when-calle.patch @@ -11,7 +11,7 @@ Related: #947636 1 file changed, 4 insertions(+) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 3db1cd2..6948ed6 100644 +index 3db1cd24e..6948ed689 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -207,6 +207,10 @@ static int add_matches_for_device(sd_journal *j, const char *devpath) { diff --git a/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch b/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch index 7678f12..741a3fe 100644 --- a/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch +++ b/SOURCES/0283-man-clarify-what-happens-when-journalctl-is-called-w.patch @@ -11,7 +11,7 @@ Related: #947636 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/man/journalctl.xml b/man/journalctl.xml -index 2764f66..0981fba 100644 +index 2764f66ed..0981fba72 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -91,8 +91,14 @@ diff --git a/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch b/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch index 70a46a9..3cbc9d0 100644 --- a/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch +++ b/SOURCES/0284-core-downgrade-warning-about-duplicate-device-names.patch @@ -12,7 +12,7 @@ Resolves: #1296249 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/device.c b/src/core/device.c -index 8a6855d..1995e3c 100644 +index 8a6855dfc..1995e3c0b 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -317,7 +317,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa diff --git a/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch b/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch index 461de4d..00a87c3 100644 --- a/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch +++ b/SOURCES/0285-udev-downgrade-a-few-warnings-to-debug-messages.patch @@ -13,7 +13,7 @@ Resolves: #1289461 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c -index 8999583..2b2c3da 100644 +index 89995831b..2b2c3dad6 100644 --- a/src/udev/udev-builtin-blkid.c +++ b/src/udev/udev-builtin-blkid.c @@ -263,7 +263,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t @@ -26,7 +26,7 @@ index 8999583..2b2c3da 100644 } diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c -index ab0d96e..64b763c 100644 +index ab0d96e37..64b763c1e 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -168,10 +168,8 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len diff --git a/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch b/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch index 7a72451..cef6b48 100644 --- a/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch +++ b/SOURCES/0286-man-LEVEL-in-systemd-analyze-set-log-level-is-not-op.patch @@ -12,7 +12,7 @@ Resolves: #1268336 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/systemd-analyze.xml b/man/systemd-analyze.xml -index b2e0f42..e58d9a7 100644 +index b2e0f42d5..e58d9a74e 100644 --- a/man/systemd-analyze.xml +++ b/man/systemd-analyze.xml @@ -93,7 +93,7 @@ diff --git a/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch b/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch index 10170d9..b10569c 100644 --- a/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch +++ b/SOURCES/0287-Revert-udev-fibre-channel-fix-NPIV-support.patch @@ -11,7 +11,7 @@ Related: #1266934 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 695ac7f..9ca6084 100644 +index 695ac7fc1..9ca608468 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -92,9 +92,6 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s diff --git a/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch b/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch index f710d52..49fd8ad 100644 --- a/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch +++ b/SOURCES/0288-udev-path-id-fibre-channel-NPIV-use-fc_vport-s-port_.patch @@ -75,7 +75,7 @@ Resolves: #1266934 1 file changed, 30 insertions(+) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 9ca6084..3b72922 100644 +index 9ca608468..3b72922d4 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -92,7 +92,11 @@ static struct udev_device *skip_subsystem(struct udev_device *dev, const char *s diff --git a/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch b/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch index c421414..ddea68f 100644 --- a/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch +++ b/SOURCES/0289-systemctl-is-active-failed-should-return-0-if-at-lea.patch @@ -15,7 +15,7 @@ Resolves: #1254650 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 5d3a85f..bf5bb39 100644 +index 5d3a85fd9..bf5bb398b 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -3002,6 +3002,7 @@ static int check_unit_generic(sd_bus *bus, int code, const char *good_states, ch diff --git a/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch b/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch index 7c60bfd..2f35ee2 100644 --- a/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch +++ b/SOURCES/0290-rules-set-SYSTEMD_READY-0-on-DM_UDEV_DISABLE_OTHER_R.patch @@ -20,7 +20,7 @@ Resolves: #1312011 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in -index b66d727..a4f4bf3 100644 +index b66d727a4..a4f4bf3df 100644 --- a/rules/99-systemd.rules.in +++ b/rules/99-systemd.rules.in @@ -12,7 +12,7 @@ SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*|ttysclp*|sclp_line*|3270 diff --git a/SOURCES/0291-s390-add-personality-support.patch b/SOURCES/0291-s390-add-personality-support.patch index 1e6fc33..d751c1c 100644 --- a/SOURCES/0291-s390-add-personality-support.patch +++ b/SOURCES/0291-s390-add-personality-support.patch @@ -17,7 +17,7 @@ Resolves: #1300344 create mode 100644 test/exec-personality-s390.service diff --git a/Makefile.am b/Makefile.am -index 2559376..3af720b 100644 +index 255937643..3af720bda 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1483,6 +1483,7 @@ EXTRA_DIST += \ @@ -29,7 +29,7 @@ index 2559376..3af720b 100644 test/exec-privatedevices-yes.service \ test/exec-privatetmp-no.service \ diff --git a/src/shared/util.c b/src/shared/util.c -index dc51852..a24aa7f 100644 +index dc5185269..a24aa7f93 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -6748,6 +6748,19 @@ unsigned long personality_from_string(const char *p) { @@ -74,7 +74,7 @@ index dc51852..a24aa7f 100644 return NULL; diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 91ccaf7..00f3607 100644 +index 91ccaf72b..00f3607b4 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -77,10 +77,14 @@ static void test_exec_workingdirectory(Manager *m) { @@ -96,7 +96,7 @@ index 91ccaf7..00f3607 100644 diff --git a/test/exec-personality-s390.service b/test/exec-personality-s390.service new file mode 100644 -index 0000000..f3c3b03 +index 000000000..f3c3b03e3 --- /dev/null +++ b/test/exec-personality-s390.service @@ -0,0 +1,7 @@ diff --git a/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch b/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch index 22eeeb3..07aec58 100644 --- a/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch +++ b/SOURCES/0292-socket_address_listen-do-not-rely-on-errno.patch @@ -20,7 +20,7 @@ Resolves: #1316452 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c -index a6289eb..713e71b 100644 +index a6289eb50..713e71ba3 100644 --- a/src/shared/socket-label.c +++ b/src/shared/socket-label.c @@ -119,7 +119,7 @@ int socket_address_listen( diff --git a/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch b/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch index 318baa7..e637af4 100644 --- a/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch +++ b/SOURCES/0293-path_id-reintroduce-by-path-links-for-virtio-block-d.patch @@ -30,7 +30,7 @@ Resolves: #952567 1 file changed, 6 insertions(+) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 3b72922..8359e23 100644 +index 3b72922d4..8359e236a 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -698,6 +698,12 @@ restart: diff --git a/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch b/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch index b5246a5..e397d6c 100644 --- a/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch +++ b/SOURCES/0294-journal-fix-error-handling-when-compressing-journal-.patch @@ -18,7 +18,7 @@ Resolves: #1292447 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index f500568..a8f92e2 100644 +index f500568fe..a8f92e23a 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -1051,23 +1051,25 @@ static int journal_file_append_data( @@ -53,7 +53,7 @@ index f500568..a8f92e2 100644 r = journal_file_link_data(f, o, p, hash); diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h -index 403c8f7..0f29b09 100644 +index 403c8f760..0f29b092b 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -229,3 +229,8 @@ int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t * diff --git a/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch b/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch index db97ef0..15a6c33 100644 --- a/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch +++ b/SOURCES/0295-journal-irrelevant-coding-style-fixes.patch @@ -11,7 +11,7 @@ Related: #1292447 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/journal/compress.c b/src/journal/compress.c -index 6923753..c9a3399 100644 +index 6923753f8..c9a3399cc 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -51,10 +51,11 @@ int compress_blob_xz(const void *src, uint64_t src_size, void *dst, size_t *dst_ @@ -31,7 +31,7 @@ index 6923753..c9a3399 100644 lzma_ret ret; size_t out_pos = 0; diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index a8f92e2..892fe47 100644 +index a8f92e23a..892fe4734 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -1032,7 +1032,7 @@ static int journal_file_append_data( diff --git a/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch b/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch index 21d90a8..43f31cf 100644 --- a/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch +++ b/SOURCES/0296-install-follow-unit-file-symlinks-in-usr-but-not-etc.patch @@ -86,7 +86,7 @@ Resolves: #1159308 create mode 100644 src/test/test-install-root.c diff --git a/Makefile.am b/Makefile.am -index 3af720b..3a09e0a 100644 +index 3af720bda..3a09e0a62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1427,7 +1427,8 @@ tests += \ @@ -116,7 +116,7 @@ index 3af720b..3a09e0a 100644 libsystemd-core.la diff --git a/man/systemctl.xml b/man/systemctl.xml -index c6f5842..2d0678d 100644 +index c6f584278..2d0678d18 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -905,10 +905,11 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service @@ -148,7 +148,7 @@ index c6f5842..2d0678d 100644 </tgroup> </table> diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 1ec350e..faa124d 100644 +index 1ec350e03..faa124d92 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1530,9 +1530,9 @@ static int method_get_unit_file_state(sd_bus *bus, sd_bus_message *message, void @@ -165,7 +165,7 @@ index 1ec350e..faa124d 100644 return sd_bus_reply_method_return(message, "s", unit_file_state_to_string(state)); } diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c -index 625d21a..227915e 100644 +index 625d21ab8..227915efc 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -919,7 +919,7 @@ static int bus_unit_set_transient_property( @@ -187,7 +187,7 @@ index 625d21a..227915e 100644 if (mode != UNIT_CHECK) { diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index ec4cf4e..70c0918 100644 +index ec4cf4eef..70c09188a 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3409,7 +3409,7 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_final) { @@ -200,7 +200,7 @@ index ec4cf4e..70c0918 100644 id = set_get(names, name); if (!id) { diff --git a/src/core/manager.c b/src/core/manager.c -index 7483a96..bde17ce 100644 +index 7483a96ec..bde17ce0b 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1328,7 +1328,7 @@ int manager_load_unit_prepare( @@ -213,7 +213,7 @@ index 7483a96..bde17ce 100644 ret = manager_get_unit(m, name); diff --git a/src/core/snapshot.c b/src/core/snapshot.c -index b1d8448..f222ec2 100644 +index b1d844877..f222ec232 100644 --- a/src/core/snapshot.c +++ b/src/core/snapshot.c @@ -201,7 +201,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, @@ -226,7 +226,7 @@ index b1d8448..f222ec2 100644 if (unit_name_to_type(name) != UNIT_SNAPSHOT) diff --git a/src/core/unit.c b/src/core/unit.c -index 4fb2fd3..db5aa98 100644 +index 4fb2fd300..db5aa987e 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -158,7 +158,7 @@ int unit_add_name(Unit *u, const char *text) { @@ -272,7 +272,7 @@ index 4fb2fd3..db5aa98 100644 return u->unit_file_preset; } diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c -index 2e08af2..c909a4b 100644 +index 2e08af2df..c909a4b1d 100644 --- a/src/dbus1-generator/dbus1-generator.c +++ b/src/dbus1-generator/dbus1-generator.c @@ -188,7 +188,7 @@ static int add_dbus(const char *path, const char *fname, const char *type) { @@ -285,7 +285,7 @@ index 2e08af2..c909a4b 100644 return 0; } diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index a37ca17..b77c1d8 100644 +index a37ca170f..b77c1d887 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -50,8 +50,6 @@ static bool arg_copy_locale = false; @@ -368,7 +368,7 @@ index a37ca17..b77c1d8 100644 return 0; diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c -index dfd8689..cf757d2 100644 +index dfd8689b7..cf757d2b2 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -1147,7 +1147,7 @@ int cg_path_decode_unit(const char *cgroup, char **unit){ @@ -399,7 +399,7 @@ index dfd8689..cf757d2 100644 escaped = cg_escape(n); diff --git a/src/shared/install.c b/src/shared/install.c -index aa197e9..5288bb4 100644 +index aa197e91b..5288bb450 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -39,15 +39,24 @@ @@ -3124,7 +3124,7 @@ index aa197e9..5288bb4 100644 DEFINE_STRING_TABLE_LOOKUP(unit_file_state, UnitFileState); diff --git a/src/shared/install.h b/src/shared/install.h -index d729e6e..87a40b6 100644 +index d729e6ed1..87a40b67c 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -24,6 +24,7 @@ @@ -3214,7 +3214,7 @@ index d729e6e..87a40b6 100644 void unit_file_changes_free(UnitFileChange *changes, unsigned n_changes); diff --git a/src/shared/path-util.c b/src/shared/path-util.c -index d5510bf..1181ffb 100644 +index d5510bf56..1181ffb9d 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -704,3 +704,37 @@ int fsck_exists(const char *fstype) { @@ -3256,7 +3256,7 @@ index d5510bf..1181ffb 100644 + return n; +} diff --git a/src/shared/path-util.h b/src/shared/path-util.h -index ca81b49..71bb740 100644 +index ca81b49cb..71bb740e9 100644 --- a/src/shared/path-util.h +++ b/src/shared/path-util.h @@ -63,6 +63,33 @@ bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool @@ -3294,7 +3294,7 @@ index ca81b49..71bb740 100644 * the tree, to root. Also returns "" (and not "/"!) for the root * directory. Excludes the specified directory itself */ diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c -index f728af4..b7827d1 100644 +index f728af4a8..b7827d14b 100644 --- a/src/shared/unit-name.c +++ b/src/shared/unit-name.c @@ -63,16 +63,13 @@ static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = { @@ -3349,7 +3349,7 @@ index f728af4..b7827d1 100644 bool unit_instance_is_valid(const char *i) { diff --git a/src/shared/unit-name.h b/src/shared/unit-name.h -index 6f139cc..4364860 100644 +index 6f139cc4c..436486062 100644 --- a/src/shared/unit-name.h +++ b/src/shared/unit-name.h @@ -107,6 +107,13 @@ enum UnitDependency { @@ -3381,7 +3381,7 @@ index 6f139cc..4364860 100644 bool unit_instance_is_valid(const char *i) _pure_; diff --git a/src/shared/util.c b/src/shared/util.c -index a24aa7f..036677e 100644 +index a24aa7f93..036677eb4 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1094,6 +1094,27 @@ int readlink_and_canonicalize(const char *p, char **r) { @@ -3413,7 +3413,7 @@ index a24aa7f..036677e 100644 int sig, r = 0; diff --git a/src/shared/util.h b/src/shared/util.h -index b4a4a49..a441e44 100644 +index b4a4a491f..a441e44ff 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -281,6 +281,7 @@ int readlink_malloc(const char *p, char **r); @@ -3425,7 +3425,7 @@ index b4a4a49..a441e44 100644 int reset_all_signal_handlers(void); int reset_signal_mask(void); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index bf5bb39..95ddf3b 100644 +index bf5bb398b..95ddf3be7 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1304,7 +1304,7 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) { @@ -3449,7 +3449,7 @@ index bf5bb39..95ddf3b 100644 if (state == UNIT_FILE_ENABLED || diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index d60e75a..7e0e7fc 100644 +index d60e75a06..7e0e7fc28 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -712,6 +712,7 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { @@ -3485,7 +3485,7 @@ index d60e75a..7e0e7fc 100644 diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c new file mode 100644 -index 0000000..89d91d3 +index 000000000..89d91d3d6 --- /dev/null +++ b/src/test/test-install-root.c @@ -0,0 +1,663 @@ @@ -4153,7 +4153,7 @@ index 0000000..89d91d3 + return 0; +} diff --git a/src/test/test-install.c b/src/test/test-install.c -index 467970b..08a1faf 100644 +index 467970b00..08a1faf2c 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -50,17 +50,19 @@ int main(int argc, char* argv[]) { diff --git a/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch b/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch index 6179f44..b57ba56 100644 --- a/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch +++ b/SOURCES/0297-core-look-for-instance-when-processing-template-name.patch @@ -17,7 +17,7 @@ Related: #1159308 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 70c0918..b188ec9 100644 +index 70c09188a..b188ec99d 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3472,8 +3472,17 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { diff --git a/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch b/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch index c18cb11..2f32bf3 100644 --- a/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch +++ b/SOURCES/0298-core-improve-error-message-when-starting-template-wi.patch @@ -11,7 +11,7 @@ Resolves: #1142369 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index bde17ce..bb50503 100644 +index bde17ce0b..bb5050303 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1328,8 +1328,12 @@ int manager_load_unit_prepare( diff --git a/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch b/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch index 2468eac..a57bd86 100644 --- a/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch +++ b/SOURCES/0299-man-tmpfiles.d-add-note-about-permissions-and-owners.patch @@ -13,7 +13,7 @@ Resolves: #1296288 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml -index 9b4e11c..fc1fe13 100644 +index 9b4e11c1b..fc1fe13ac 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml @@ -187,7 +187,8 @@ diff --git a/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch b/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch index 973aaf0..d491adb 100644 --- a/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch +++ b/SOURCES/0300-tmpfiles-don-t-follow-symlinks-when-adjusting-ACLs-f.patch @@ -11,7 +11,7 @@ Resolves: #1296288 1 file changed, 74 insertions(+), 38 deletions(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index d0e6567..64c733a 100644 +index d0e6567d8..64c733aaa 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -570,51 +570,69 @@ finish: diff --git a/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch b/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch index b261d9c..dac2bc6 100644 --- a/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch +++ b/SOURCES/0301-udev-filter-out-non-sensically-high-onboard-indexes-.patch @@ -15,7 +15,7 @@ Resolves: #1230210 1 file changed, 9 insertions(+) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index ffd6ea4..19e1f26 100644 +index ffd6ea416..19e1f2631 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -101,6 +101,8 @@ diff --git a/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch b/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch index db487ec..b54b6ea 100644 --- a/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch +++ b/SOURCES/0302-test-execute-add-tests-for-RuntimeDirectory.patch @@ -14,7 +14,7 @@ Resolves: #1324826 create mode 100644 test/exec-runtimedirectory.service diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 00f3607..90b1c87 100644 +index 00f3607b4..90b1c871c 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -141,6 +141,11 @@ static void test_exec_umask(Manager *m) { @@ -47,7 +47,7 @@ index 00f3607..90b1c87 100644 r = manager_new(SYSTEMD_USER, true, &m); diff --git a/test/exec-runtimedirectory-mode.service b/test/exec-runtimedirectory-mode.service new file mode 100644 -index 0000000..ba6d7ee +index 000000000..ba6d7ee39 --- /dev/null +++ b/test/exec-runtimedirectory-mode.service @@ -0,0 +1,8 @@ @@ -61,7 +61,7 @@ index 0000000..ba6d7ee +RuntimeDirectoryMode=0750 diff --git a/test/exec-runtimedirectory.service b/test/exec-runtimedirectory.service new file mode 100644 -index 0000000..c12a6c6 +index 000000000..c12a6c63d --- /dev/null +++ b/test/exec-runtimedirectory.service @@ -0,0 +1,7 @@ diff --git a/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch b/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch index 5d195a6..6fdf04a 100644 --- a/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch +++ b/SOURCES/0303-core-fix-group-ownership-when-Group-is-set.patch @@ -19,7 +19,7 @@ Resolves: #1324826 create mode 100644 test/exec-runtimedirectory-owner.service diff --git a/src/core/execute.c b/src/core/execute.c -index 1815e3d..8172c8b 100644 +index 1815e3de2..8172c8b44 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -629,14 +629,6 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_ @@ -56,7 +56,7 @@ index 1815e3d..8172c8b 100644 * must sure to drop O_NONBLOCK */ if (socket_fd >= 0) diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 90b1c87..38522a1 100644 +index 90b1c871c..38522a168 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -144,6 +144,7 @@ static void test_exec_umask(Manager *m) { @@ -69,7 +69,7 @@ index 90b1c87..38522a1 100644 int main(int argc, char *argv[]) { diff --git a/test/exec-runtimedirectory-owner.service b/test/exec-runtimedirectory-owner.service new file mode 100644 -index 0000000..077e08d +index 000000000..077e08d1c --- /dev/null +++ b/test/exec-runtimedirectory-owner.service @@ -0,0 +1,9 @@ diff --git a/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch b/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch index 3928b66..e3d3237 100644 --- a/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch +++ b/SOURCES/0304-fstab-generator-cescape-device-name-in-root-fsck-ser.patch @@ -15,7 +15,7 @@ Resolves: #1306126 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/shared/generator.c b/src/shared/generator.c -index 3af84a3..be8e24e 100644 +index 3af84a325..be8e24eb4 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -35,8 +35,13 @@ diff --git a/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch b/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch index 57c910c..6ec19cf 100644 --- a/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch +++ b/SOURCES/0305-core-add-new-RandomSec-setting-for-time-units.patch @@ -18,7 +18,7 @@ Resolves: #1305279 6 files changed, 100 insertions(+), 6 deletions(-) diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml -index 20890f2..bdd14d8 100644 +index 20890f227..bdd14d888 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -180,13 +180,12 @@ @@ -80,7 +80,7 @@ index 20890f2..bdd14d8 100644 <term><varname>Unit=</varname></term> diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c -index 43e7852..cd7bf44 100644 +index 43e785246..cd7bf44ba 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -181,6 +181,7 @@ const sd_bus_vtable bus_timer_vtable[] = { @@ -115,7 +115,7 @@ index 43e7852..cd7bf44 100644 int b; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 5305984..5106a98 100644 +index 53059845e..5106a98ee 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -336,6 +336,7 @@ Timer.OnUnitInactiveSec, config_parse_timer, 0, @@ -127,7 +127,7 @@ index 5305984..5106a98 100644 m4_dnl Path.PathExists, config_parse_path_spec, 0, 0 diff --git a/src/core/timer.c b/src/core/timer.c -index 48cf9c1..972dd73 100644 +index 48cf9c16a..972dd73df 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -29,6 +29,7 @@ @@ -187,7 +187,7 @@ index 48cf9c1..972dd73 100644 if (t->realtime_event_source) { diff --git a/src/core/timer.h b/src/core/timer.h -index de412a0..b977245 100644 +index de412a043..b97724525 100644 --- a/src/core/timer.h +++ b/src/core/timer.h @@ -69,6 +69,7 @@ struct Timer { @@ -199,13 +199,17 @@ index de412a0..b977245 100644 LIST_HEAD(TimerValue, values); usec_t next_elapse_realtime; diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 6d56150..5ecb3be 100644 +index 6d5615082..5ecb3bea4 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c -@@ -1364,6 +1364,22 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen - return bus_log_create_error(r); +@@ -1360,6 +1360,22 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen + return -EINVAL; + } - return 0; ++ if (r < 0) ++ return bus_log_create_error(r); ++ ++ return 0; + } else if (streq(field, "RandomSec")) { + usec_t t; + @@ -218,10 +222,6 @@ index 6d56150..5ecb3be 100644 + return bus_log_create_error(r); + + r = sd_bus_message_append(m, "v", "t", t); -+ if (r < 0) -+ return bus_log_create_error(r); -+ -+ return 0; - } + if (r < 0) + return bus_log_create_error(r); - r = sd_bus_message_append_basic(m, SD_BUS_TYPE_STRING, field); diff --git a/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch b/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch index 522a8a2..82753db 100644 --- a/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch +++ b/SOURCES/0306-core-rename-Random-to-RandomizedDelay.patch @@ -18,7 +18,7 @@ Resolves: #1305279 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml -index bdd14d8..ab83b2c 100644 +index bdd14d888..ab83b2c9c 100644 --- a/man/systemd.timer.xml +++ b/man/systemd.timer.xml @@ -195,7 +195,7 @@ @@ -51,7 +51,7 @@ index bdd14d8..ab83b2c 100644 </varlistentry> diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c -index cd7bf44..478905a 100644 +index cd7bf44ba..478905acc 100644 --- a/src/core/dbus-timer.c +++ b/src/core/dbus-timer.c @@ -181,7 +181,7 @@ const sd_bus_vtable bus_timer_vtable[] = { @@ -82,7 +82,7 @@ index cd7bf44..478905a 100644 return 1; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 5106a98..85d9797 100644 +index 5106a98ee..85d979751 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -336,7 +336,7 @@ Timer.OnUnitInactiveSec, config_parse_timer, 0, @@ -95,7 +95,7 @@ index 5106a98..85d9797 100644 m4_dnl Path.PathExists, config_parse_path_spec, 0, 0 diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 5ecb3be..3a91836 100644 +index 5ecb3bea4..3a918361b 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1364,14 +1364,14 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen diff --git a/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch b/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch index fdc6b1e..8e9eb5c 100644 --- a/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch +++ b/SOURCES/0307-journal-remote-change-owner-of-var-log-journal-remot.patch @@ -11,7 +11,7 @@ Resolves: #1327303 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tmpfiles.d/systemd-remote.conf b/tmpfiles.d/systemd-remote.conf -index 1b8973a..e19230f 100644 +index 1b8973a88..e19230f64 100644 --- a/tmpfiles.d/systemd-remote.conf +++ b/tmpfiles.d/systemd-remote.conf @@ -7,5 +7,7 @@ diff --git a/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch b/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch index b0af3aa..cdbbaef 100644 --- a/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch +++ b/SOURCES/0308-Add-Seal-option-in-the-configuration-file-for-journa.patch @@ -16,7 +16,7 @@ Resolves: #1329233 3 files changed, 9 insertions(+) diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml -index a7b2227..9a385c7 100644 +index a7b222718..9a385c7e5 100644 --- a/man/journal-remote.conf.xml +++ b/man/journal-remote.conf.xml @@ -72,6 +72,13 @@ @@ -34,7 +34,7 @@ index a7b2227..9a385c7 100644 <varlistentry> <term><varname>SplitMode=</varname></term> diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index b7cc6d7..9c515f9 100644 +index b7cc6d717..9c515f9c8 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -1174,6 +1174,7 @@ static DEFINE_CONFIG_PARSE_ENUM(config_parse_write_split_mode, @@ -46,7 +46,7 @@ index b7cc6d7..9c515f9 100644 { "Remote", "ServerKeyFile", config_parse_path, 0, &arg_key }, { "Remote", "ServerCertificateFile", config_parse_path, 0, &arg_cert }, diff --git a/src/journal-remote/journal-remote.conf.in b/src/journal-remote/journal-remote.conf.in -index 3e32f34..7122d63 100644 +index 3e32f34de..7122d6336 100644 --- a/src/journal-remote/journal-remote.conf.in +++ b/src/journal-remote/journal-remote.conf.in @@ -1,4 +1,5 @@ diff --git a/SOURCES/0309-tests-fix-make-check-failure.patch b/SOURCES/0309-tests-fix-make-check-failure.patch index 4eae4c3..289ab1e 100644 --- a/SOURCES/0309-tests-fix-make-check-failure.patch +++ b/SOURCES/0309-tests-fix-make-check-failure.patch @@ -12,7 +12,7 @@ Related: #1159308 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c -index 89d91d3..667c374 100644 +index 89d91d3d6..667c3748c 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -657,7 +657,7 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch b/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch index 0bc39b6..2aeabaa 100644 --- a/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch +++ b/SOURCES/0310-device-make-sure-to-not-ignore-re-plugged-device.patch @@ -35,7 +35,7 @@ Resolves: #1332606 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/core/device.c b/src/core/device.c -index 1995e3c..fc73e26 100644 +index 1995e3c0b..fc73e263a 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -314,11 +314,19 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa diff --git a/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch b/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch index f695fad..30fbfd5 100644 --- a/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch +++ b/SOURCES/0311-device-Ensure-we-have-sysfs-path-before-comparing.patch @@ -19,7 +19,7 @@ Resolves: #1332606 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/device.c b/src/core/device.c -index fc73e26..bdc8466 100644 +index fc73e263a..bdc8466ab 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -319,7 +319,7 @@ static int device_setup_unit(Manager *m, struct udev_device *dev, const char *pa diff --git a/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch b/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch index 958c0d7..9d3cef1 100644 --- a/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch +++ b/SOURCES/0312-core-fix-memory-leak-on-set-default-enable-disable-e.patch @@ -10,7 +10,7 @@ Related: #1331667 1 file changed, 1 insertion(+) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index faa124d..1a5525e 100644 +index faa124d92..1a5525e50 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1621,6 +1621,7 @@ static int reply_unit_file_changes_and_free( diff --git a/SOURCES/0313-nspawn-fix-minor-memory-leak.patch b/SOURCES/0313-nspawn-fix-minor-memory-leak.patch index 12818bc..400089c 100644 --- a/SOURCES/0313-nspawn-fix-minor-memory-leak.patch +++ b/SOURCES/0313-nspawn-fix-minor-memory-leak.patch @@ -13,7 +13,7 @@ Related: #1331667 1 file changed, 1 insertion(+) diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c -index 31274a1..88b3f4e 100644 +index 31274a141..88b3f4e3c 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -388,6 +388,7 @@ PTYForward *pty_forward_free(PTYForward *f) { diff --git a/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch b/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch index fcd43b4..8f7cfa2 100644 --- a/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch +++ b/SOURCES/0314-basic-fix-error-memleak-in-socket-util.patch @@ -14,7 +14,7 @@ Related: #1331667 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index a4e26b1..407d0af 100644 +index a4e26b1d8..407d0afee 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -544,7 +544,7 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ diff --git a/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch b/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch index 2e0202d..a72a99b 100644 --- a/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch +++ b/SOURCES/0315-core-fix-memory-leak-in-manager_run_generators.patch @@ -38,7 +38,7 @@ Related: #1331667 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index bb50503..a1504bf 100644 +index bb5050303..a1504bf17 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2827,7 +2827,7 @@ static void trim_generator_dir(Manager *m, char **generator) { diff --git a/SOURCES/0316-modules-load-fix-memory-leak.patch b/SOURCES/0316-modules-load-fix-memory-leak.patch index 32e483b..756fd76 100644 --- a/SOURCES/0316-modules-load-fix-memory-leak.patch +++ b/SOURCES/0316-modules-load-fix-memory-leak.patch @@ -27,7 +27,7 @@ Related: #1331667 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c -index 5f67878..bab9246 100644 +index 5f678789c..bab9246a3 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -256,7 +256,7 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch b/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch index 882253a..7d2b32b 100644 --- a/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch +++ b/SOURCES/0317-core-fix-memory-leak-on-failed-preset-all.patch @@ -49,7 +49,7 @@ Related: #1331667 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 1a5525e..9eef290 100644 +index 1a5525e50..9eef290ca 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1875,8 +1875,10 @@ static int method_preset_all_unit_files(sd_bus *bus, sd_bus_message *message, vo diff --git a/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch b/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch index 1dc4f72..444d226 100644 --- a/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch +++ b/SOURCES/0318-sd-bus-fix-memory-leak-in-test-bus-chat.patch @@ -14,7 +14,7 @@ Related: #1331667 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c -index 8625ee6..a80aaae 100644 +index 8625ee6d8..a80aaaeef 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -264,7 +264,7 @@ fail: diff --git a/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch b/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch index 9ef8b84..72aec5c 100644 --- a/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch +++ b/SOURCES/0319-core-fix-memory-leak-in-transient-units.patch @@ -40,7 +40,7 @@ Related: #1331667 1 file changed, 3 insertions(+) diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c -index 8be1900..42cf005 100644 +index 8be190040..42cf00572 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -68,6 +68,9 @@ int unit_load_dropin(Unit *u) { diff --git a/SOURCES/0320-bus-fix-leak-in-error-path.patch b/SOURCES/0320-bus-fix-leak-in-error-path.patch index 834a358..3a61e88 100644 --- a/SOURCES/0320-bus-fix-leak-in-error-path.patch +++ b/SOURCES/0320-bus-fix-leak-in-error-path.patch @@ -12,7 +12,7 @@ Related: #1331667 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c -index 2959303..c8402a2 100644 +index 295930303..c8402a23a 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -441,7 +441,7 @@ int bus_message_from_header( diff --git a/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch b/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch index 54d207e..d3b9d3a 100644 --- a/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch +++ b/SOURCES/0321-shared-logs-show-fix-memleak-in-add_matches_for_unit.patch @@ -10,7 +10,7 @@ Related: #1331667 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index c249505..8c37411 100644 +index c2495056d..8c374116a 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1060,7 +1060,7 @@ int add_matches_for_unit(sd_journal *j, const char *unit) { diff --git a/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch b/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch index bdf69ca..65b0aa5 100644 --- a/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch +++ b/SOURCES/0322-logind-introduce-LockedHint-and-SetLockedHint-3238.patch @@ -16,7 +16,7 @@ Resolves: #1335499 4 files changed, 75 insertions(+) diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c -index 4e7edef..75b7186 100644 +index 4e7edef52..75b7186e8 100644 --- a/src/login/logind-session-dbus.c +++ b/src/login/logind-session-dbus.c @@ -180,6 +180,24 @@ static int property_get_idle_since_hint( @@ -98,7 +98,7 @@ index 4e7edef..75b7186 100644 SD_BUS_METHOD("ReleaseControl", NULL, NULL, method_release_control, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("TakeDevice", "uu", "hb", method_take_device, SD_BUS_VTABLE_UNPRIVILEGED), diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index d2e7b40..dc24539 100644 +index d2e7b4012..dc24539f1 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -843,6 +843,23 @@ void session_set_idle_hint(Session *s, bool b) { @@ -126,7 +126,7 @@ index d2e7b40..dc24539 100644 Session *s = userdata; diff --git a/src/login/logind-session.h b/src/login/logind-session.h -index a007fb5..5002b68 100644 +index a007fb5e8..5002b6868 100644 --- a/src/login/logind-session.h +++ b/src/login/logind-session.h @@ -111,6 +111,8 @@ struct Session { @@ -148,17 +148,17 @@ index a007fb5..5002b68 100644 int session_start(Session *s); int session_stop(Session *s, bool force); diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf -index 1318328..dc7e0be 100644 +index 1318328aa..dc7e0bec2 100644 --- a/src/login/org.freedesktop.login1.conf +++ b/src/login/org.freedesktop.login1.conf -@@ -162,6 +162,10 @@ - - <allow send_destination="org.freedesktop.login1" +@@ -160,6 +160,10 @@ send_interface="org.freedesktop.login1.Session" -+ send_member="SetLockedHint"/> -+ + send_member="SetIdleHint"/> + + <allow send_destination="org.freedesktop.login1" + send_interface="org.freedesktop.login1.Session" - send_member="TakeControl"/> - ++ send_member="SetLockedHint"/> ++ <allow send_destination="org.freedesktop.login1" + send_interface="org.freedesktop.login1.Session" + send_member="TakeControl"/> diff --git a/SOURCES/0323-import-use-the-old-curl-api.patch b/SOURCES/0323-import-use-the-old-curl-api.patch index 8f3a938..fb63cd9 100644 --- a/SOURCES/0323-import-use-the-old-curl-api.patch +++ b/SOURCES/0323-import-use-the-old-curl-api.patch @@ -13,7 +13,7 @@ Resolves: #1284974 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/import/import-job.c b/src/import/import-job.c -index 8094865..5f9cfd3 100644 +index 809486500..5f9cfd366 100644 --- a/src/import/import-job.c +++ b/src/import/import-job.c @@ -587,7 +587,7 @@ fail: diff --git a/SOURCES/0324-importd-drop-dkr-support.patch b/SOURCES/0324-importd-drop-dkr-support.patch index e6c1d55..341a489 100644 --- a/SOURCES/0324-importd-drop-dkr-support.patch +++ b/SOURCES/0324-importd-drop-dkr-support.patch @@ -29,7 +29,7 @@ Related: #1284974 delete mode 100644 src/import/import-dkr.h diff --git a/Makefile.am b/Makefile.am -index 3a09e0a..b0a34b2 100644 +index 3a09e0a62..b0a34b212 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5369,8 +5369,6 @@ systemd_pull_SOURCES = \ @@ -42,7 +42,7 @@ index 3a09e0a..b0a34b2 100644 src/import/import-job.h \ src/import/import-common.c \ diff --git a/TODO b/TODO -index 90b2c4b..d96d2bf 100644 +index 90b2c4b30..d96d2bf0e 100644 --- a/TODO +++ b/TODO @@ -126,10 +126,6 @@ Features: @@ -57,7 +57,7 @@ index 90b2c4b..d96d2bf 100644 * core/cgroup: support net_cls modules, and support automatically allocating class ids, then add support for making firewall changes depending on it, to implement a per-service firewall diff --git a/configure.ac b/configure.ac -index 9103f9b..2734368 100644 +index 9103f9b92..2734368dc 100644 --- a/configure.ac +++ b/configure.ac @@ -1389,14 +1389,6 @@ AC_ARG_ENABLE([split-usr], @@ -84,7 +84,7 @@ index 9103f9b..2734368 100644 CFLAGS: ${OUR_CFLAGS} ${CFLAGS} CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} diff --git a/man/machinectl.xml b/man/machinectl.xml -index 640cb8b..b0a7f2a 100644 +index 640cb8b7d..b0a7f2ae4 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -204,16 +204,6 @@ @@ -104,10 +104,11 @@ index 640cb8b..b0a7f2a 100644 <xi:include href="user-system-options.xml" xpointer="host" /> <xi:include href="user-system-options.xml" xpointer="machine" /> -@@ -603,42 +593,6 @@ +@@ -602,42 +592,6 @@ + below.</para></listitem> </varlistentry> - <varlistentry> +- <varlistentry> - <term><command>pull-dkr</command> <replaceable>REMOTE</replaceable> [<replaceable>NAME</replaceable>]</term> - - <listitem><para>Downloads a <literal>dkr</literal> container @@ -143,10 +144,9 @@ index 640cb8b..b0a7f2a 100644 - below.</para></listitem> - </varlistentry> - -- <varlistentry> + <varlistentry> <term><command>list-transfers</command></term> - <listitem><para>Shows a list of container or VM image @@ -728,18 +682,6 @@ the machine started as system service. With the last command a login prompt into the container is requested.</para> @@ -168,7 +168,7 @@ index 640cb8b..b0a7f2a 100644 <refsect1> diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c deleted file mode 100644 -index fb72f6c..0000000 +index fb72f6cee..000000000 --- a/src/import/import-dkr.c +++ /dev/null @@ -1,891 +0,0 @@ @@ -1065,7 +1065,7 @@ index fb72f6c..0000000 -} diff --git a/src/import/import-dkr.h b/src/import/import-dkr.h deleted file mode 100644 -index 633c767..0000000 +index 633c76796..000000000 --- a/src/import/import-dkr.h +++ /dev/null @@ -1,36 +0,0 @@ @@ -1106,7 +1106,7 @@ index 633c767..0000000 - -int dkr_import_pull(DkrImport *import, const char *name, const char *tag, const char *local, bool force_local); diff --git a/src/import/importd.c b/src/import/importd.c -index 1222bf3..9aaf991 100644 +index 1222bf3cd..9aaf991f8 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -38,7 +38,6 @@ typedef struct Manager Manager; @@ -1298,22 +1298,22 @@ index 1222bf3..9aaf991 100644 SD_BUS_METHOD("CancelTransfer", "u", NULL, method_cancel_transfer, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_SIGNAL("TransferNew", "uo", 0), diff --git a/src/import/org.freedesktop.import1.conf b/src/import/org.freedesktop.import1.conf -index ae36af4..ed2539a 100644 +index ae36af422..ed2539a03 100644 --- a/src/import/org.freedesktop.import1.conf +++ b/src/import/org.freedesktop.import1.conf -@@ -53,10 +53,6 @@ +@@ -52,10 +52,6 @@ + send_interface="org.freedesktop.import1.Manager" send_member="PullRaw"/> - <allow send_destination="org.freedesktop.import1" +- <allow send_destination="org.freedesktop.import1" - send_interface="org.freedesktop.import1.Manager" - send_member="PullDkr"/> - -- <allow send_destination="org.freedesktop.import1" + <allow send_destination="org.freedesktop.import1" send_interface="org.freedesktop.import1.Transfer" send_member="Cancel"/> - diff --git a/src/import/pull.c b/src/import/pull.c -index ee3ff68..9cb1088 100644 +index ee3ff6803..9cb10880f 100644 --- a/src/import/pull.c +++ b/src/import/pull.c @@ -28,13 +28,11 @@ @@ -1492,7 +1492,7 @@ index ee3ff68..9cb1088 100644 }; diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c -index ef1214a..cfd3162 100644 +index ef1214a66..cfd3162fb 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -77,7 +77,6 @@ static unsigned arg_lines = 10; @@ -1642,7 +1642,7 @@ index ef1214a..cfd3162 100644 { "cancel-transfer", 2, VERB_ANY, 0, cancel_transfer }, {} diff --git a/src/shared/import-util.c b/src/shared/import-util.c -index 660d92a..c0aba30 100644 +index 660d92ac5..c0aba30a9 100644 --- a/src/shared/import-util.c +++ b/src/shared/import-util.c @@ -149,34 +149,3 @@ int raw_strip_suffixes(const char *p, char **ret) { @@ -1681,7 +1681,7 @@ index 660d92a..c0aba30 100644 - return true; -} diff --git a/src/shared/import-util.h b/src/shared/import-util.h -index ff155b0..22773c5 100644 +index ff155b0ff..22773c58e 100644 --- a/src/shared/import-util.h +++ b/src/shared/import-util.h @@ -41,7 +41,3 @@ ImportVerify import_verify_from_string(const char *s) _pure_; diff --git a/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch b/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch index 0b5c5bc..3d13383 100644 --- a/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch +++ b/SOURCES/0325-import-add-support-for-gpg2-for-verifying-imported-i.patch @@ -14,7 +14,7 @@ Resolves: #1284974 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/import/import-common.c b/src/import/import-common.c -index 2acf380..f10a453 100644 +index 2acf380f9..f10a453ee 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -281,8 +281,9 @@ int import_verify( diff --git a/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch b/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch index 5145384..0ac243e 100644 --- a/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch +++ b/SOURCES/0326-nspawn-when-connected-to-pipes-for-stdin-stdout-pass.patch @@ -24,7 +24,7 @@ Resolves: #1307080 5 files changed, 74 insertions(+), 55 deletions(-) diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c -index cfd3162..1a58aea 100644 +index cfd3162fb..1a58aeaf1 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -1427,7 +1427,7 @@ static int login_machine(int argc, char *argv[], void *userdata) { @@ -37,7 +37,7 @@ index cfd3162..1a58aea 100644 return log_error_errno(r, "Failed to create PTY forwarder: %m"); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 78bd584..a37b640 100644 +index 78bd58483..a37b64094 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3581,6 +3581,7 @@ int main(int argc, char *argv[]) { @@ -138,7 +138,7 @@ index 78bd584..a37b640 100644 log_error_errno(r, "Failed to create PTY forwarder: %m"); goto finish; diff --git a/src/run/run.c b/src/run/run.c -index dd1338f..4680342 100644 +index dd1338f3b..468034284 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -780,7 +780,7 @@ static int start_transient_service( @@ -151,7 +151,7 @@ index dd1338f..4680342 100644 return log_error_errno(r, "Failed to create PTY forwarder: %m"); diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c -index 88b3f4e..4402af1 100644 +index 88b3f4e3c..4402af123 100644 --- a/src/shared/ptyfwd.c +++ b/src/shared/ptyfwd.c @@ -42,6 +42,8 @@ struct PTYForward { @@ -279,7 +279,7 @@ index 88b3f4e..4402af1 100644 if (r < 0) return r; diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h -index d3e229b..6208a54 100644 +index d3e229bd7..6208a543d 100644 --- a/src/shared/ptyfwd.h +++ b/src/shared/ptyfwd.h @@ -30,7 +30,7 @@ diff --git a/SOURCES/0327-mount-remove-obsolete-n.patch b/SOURCES/0327-mount-remove-obsolete-n.patch index c919efc..829dbc6 100644 --- a/SOURCES/0327-mount-remove-obsolete-n.patch +++ b/SOURCES/0327-mount-remove-obsolete-n.patch @@ -23,7 +23,7 @@ Resolves: #1339721 1 file changed, 6 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c -index 23f63ce..fe967bc 100644 +index 23f63ce32..fe967bc03 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -881,8 +881,6 @@ static void mount_enter_unmounting(Mount *m) { diff --git a/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch b/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch index 7047551..d00d16d 100644 --- a/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch +++ b/SOURCES/0328-core-don-t-log-job-status-message-in-case-job-was-ef.patch @@ -40,7 +40,7 @@ Resolves: #1280014 6 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c -index 8b5ea25..7ce5d57 100644 +index 8b5ea2566..7ce5d5772 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -84,7 +84,7 @@ int bus_job_method_cancel(sd_bus *bus, sd_bus_message *message, void *userdata, @@ -53,7 +53,7 @@ index 8b5ea25..7ce5d57 100644 return sd_bus_reply_method_return(message, NULL); } diff --git a/src/core/job.c b/src/core/job.c -index 7416386..c2876de 100644 +index 7416386a1..c2876dec1 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -190,7 +190,7 @@ Job* job_install(Job *j) { @@ -157,7 +157,7 @@ index 7416386..c2876de 100644 failure_action(u->manager, u->job_timeout_action, u->job_timeout_reboot_arg); diff --git a/src/core/job.h b/src/core/job.h -index d967b68..e4191ee 100644 +index d967b68a3..e4191ee77 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -220,7 +220,7 @@ void job_add_to_dbus_queue(Job *j); @@ -170,7 +170,7 @@ index d967b68..e4191ee 100644 char *job_dbus_path(Job *j); diff --git a/src/core/manager.c b/src/core/manager.c -index a1504bf..ee456fb 100644 +index a1504bf17..ee456fb79 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1426,7 +1426,7 @@ void manager_clear_jobs(Manager *m) { @@ -183,7 +183,7 @@ index a1504bf..ee456fb 100644 static int manager_dispatch_run_queue(sd_event_source *source, void *userdata) { diff --git a/src/core/transaction.c b/src/core/transaction.c -index b0b3d6b..aed64fa 100644 +index b0b3d6bd6..aed64fa41 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -592,7 +592,7 @@ static int transaction_apply(Transaction *tr, Manager *m, JobMode mode) { @@ -196,7 +196,7 @@ index b0b3d6b..aed64fa 100644 } diff --git a/src/core/unit.c b/src/core/unit.c -index db5aa98..d6ead7d 100644 +index db5aa987e..d6ead7d67 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1851,12 +1851,12 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su diff --git a/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch b/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch index fd0463f..7127211 100644 --- a/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch +++ b/SOURCES/0329-core-use-an-AF_UNIX-SOCK_DGRAM-socket-for-cgroup-age.patch @@ -49,7 +49,7 @@ Resolves: #1305608 6 files changed, 198 insertions(+), 62 deletions(-) diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c -index 529e843..2fe6583 100644 +index 529e84303..2fe65830e 100644 --- a/src/cgroups-agent/cgroups-agent.c +++ b/src/cgroups-agent/cgroups-agent.c @@ -1,5 +1,3 @@ @@ -126,7 +126,7 @@ index 529e843..2fe6583 100644 } diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 10fdcc9..b7f08fb 100644 +index 10fdcc998..b7f08fb42 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -1028,6 +1028,8 @@ int manager_notify_cgroup_empty(Manager *m, const char *cgroup) { @@ -139,7 +139,7 @@ index 10fdcc9..b7f08fb 100644 if (u) { r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, true); diff --git a/src/core/dbus.c b/src/core/dbus.c -index 85b5174..29524d4 100644 +index 85b517486..29524d49a 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -72,12 +72,37 @@ int bus_send_queued_message(Manager *m) { @@ -225,7 +225,7 @@ index 85b5174..29524d4 100644 if (r < 0) return 0; diff --git a/src/core/dbus.h b/src/core/dbus.h -index d04f532..c27d136 100644 +index d04f5326c..c27d136e3 100644 --- a/src/core/dbus.h +++ b/src/core/dbus.h @@ -40,3 +40,5 @@ int bus_verify_manage_unit_async(Manager *m, sd_bus_message *call, sd_bus_error @@ -235,7 +235,7 @@ index d04f532..c27d136 100644 + +int bus_forward_agent_released(Manager *m, const char *path); diff --git a/src/core/manager.c b/src/core/manager.c -index ee456fb..370c8cb 100644 +index ee456fb79..370c8cbbe 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -83,8 +83,10 @@ @@ -474,7 +474,7 @@ index ee456fb..370c8cb 100644 q = manager_coldplug(m); if (q < 0 && r >= 0) diff --git a/src/core/manager.h b/src/core/manager.h -index d3971f1..3e855db 100644 +index d3971f168..3e855db46 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -137,6 +137,9 @@ struct Manager { diff --git a/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch b/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch index 74225fe..c79ed3f 100644 --- a/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch +++ b/SOURCES/0330-logind-process-session-inhibitor-fds-at-higher-prior.patch @@ -17,7 +17,7 @@ Resolves: #1305608 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c -index 84fee0e..bf96898 100644 +index 84fee0e77..bf96898f2 100644 --- a/src/login/logind-inhibit.c +++ b/src/login/logind-inhibit.c @@ -303,7 +303,7 @@ int inhibitor_create_fifo(Inhibitor *i) { @@ -30,7 +30,7 @@ index 84fee0e..bf96898 100644 return r; } diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index dc24539..59f5a7a 100644 +index dc24539f1..59f5a7ad5 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -905,7 +905,9 @@ int session_create_fifo(Session *s) { @@ -45,7 +45,7 @@ index dc24539..59f5a7a 100644 return r; } diff --git a/src/login/logind.c b/src/login/logind.c -index 3afbf34..e8d0669 100644 +index 3afbf34a1..e8d0669bb 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -685,7 +685,7 @@ static int manager_connect_bus(Manager *m) { diff --git a/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch b/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch index 39ce2f4..c279427 100644 --- a/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch +++ b/SOURCES/0331-Teach-bus_append_unit_property_assignment-about-Dele.patch @@ -12,7 +12,7 @@ Resolves: #1337922 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 3a91836..9d70798 100644 +index 3a918361b..9d70798cd 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1388,7 +1388,8 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen diff --git a/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch b/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch index 633bb16..d7f683f 100644 --- a/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch +++ b/SOURCES/0332-sd-netlink-fix-deep-recursion-in-message-destruction.patch @@ -18,7 +18,7 @@ Resolves: #1330593 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c -index 276591f..9276bbd 100644 +index 276591f31..9276bbdeb 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -584,7 +584,9 @@ sd_rtnl_message *sd_rtnl_message_ref(sd_rtnl_message *m) { diff --git a/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch b/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch index 11a75b3..0c698f5 100644 --- a/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch +++ b/SOURCES/0333-add-REMOTE_ADDR-and-REMOTE_PORT-for-Accept-yes.patch @@ -16,7 +16,7 @@ Resolves: #1341154 7 files changed, 107 insertions(+), 28 deletions(-) diff --git a/TODO b/TODO -index d96d2bf..498d82c 100644 +index d96d2bf0e..498d82c21 100644 --- a/TODO +++ b/TODO @@ -185,8 +185,6 @@ Features: @@ -29,7 +29,7 @@ index d96d2bf..498d82c 100644 * in systemctl list-unit-files: show the install value the presets would suggest for a service in a third column diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml -index 2f54193..350a956 100644 +index 2f541937f..350a95648 100644 --- a/man/systemd.socket.xml +++ b/man/systemd.socket.xml @@ -357,7 +357,12 @@ @@ -47,7 +47,7 @@ index 2f54193..350a956 100644 <varlistentry> diff --git a/src/core/service.c b/src/core/service.c -index ae5e610..c76713b 100644 +index ae5e61000..c76713b1c 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1094,7 +1094,7 @@ static int service_spawn( @@ -107,7 +107,7 @@ index ae5e610..c76713b 100644 if (!final_env) { r = -ENOMEM; diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c -index d08e1b5..a14b6de 100644 +index d08e1b5a0..a14b6de19 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.c @@ -49,7 +49,7 @@ static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrin @@ -120,7 +120,7 @@ index d08e1b5..a14b6de 100644 } diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index 407d0af..a212510 100644 +index 407d0afee..a21251014 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -302,7 +302,7 @@ int socket_address_print(const SocketAddress *a, char **ret) { @@ -252,7 +252,7 @@ index 407d0af..a212510 100644 return log_error_errno(r, "sockadd_pretty() failed: %m"); diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h -index 07d0aff..6bfb677 100644 +index 07d0aff72..6bfb677fb 100644 --- a/src/shared/socket-util.h +++ b/src/shared/socket-util.h @@ -98,7 +98,9 @@ const char* socket_address_get_path(const SocketAddress *a); @@ -267,7 +267,7 @@ index 07d0aff..6bfb677 100644 int getsockname_pretty(int fd, char **ret); diff --git a/src/timesync/timesyncd-server.h b/src/timesync/timesyncd-server.h -index 243b44a..18c4444 100644 +index 243b44a0e..18c44445e 100644 --- a/src/timesync/timesyncd-server.h +++ b/src/timesync/timesyncd-server.h @@ -59,7 +59,7 @@ struct ServerName { diff --git a/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch b/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch index 005f4a8..8b31c8e 100644 --- a/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch +++ b/SOURCES/0334-core-don-t-dispatch-load-queue-when-setting-Slice-fo.patch @@ -16,7 +16,7 @@ Resolves: #1343904 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c -index 227915e..49770bf 100644 +index 227915efc..49770bfda 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -930,10 +930,14 @@ static int bus_unit_set_transient_property( diff --git a/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch b/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch index a9b279e..bc4def1 100644 --- a/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch +++ b/SOURCES/0335-run-make-slice-work-in-conjunction-with-scope.patch @@ -11,7 +11,7 @@ Resolves: #1343904 1 file changed, 4 insertions(+) diff --git a/src/run/run.c b/src/run/run.c -index 4680342..bbb542b 100644 +index 468034284..bbb542b65 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -595,6 +595,10 @@ static int transient_scope_set_properties(sd_bus_message *m) { diff --git a/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch b/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch index e1d7450..6db74bf 100644 --- a/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch +++ b/SOURCES/0336-myhostname-fix-timeout-if-ipv6-is-disabled.patch @@ -11,7 +11,7 @@ Resolves: #1330973 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c -index a939bb2..e197cc7 100644 +index a939bb267..e197cc752 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -33,6 +33,7 @@ @@ -39,7 +39,7 @@ index a939bb2..e197cc7 100644 canonical = hn; additional = n_addresses <= 0 && af == AF_INET6 ? "localhost" : NULL; diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c -index a212510..79d1582 100644 +index a21251014..79d1582d4 100644 --- a/src/shared/socket-util.c +++ b/src/shared/socket-util.c @@ -435,6 +435,16 @@ bool socket_ipv6_is_supported(void) { diff --git a/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch b/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch index 1bca28f..e19cf07 100644 --- a/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch +++ b/SOURCES/0337-readahead-do-not-increase-nr_requests-for-root-fs-bl.patch @@ -22,7 +22,7 @@ Resolves: #1314559 3 files changed, 68 deletions(-) diff --git a/src/readahead/readahead-common.c b/src/readahead/readahead-common.c -index 3ca48a7..6cf33f7 100644 +index 3ca48a725..6cf33f7cf 100644 --- a/src/readahead/readahead-common.c +++ b/src/readahead/readahead-common.c @@ -253,70 +253,6 @@ ReadaheadShared *shared_get(void) { @@ -97,7 +97,7 @@ index 3ca48a7..6cf33f7 100644 struct stat st; char *ap = NULL, *line = NULL; diff --git a/src/readahead/readahead-common.h b/src/readahead/readahead-common.h -index b34f3aa..cc2ea81 100644 +index b34f3aadd..cc2ea81a9 100644 --- a/src/readahead/readahead-common.h +++ b/src/readahead/readahead-common.h @@ -51,8 +51,6 @@ typedef struct ReadaheadShared { @@ -110,7 +110,7 @@ index b34f3aa..cc2ea81 100644 int block_set_readahead(const char *p, uint64_t bytes); diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c -index f81e0fe..c2e2816 100644 +index f81e0fe55..c2e281687 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -134,8 +134,6 @@ static int replay(const char *root) { diff --git a/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch b/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch index 24530fd..ccb64bb 100644 --- a/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch +++ b/SOURCES/0338-manager-reduce-complexity-of-unit_gc_sweep-3507.patch @@ -20,7 +20,7 @@ Resolves: #1344556 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 370c8cb..e5226a8 100644 +index 370c8cbbe..e5226a8a6 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -838,6 +838,19 @@ enum { diff --git a/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch b/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch index c98059d..f83afea 100644 --- a/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch +++ b/SOURCES/0339-hwdb-selinuxify-a-bit-3460.patch @@ -18,7 +18,7 @@ Resolves: #1343648 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index b0a34b2..3848338 100644 +index b0a34b212..3848338a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3752,6 +3752,7 @@ systemd_hwdb_SOURCES = \ @@ -30,7 +30,7 @@ index b0a34b2..3848338 100644 libsystemd-internal.la \ libudev-internal.la diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c -index 4539673..8e5d6cc 100644 +index 4539673ea..8e5d6cc86 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -34,6 +34,8 @@ diff --git a/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch b/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch index 6374256..05e841b 100644 --- a/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch +++ b/SOURCES/0340-udevadm-explicitly-relabel-etc-udev-hwdb.bin-after-r.patch @@ -13,7 +13,7 @@ Related: #1350756 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c -index d65e40c..201e2a0 100644 +index d65e40c01..201e2a0cd 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -26,6 +26,8 @@ @@ -41,7 +41,7 @@ index d65e40c..201e2a0 100644 if (test) { diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c -index 56cd0cd..d05a26e 100644 +index 56cd0cd4e..d05a26e78 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch b/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch index 84b59cb..ea4d7d0 100644 --- a/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch +++ b/SOURCES/0341-systemctl-return-diffrent-error-code-if-service-exis.patch @@ -68,7 +68,7 @@ Resolves: #1047466 1 file changed, 2 insertions(+) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 95ddf3b..6079d60 100644 +index 95ddf3be7..6079d60db 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4295,6 +4295,8 @@ static int show_one( diff --git a/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch b/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch index 8696946..2032b88 100644 --- a/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch +++ b/SOURCES/0342-systemctl-Replace-init-script-error-codes-with-enum-.patch @@ -14,7 +14,7 @@ Related: #1047466 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 6079d60..fdda174 100644 +index 6079d60db..fdda174ae 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -75,6 +75,25 @@ diff --git a/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch b/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch index 21a9c9f..ceb5b29 100644 --- a/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch +++ b/SOURCES/0343-systemctl-rework-systemctl-status-a-bit.patch @@ -30,7 +30,7 @@ Related: #1047466 1 file changed, 68 insertions(+), 38 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index fdda174..93b7a19 100644 +index fdda174ae..93b7a193b 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4211,12 +4211,19 @@ static int show_one( diff --git a/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch b/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch index 3bcc69f..6d8731a 100644 --- a/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch +++ b/SOURCES/0344-journal-verify-don-t-hit-SIGFPE-when-determining-pro.patch @@ -13,7 +13,7 @@ Related: #1350232 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index b03335e..983217c 100644 +index b03335ef3..983217c1b 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -69,6 +69,16 @@ static void draw_progress(uint64_t p, usec_t *last_usec) { diff --git a/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch b/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch index 476804d..429ca14 100644 --- a/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch +++ b/SOURCES/0345-journal-avoid-mapping-empty-data-and-field-hash-tabl.patch @@ -27,7 +27,7 @@ Related: #1350232 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 892fe47..ef18497 100644 +index 892fe4734..ef1849787 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -656,13 +656,16 @@ static int journal_file_setup_field_hash_table(JournalFile *f) { @@ -118,7 +118,7 @@ index 892fe47..ef18497 100644 r = -EIO; goto fail; diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h -index 0f29b09..c74ad5f 100644 +index 0f29b092b..c74ad5fc5 100644 --- a/src/journal/journal-file.h +++ b/src/journal/journal-file.h @@ -234,3 +234,6 @@ static inline bool JOURNAL_FILE_COMPRESS(JournalFile *f) { @@ -129,7 +129,7 @@ index 0f29b09..c74ad5f 100644 +int journal_file_map_data_hash_table(JournalFile *f); +int journal_file_map_field_hash_table(JournalFile *f); diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index 983217c..d2d5c40 100644 +index 983217c1b..d2d5c400c 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -590,6 +590,13 @@ static int verify_hash_table( diff --git a/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch b/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch index 96a659b..a381dbc 100644 --- a/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch +++ b/SOURCES/0346-journal-when-verifying-journal-files-handle-empty-on.patch @@ -13,7 +13,7 @@ Resolves: #1350232 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index d2d5c40..53f0550 100644 +index d2d5c400c..53f0550da 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -885,7 +885,11 @@ int journal_file_verify( diff --git a/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch b/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch index 3f0242f..8d17eb9 100644 --- a/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch +++ b/SOURCES/0347-journal-explain-the-error-when-we-find-a-non-DATA-ob.patch @@ -14,7 +14,7 @@ Related: #1350232 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index 53f0550..77fb409 100644 +index 53f0550da..77fb4090d 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -123,8 +123,10 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o diff --git a/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch b/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch index c4d242c..ea9dbfa 100644 --- a/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch +++ b/SOURCES/0348-journalctl-properly-detect-empty-journal-files.patch @@ -13,7 +13,7 @@ Related: #1350232 1 file changed, 6 insertions(+) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6948ed6..904aae9 100644 +index 6948ed689..904aae99e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2141,6 +2141,12 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch b/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch index d679d33..75092d2 100644 --- a/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch +++ b/SOURCES/0349-journal-uppercase-first-character-in-verify-error-me.patch @@ -14,7 +14,7 @@ Related: #1350232 1 file changed, 75 insertions(+), 87 deletions(-) diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index 77fb409..8a66ac7 100644 +index 77fb4090d..8a66ac7f0 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -135,15 +135,15 @@ static int journal_file_object_verify(JournalFile *f, uint64_t offset, Object *o diff --git a/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch b/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch index 7de0a54..40f3408 100644 --- a/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch +++ b/SOURCES/0350-journalctl-make-sure-journalctl-f-t-unmatched-blocks.patch @@ -28,7 +28,7 @@ Related: #1350232 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 904aae9..2688d8b 100644 +index 904aae99e..2688d8b2e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2142,8 +2142,12 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch b/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch index 2478c48..2ecd6fe 100644 --- a/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch +++ b/SOURCES/0351-journalctl-don-t-print-No-entries-in-quiet-mode.patch @@ -10,7 +10,7 @@ Related: #1350232 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 2688d8b..a38ce4b 100644 +index 2688d8b2e..a38ce4b8f 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2145,7 +2145,8 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch b/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch index 79865b4..92d3be4 100644 --- a/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch +++ b/SOURCES/0352-sd-event-expose-the-event-loop-iteration-counter-via.patch @@ -20,7 +20,7 @@ Related: #1342173 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c -index 1f1e6fe..9d48e5a 100644 +index 1f1e6fe91..9d48e5a49 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -76,8 +76,8 @@ struct sd_event_source { @@ -56,7 +56,7 @@ index 1f1e6fe..9d48e5a 100644 + return 0; +} diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h -index 25a10f9..4957f3a 100644 +index 25a10f99a..4957f3a32 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -101,6 +101,7 @@ int sd_event_get_tid(sd_event *e, pid_t *tid); diff --git a/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch b/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch index 962c65f..745316b 100644 --- a/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch +++ b/SOURCES/0353-manager-Only-invoke-a-single-sigchld-per-unit-within.patch @@ -27,7 +27,7 @@ Resolves: #1342173 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index e5226a8..63693b9 100644 +index e5226a8a6..63693b93a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1747,14 +1747,25 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t @@ -58,7 +58,7 @@ index e5226a8..63693b9 100644 static int manager_dispatch_sigchld(Manager *m) { diff --git a/src/core/unit.c b/src/core/unit.c -index d6ead7d..d62135d 100644 +index d6ead7d67..d62135d87 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -94,6 +94,7 @@ Unit *unit_new(Manager *m, size_t size) { @@ -70,7 +70,7 @@ index d6ead7d..d62135d 100644 return u; } diff --git a/src/core/unit.h b/src/core/unit.h -index 0eebc0b..d936457 100644 +index 0eebc0b89..d93645777 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -167,6 +167,9 @@ struct Unit { diff --git a/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch b/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch index 7d91382..a207f77 100644 --- a/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch +++ b/SOURCES/0354-manager-Fixing-a-debug-printf-formatting-mistake.patch @@ -13,7 +13,7 @@ Related: #1342173 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 63693b9..d168777 100644 +index 63693b93a..d168777d2 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1764,7 +1764,8 @@ static void invoke_sigchld_event(Manager *m, Unit *u, siginfo_t *si) { diff --git a/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch b/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch index 7791eba..51f96e2 100644 --- a/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch +++ b/SOURCES/0355-core-support-IEC-suffixes-for-RLIMIT-stuff.patch @@ -30,7 +30,7 @@ Related: #1351415 6 files changed, 67 insertions(+), 19 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index ca25c93..b7d9cde 100644 +index ca25c93a1..b7d9cdee0 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -327,8 +327,10 @@ @@ -47,7 +47,7 @@ index ca25c93..b7d9cde 100644 defaults for units, they are not applied to PID 1 itself.</para></listitem> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 6af7c7a..25aea16 100644 +index 6af7c7ae5..25aea1655 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -559,7 +559,9 @@ @@ -62,7 +62,7 @@ index 6af7c7a..25aea16 100644 <table> <title>Limit directives and their equivalent with ulimit</title> diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 85d9797..c3461a0 100644 +index 85d979751..c3461a0a6 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -59,18 +59,18 @@ $1.SystemCallArchitectures, config_parse_warn_compat, DISABLED_CO @@ -93,7 +93,7 @@ index 85d9797..c3461a0 100644 $1.LimitRTPRIO, config_parse_limit, RLIMIT_RTPRIO, offsetof($1, exec_context.rlimit) $1.LimitRTTIME, config_parse_limit, RLIMIT_RTTIME, offsetof($1, exec_context.rlimit) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index b188ec9..dbb45b2 100644 +index b188ec99d..dbb45b20f 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1119,6 +1119,49 @@ int config_parse_limit(const char *unit, @@ -147,7 +147,7 @@ index b188ec9..dbb45b2 100644 int config_parse_sysv_priority(const char *unit, const char *filename, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index ce10d03..2d509d0 100644 +index ce10d03c3..2d509d0cb 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -56,6 +56,7 @@ int config_parse_exec_capabilities(const char *unit, const char *filename, unsig @@ -159,7 +159,7 @@ index ce10d03..2d509d0 100644 int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/core/main.c b/src/core/main.c -index 2aec40b..60ea36c 100644 +index 2aec40b0b..60ea36c3c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -655,18 +655,18 @@ static int parse_config_file(void) { diff --git a/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch b/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch index a0ce023..3abafdc 100644 --- a/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch +++ b/SOURCES/0356-core-accept-time-units-for-time-based-resource-limit.patch @@ -22,7 +22,7 @@ Related: #1351415 5 files changed, 231 insertions(+), 23 deletions(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 25aea16..cfdcc3d 100644 +index 25aea1655..cfdcc3d17 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -559,90 +559,133 @@ @@ -189,7 +189,7 @@ index 25aea16..cfdcc3d 100644 <citerefentry><refentrytitle>tmpfiles.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>, <citerefentry project='man-pages'><refentrytitle>exec</refentrytitle><manvolnum>3</manvolnum></citerefentry> diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index c3461a0..ce1397c 100644 +index c3461a0a6..ce1397c7e 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -58,7 +58,7 @@ $1.RestrictAddressFamilies, config_parse_address_families, 0, @@ -211,7 +211,7 @@ index c3461a0..ce1397c 100644 $1.ReadOnlyDirectories, config_parse_namespace_path_strv, 0, offsetof($1, exec_context.read_only_dirs) $1.InaccessibleDirectories, config_parse_namespace_path_strv, 0, offsetof($1, exec_context.inaccessible_dirs) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index dbb45b2..8afe9d7 100644 +index dbb45b20f..8afe9d7e8 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1162,6 +1162,107 @@ int config_parse_bytes_limit(const char *unit, @@ -323,7 +323,7 @@ index dbb45b2..8afe9d7 100644 int config_parse_sysv_priority(const char *unit, const char *filename, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 2d509d0..359794d 100644 +index 2d509d0cb..359794d0a 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -57,6 +57,8 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign @@ -336,7 +336,7 @@ index 2d509d0..359794d 100644 int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 5500983..d151737 100644 +index 550098332..d15173796 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -545,6 +545,66 @@ static void test_install_printf(void) { diff --git a/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch b/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch index 6ef4d42..c1a6131 100644 --- a/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch +++ b/SOURCES/0357-time-util-add-parse_time-which-is-like-parse_sec-but.patch @@ -22,7 +22,7 @@ Related: #1351415 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/src/shared/calendarspec.c b/src/shared/calendarspec.c -index 2fde3e1..abbf026 100644 +index 2fde3e107..abbf0261e 100644 --- a/src/shared/calendarspec.c +++ b/src/shared/calendarspec.c @@ -556,7 +556,7 @@ static int parse_date(const char **p, CalendarSpec *c) { @@ -44,7 +44,7 @@ index 2fde3e1..abbf026 100644 goto fail; diff --git a/src/shared/time-util.c b/src/shared/time-util.c -index 1c36c57..c001f52 100644 +index 1c36c577c..c001f52de 100644 --- a/src/shared/time-util.c +++ b/src/shared/time-util.c @@ -613,7 +613,8 @@ finish: @@ -129,7 +129,7 @@ index 1c36c57..c001f52 100644 static const struct { const char *suffix; diff --git a/src/shared/time-util.h b/src/shared/time-util.h -index fca8a4d..f278914 100644 +index fca8a4db9..f2789142f 100644 --- a/src/shared/time-util.h +++ b/src/shared/time-util.h @@ -99,6 +99,7 @@ void dual_timestamp_deserialize(const char *value, dual_timestamp *t); @@ -141,7 +141,7 @@ index fca8a4d..f278914 100644 bool ntp_synced(void); diff --git a/src/test/test-time.c b/src/test/test-time.c -index 3840fff..820e4aa 100644 +index 3840fff06..820e4aaee 100644 --- a/src/test/test-time.c +++ b/src/test/test-time.c @@ -57,6 +57,28 @@ static void test_parse_sec(void) { @@ -182,7 +182,7 @@ index 3840fff..820e4aa 100644 test_format_timespan(1); test_format_timespan(USEC_PER_MSEC); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index d151737..87c81cc 100644 +index d15173796..87c81ccd7 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -559,7 +559,7 @@ static void test_config_parse_rlimit(void) { diff --git a/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch b/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch index fafaafe..c941afe 100644 --- a/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch +++ b/SOURCES/0358-core-support-soft-hard-ranges-for-RLIMIT-options.patch @@ -32,7 +32,7 @@ Resolves: #1351415 6 files changed, 667 insertions(+), 120 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index b7d9cde..39d19bc 100644 +index b7d9cdee0..39d19bc71 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -326,13 +326,26 @@ @@ -70,7 +70,7 @@ index b7d9cde..39d19bc 100644 </varlistentry> </variablelist> diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index cfdcc3d..0cd469c 100644 +index cfdcc3d17..0cd469cd9 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -558,7 +558,10 @@ @@ -86,7 +86,7 @@ index cfdcc3d..0cd469c 100644 suffixes K (=1024), M (=1024*1024) and so on for G, T, P and E may be used for resource limits measured in bytes diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 8afe9d7..d307f1c 100644 +index 8afe9d7e8..d307f1c74 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1075,81 +1075,108 @@ int config_parse_bounding_set(const char *unit, @@ -406,7 +406,7 @@ index 8afe9d7..d307f1c 100644 int config_parse_sysv_priority(const char *unit, const char *filename, diff --git a/src/shared/util.c b/src/shared/util.c -index 036677e..f75ed9d 100644 +index 036677eb4..f75ed9dd4 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -93,6 +93,7 @@ @@ -902,7 +902,7 @@ index 036677e..f75ed9d 100644 + return c; +} diff --git a/src/shared/util.h b/src/shared/util.h -index a441e44..be04524 100644 +index a441e44ff..be04524cc 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -315,6 +315,7 @@ int undecchar(char c) _const_; @@ -931,7 +931,7 @@ index a441e44..be04524 100644 +int extract_first_word_and_warn(const char **p, char **ret, const char *separators, ExtractFlags flags, const char *unit, const char *filename, unsigned line, const char *rvalue); +int extract_many_words(const char **p, const char *separators, ExtractFlags flags, ...) _sentinel_; diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 87c81cc..931dfed 100644 +index 87c81ccd7..931dfeda8 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -554,11 +554,22 @@ static void test_config_parse_rlimit(void) { diff --git a/SOURCES/0359-core-fix-rlimit-parsing.patch b/SOURCES/0359-core-fix-rlimit-parsing.patch index 42fe56a..ddcb86a 100644 --- a/SOURCES/0359-core-fix-rlimit-parsing.patch +++ b/SOURCES/0359-core-fix-rlimit-parsing.patch @@ -16,7 +16,7 @@ Related: #1351415 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index d307f1c..2f6209e 100644 +index d307f1c74..2f6209e05 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1160,6 +1160,7 @@ static int parse_rlimit_range( @@ -41,7 +41,7 @@ index d307f1c..2f6209e 100644 if (!*rl) { *rl = new(struct rlimit, 1); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 931dfed..8acf071 100644 +index 931dfeda8..8acf071ff 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -570,6 +570,27 @@ static void test_config_parse_rlimit(void) { diff --git a/SOURCES/0360-core-dump-rlim_cur-too.patch b/SOURCES/0360-core-dump-rlim_cur-too.patch index e9a5db3..8b66922 100644 --- a/SOURCES/0360-core-dump-rlim_cur-too.patch +++ b/SOURCES/0360-core-dump-rlim_cur-too.patch @@ -10,7 +10,7 @@ Related: #1351415 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c -index 8172c8b..e9b4359 100644 +index 8172c8b44..e9b4359a7 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2254,8 +2254,8 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) { diff --git a/SOURCES/0361-install-fix-disable-via-unit-file-path.patch b/SOURCES/0361-install-fix-disable-via-unit-file-path.patch index ae0acdf..aa428cc 100644 --- a/SOURCES/0361-install-fix-disable-via-unit-file-path.patch +++ b/SOURCES/0361-install-fix-disable-via-unit-file-path.patch @@ -18,7 +18,7 @@ Resolves: #1348208 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 5288bb4..f190dbf 100644 +index 5288bb450..f190dbfab 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1910,10 +1910,12 @@ int unit_file_disable( diff --git a/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch b/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch index 0eb22d0..d8319fe 100644 --- a/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch +++ b/SOURCES/0362-manager-don-t-skip-sigchld-handler-for-main-and-cont.patch @@ -26,7 +26,7 @@ Resolves: #1342173 8 files changed, 90 insertions(+), 1 deletion(-) diff --git a/src/core/busname.c b/src/core/busname.c -index 43d7607..f626ba9 100644 +index 43d7607a3..f626ba96d 100644 --- a/src/core/busname.c +++ b/src/core/busname.c @@ -997,6 +997,14 @@ static const char* const busname_state_table[_BUSNAME_STATE_MAX] = { @@ -54,7 +54,7 @@ index 43d7607..f626ba9 100644 .bus_vtable = bus_busname_vtable, diff --git a/src/core/manager.c b/src/core/manager.c -index d168777..5da8365 100644 +index d168777d2..5da836593 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1760,7 +1760,10 @@ static void invoke_sigchld_event(Manager *m, Unit *u, siginfo_t *si) { @@ -70,7 +70,7 @@ index d168777..5da8365 100644 u->sigchldgen = iteration; } else diff --git a/src/core/mount.c b/src/core/mount.c -index fe967bc..3fbdb7d 100644 +index fe967bc03..3fbdb7daf 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1877,6 +1877,14 @@ static const char* const mount_state_table[_MOUNT_STATE_MAX] = { @@ -98,7 +98,7 @@ index fe967bc..3fbdb7d 100644 .bus_vtable = bus_mount_vtable, .bus_set_property = bus_mount_set_property, diff --git a/src/core/service.c b/src/core/service.c -index c76713b..babd3c5 100644 +index c76713b1c..babd3c52a 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -3068,6 +3068,22 @@ static const char* const service_state_table[_SERVICE_STATE_MAX] = { @@ -135,7 +135,7 @@ index c76713b..babd3c5 100644 .bus_interface = "org.freedesktop.systemd1.Service", diff --git a/src/core/socket.c b/src/core/socket.c -index bc677a2..771af0d 100644 +index bc677a20f..771af0d24 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2648,6 +2648,14 @@ static const char* const socket_state_table[_SOCKET_STATE_MAX] = { @@ -163,7 +163,7 @@ index bc677a2..771af0d 100644 .bus_vtable = bus_socket_vtable, .bus_set_property = bus_socket_set_property, diff --git a/src/core/swap.c b/src/core/swap.c -index 34a2c40..42f9959 100644 +index 34a2c406d..42f995990 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -1426,6 +1426,14 @@ static const char* const swap_state_table[_SWAP_STATE_MAX] = { @@ -191,7 +191,7 @@ index 34a2c40..42f9959 100644 .bus_vtable = bus_swap_vtable, .bus_set_property = bus_swap_set_property, diff --git a/src/core/unit.c b/src/core/unit.c -index d62135d..0e90d13 100644 +index d62135d87..0e90d130a 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3674,6 +3674,24 @@ int unit_setup_exec_runtime(Unit *u) { @@ -220,7 +220,7 @@ index d62135d..0e90d13 100644 [UNIT_ACTIVE] = "active", [UNIT_RELOADING] = "reloading", diff --git a/src/core/unit.h b/src/core/unit.h -index d936457..35287a5 100644 +index d93645777..35287a5b7 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -399,6 +399,12 @@ struct UnitVTable { diff --git a/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch b/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch index 5c97603..0719975 100644 --- a/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch +++ b/SOURCES/0363-units-increase-watchdog-timeout-to-3min-for-all-our-.patch @@ -25,7 +25,7 @@ Resolves: #1267707 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/units/systemd-hostnamed.service.in b/units/systemd-hostnamed.service.in -index cc88ecd..b7079e4 100644 +index cc88ecd0d..b7079e4a7 100644 --- a/units/systemd-hostnamed.service.in +++ b/units/systemd-hostnamed.service.in @@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed @@ -38,7 +38,7 @@ index cc88ecd..b7079e4 100644 PrivateDevices=yes PrivateNetwork=yes diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in -index 5534a49..60e8e9c 100644 +index 5534a49ed..60e8e9c85 100644 --- a/units/systemd-importd.service.in +++ b/units/systemd-importd.service.in @@ -14,7 +14,7 @@ ExecStart=@rootlibexecdir@/systemd-importd @@ -51,7 +51,7 @@ index 5534a49..60e8e9c 100644 ProtectSystem=full ProtectHome=yes diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 9d44622..8575912 100644 +index 9d4462283..8575912bb 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -22,7 +22,7 @@ RestartSec=0 @@ -64,7 +64,7 @@ index 9d44622..8575912 100644 # Increase the default a bit in order to allow many simultaneous # services being run since we keep one fd open per service. Also, when diff --git a/units/systemd-localed.service.in b/units/systemd-localed.service.in -index bfa0978..9b13f90 100644 +index bfa097844..9b13f901a 100644 --- a/units/systemd-localed.service.in +++ b/units/systemd-localed.service.in @@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed @@ -77,7 +77,7 @@ index bfa0978..9b13f90 100644 PrivateDevices=yes PrivateNetwork=yes diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in -index f087e99..ff04913 100644 +index f087e99ce..ff049134e 100644 --- a/units/systemd-logind.service.in +++ b/units/systemd-logind.service.in @@ -24,7 +24,7 @@ Restart=always @@ -90,7 +90,7 @@ index f087e99..ff04913 100644 # Increase the default a bit in order to allow many simultaneous # logins since we keep one fd open per session. diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in -index 15f34d9..35cde98 100644 +index 15f34d9db..35cde9869 100644 --- a/units/systemd-machined.service.in +++ b/units/systemd-machined.service.in @@ -16,7 +16,7 @@ After=machine.slice @@ -103,7 +103,7 @@ index 15f34d9..35cde98 100644 PrivateDevices=yes PrivateNetwork=yes diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index 5a91b8e..d3808c4 100644 +index 5a91b8e49..d3808c430 100644 --- a/units/systemd-networkd.service.in +++ b/units/systemd-networkd.service.in @@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-networkd @@ -116,7 +116,7 @@ index 5a91b8e..d3808c4 100644 [Install] WantedBy=multi-user.target diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.m4.in -index 98ae564..46864e6 100644 +index 98ae564af..46864e6a3 100644 --- a/units/systemd-resolved.service.m4.in +++ b/units/systemd-resolved.service.m4.in @@ -25,7 +25,7 @@ ExecStart=@rootlibexecdir@/systemd-resolved @@ -129,7 +129,7 @@ index 98ae564..46864e6 100644 [Install] WantedBy=multi-user.target diff --git a/units/systemd-timedated.service.in b/units/systemd-timedated.service.in -index fe5ccb4..0c9599d 100644 +index fe5ccb460..0c9599db2 100644 --- a/units/systemd-timedated.service.in +++ b/units/systemd-timedated.service.in @@ -14,7 +14,7 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated @@ -142,7 +142,7 @@ index fe5ccb4..0c9599d 100644 ProtectSystem=yes ProtectHome=yes diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in -index 39edafc..c7d1d2b 100644 +index 39edafc8d..c7d1d2b4f 100644 --- a/units/systemd-timesyncd.service.in +++ b/units/systemd-timesyncd.service.in @@ -27,7 +27,7 @@ PrivateTmp=yes diff --git a/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch b/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch index 4a0081b..6f8e005 100644 --- a/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch +++ b/SOURCES/0364-core-bump-net.unix.max_dgram_qlen-really-early-durin.patch @@ -14,7 +14,7 @@ Related: #1267707 2 files changed, 39 insertions(+) diff --git a/src/core/main.c b/src/core/main.c -index 60ea36c..c9d8ce4 100644 +index 60ea36c3c..c9d8ce4a4 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1198,6 +1198,7 @@ static int status_welcome(void) { @@ -75,7 +75,7 @@ index 60ea36c..c9d8ce4 100644 test_mtab(); test_usr(); diff --git a/src/shared/def.h b/src/shared/def.h -index a3d9fcf..76daf01 100644 +index a3d9fcf38..76daf012d 100644 --- a/src/shared/def.h +++ b/src/shared/def.h @@ -35,6 +35,9 @@ diff --git a/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch b/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch index bc8efb1..d7bb2a2 100644 --- a/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch +++ b/SOURCES/0365-core-fix-priority-ordering-in-notify-handling.patch @@ -26,7 +26,7 @@ Related: #1267707 1 file changed, 78 insertions(+), 80 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 5da8365..c502199 100644 +index 5da836593..c5021993e 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1635,9 +1635,33 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, char * diff --git a/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch b/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch index 96ae2f1..b33f4c9 100644 --- a/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch +++ b/SOURCES/0366-tests-fix-personality-tests-on-ppc64-and-aarch64.patch @@ -14,7 +14,7 @@ Resolves: #1361049 create mode 100644 test/exec-personality-ppc64.service diff --git a/src/shared/util.c b/src/shared/util.c -index f75ed9d..3030261 100644 +index f75ed9dd4..303026152 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -6986,6 +6986,22 @@ unsigned long personality_from_string(const char *p) { @@ -41,7 +41,7 @@ index f75ed9d..3030261 100644 /* personality(7) documents that 0xffffffffUL is used for diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 38522a1..5a02960 100644 +index 38522a168..5a02960e7 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -83,6 +83,12 @@ static void test_exec_personality(Manager *m) { @@ -59,7 +59,7 @@ index 38522a1..5a02960 100644 #endif diff --git a/test/exec-personality-aarch64.service b/test/exec-personality-aarch64.service new file mode 100644 -index 0000000..8511174 +index 000000000..851117441 --- /dev/null +++ b/test/exec-personality-aarch64.service @@ -0,0 +1,7 @@ @@ -72,7 +72,7 @@ index 0000000..8511174 +Personality=aarch64 diff --git a/test/exec-personality-ppc64.service b/test/exec-personality-ppc64.service new file mode 100644 -index 0000000..4432074 +index 000000000..4432074e6 --- /dev/null +++ b/test/exec-personality-ppc64.service @@ -0,0 +1,7 @@ diff --git a/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch b/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch index 2197d54..1eef618 100644 --- a/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch +++ b/SOURCES/0367-systemctl-consider-service-running-only-when-it-is-i.patch @@ -15,7 +15,7 @@ Resolves: #1362461 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 93b7a19..b7496c0 100644 +index 93b7a193b..b7496c006 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4339,7 +4339,7 @@ static int show_one( diff --git a/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch b/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch index 874819d..5af2559 100644 --- a/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch +++ b/SOURCES/0368-install-do-not-crash-when-processing-empty-masked-un.patch @@ -10,7 +10,7 @@ Related: #1159308 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/install.c b/src/shared/install.c -index f190dbf..f7f9866 100644 +index f190dbfab..f7f9866f4 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -996,7 +996,7 @@ static int unit_file_load( diff --git a/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch b/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch index 0cb195e..80cc166 100644 --- a/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch +++ b/SOURCES/0369-Revert-install-fix-disable-via-unit-file-path.patch @@ -11,7 +11,7 @@ Related: #1348208 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index f7f9866..9962508 100644 +index f7f9866f4..9962508b1 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1910,12 +1910,10 @@ int unit_file_disable( diff --git a/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch b/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch index 03a19ba..ab39230 100644 --- a/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch +++ b/SOURCES/0370-systemctl-allow-disable-on-the-unit-file-path-but-wa.patch @@ -34,7 +34,7 @@ Resolves: #1348208 1 file changed, 29 insertions(+) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index b7496c0..5899818 100644 +index b7496c006..58998185c 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5333,6 +5333,29 @@ static int mangle_names(char **original_names, char ***mangled_names) { diff --git a/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch b/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch index 193b35c..6b9fd5b 100644 --- a/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch +++ b/SOURCES/0371-tmpfiles-enforce-ordering-when-executing-lines.patch @@ -15,7 +15,7 @@ Resolves: #1365870 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 64c733a..bda89df 100644 +index 64c733aaa..bda89df5b 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -78,18 +78,18 @@ typedef enum ItemType { diff --git a/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch b/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch index ed25b0f..48ad612 100644 --- a/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch +++ b/SOURCES/0372-Introduce-bus_unit_check_load_state-helper.patch @@ -17,7 +17,7 @@ Related: #1256858 2 files changed, 19 insertions(+) diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c -index 49770bf..c3654db 100644 +index 49770bfda..c3654db9e 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -1083,3 +1083,20 @@ int bus_unit_set_properties( @@ -42,7 +42,7 @@ index 49770bf..c3654db 100644 + return sd_bus_error_set_errnof(error, u->load_error, "Unit is not loaded properly: %m."); +} diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h -index 57a5e19..4338496 100644 +index 57a5e1974..433849641 100644 --- a/src/core/dbus-unit.h +++ b/src/core/dbus-unit.h @@ -37,3 +37,5 @@ int bus_unit_method_reset_failed(sd_bus *bus, sd_bus_message *message, void *use diff --git a/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch b/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch index 3962654..5f2d376 100644 --- a/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch +++ b/SOURCES/0373-core-use-bus_unit_check_load_state-in-transaction_ad.patch @@ -12,7 +12,7 @@ Related: #1256858 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/core/transaction.c b/src/core/transaction.c -index aed64fa..57e9cb3 100644 +index aed64fa41..57e9cb3f8 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -26,6 +26,7 @@ @@ -59,7 +59,7 @@ index aed64fa..57e9cb3 100644 return sd_bus_error_setf(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, "Job type %s is not applicable for unit %s.", diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 5899818..e4b404a 100644 +index 58998185c..e4b404abc 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2617,6 +2617,11 @@ static int start_unit_one( diff --git a/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch b/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch index a0b2982..0b71cb2 100644 --- a/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch +++ b/SOURCES/0374-udev-path_id-correct-segmentation-fault-due-to-missi.patch @@ -17,7 +17,7 @@ Resolves: #1365556 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 8359e23..a3b019b 100644 +index 8359e236a..a3b019bfc 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -729,7 +729,7 @@ restart: diff --git a/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch b/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch index 8b12005..08241ef 100644 --- a/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch +++ b/SOURCES/0375-rules-load-sg-driver-also-when-scsi_target-appears-4.patch @@ -9,7 +9,7 @@ Resolves: #1322773 1 file changed, 1 insertion(+) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 9a48add..3335fe5 100644 +index 9a48adde1..3335fe507 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -11,6 +11,7 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="bridge", RUN+="/usr/lib/systemd/sys diff --git a/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch b/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch index d7e92ab..eb64481 100644 --- a/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch +++ b/SOURCES/0376-fix-gcc-warnings-about-uninitialized-variables.patch @@ -54,7 +54,7 @@ Related: #1318994 26 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/import/import-job.c b/src/import/import-job.c -index 5f9cfd3..d826f49 100644 +index 5f9cfd366..d826f493f 100644 --- a/src/import/import-job.c +++ b/src/import/import-job.c @@ -80,7 +80,7 @@ void import_job_curl_on_finished(CurlGlue *g, CURL *curl, CURLcode result) { @@ -67,7 +67,7 @@ index 5f9cfd3..d826f49 100644 if (!j || j->state == IMPORT_JOB_DONE || j->state == IMPORT_JOB_FAILED) diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c -index 576f7ca..d1f0ce3 100644 +index 576f7cae7..d1f0ce3da 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c @@ -736,7 +736,7 @@ static int request_handler_machine( @@ -80,7 +80,7 @@ index 576f7ca..d1f0ce3 100644 sd_id128_t mid, bid; _cleanup_free_ char *v = NULL; diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c -index 7e62954..64089da 100644 +index 7e6295435..64089da19 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -316,7 +316,7 @@ int process_data(RemoteSource *source) { @@ -93,7 +93,7 @@ index 7e62954..64089da 100644 assert(source->data_size == 0); diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index 9c515f9..4fac55c 100644 +index 9c515f9c8..4fac55cc9 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -353,7 +353,7 @@ static int remove_source(RemoteServer *s, int fd) { @@ -115,7 +115,7 @@ index 9c515f9..4fac55c 100644 fd2 = accept_connection("raw", fd, &addr, &hostname); if (fd2 < 0) diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index f170232..a9c40c6 100644 +index f17023284..a9c40c6d4 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -559,7 +559,7 @@ static const char *find_id(void *p, sd_id128_t id) { @@ -128,7 +128,7 @@ index f170232..a9c40c6 100644 int r; const char *s; diff --git a/src/journal/coredump.c b/src/journal/coredump.c -index f7ba019..59ccd46 100644 +index f7ba0191e..59ccd46bb 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -244,7 +244,7 @@ static int maybe_remove_external_coredump(const char *filename, off_t size) { @@ -150,7 +150,7 @@ index f7ba019..59ccd46 100644 /* Store the coredump itself in the journal */ diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index ef18497..2a93460 100644 +index ef1849787..2a93460d4 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -911,7 +911,7 @@ int journal_file_find_data_object_with_hash( @@ -181,7 +181,7 @@ index ef18497..2a93460 100644 r = decompress_blob(o->object.flags & OBJECT_COMPRESSION_MASK, o->data.payload, l, &from->compress_buffer, &from->compress_buffer_size, &rsize, 0); diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c -index 832c327..856d11e 100644 +index 832c327b3..856d11e4e 100644 --- a/src/journal/journal-vacuum.c +++ b/src/journal/journal-vacuum.c @@ -76,7 +76,7 @@ static void patch_realtime( @@ -194,7 +194,7 @@ index 832c327..856d11e 100644 /* The timestamp was determined by the file name, but let's * see if the file might actually be older than the file name diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index a38ce4b..6ba8847 100644 +index a38ce4b8f..6ba884779 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1644,7 +1644,7 @@ static int verify(sd_journal *j) { @@ -207,7 +207,7 @@ index a38ce4b..6ba8847 100644 #ifdef HAVE_GCRYPT if (!arg_verify_key && JOURNAL_HEADER_SEALED(f->header)) diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c -index 3996e77..b8caeb3 100644 +index 3996e778e..b8caeb3d4 100644 --- a/src/journal/test-journal-stream.c +++ b/src/journal/test-journal-stream.c @@ -42,7 +42,7 @@ static void verify_contents(sd_journal *j, unsigned skip) { @@ -220,7 +220,7 @@ index 3996e77..b8caeb3 100644 assert_se(sd_journal_get_cursor(j, &k) >= 0); printf("cursor: %s\n", k); diff --git a/src/libsystemd-network/lldp-tlv.c b/src/libsystemd-network/lldp-tlv.c -index e43d70d..e32783f 100644 +index e43d70d3c..e32783f3e 100644 --- a/src/libsystemd-network/lldp-tlv.c +++ b/src/libsystemd-network/lldp-tlv.c @@ -156,7 +156,7 @@ static inline int tlv_packet_read_internal(tlv_section *m, void **data) { @@ -260,7 +260,7 @@ index e43d70d..e32783f 100644 assert_return(m, -EINVAL); diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c -index 3f89f34..0f284eb 100644 +index 3f89f344d..0f284eb6a 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -776,7 +776,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message, @@ -273,7 +273,7 @@ index 3f89f34..0f284eb 100644 if (!existing_lease) { lease = new0(DHCPLease, 1); diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c -index 4f49b79..83e58a3 100644 +index 4f49b799e..83e58a3db 100644 --- a/src/libsystemd-network/sd-pppoe.c +++ b/src/libsystemd-network/sd-pppoe.c @@ -340,7 +340,7 @@ static int pppoe_timeout(sd_event_source *s, uint64_t usec, void *userdata); @@ -286,7 +286,7 @@ index 4f49b79..83e58a3 100644 assert(ppp); diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c -index f71749f..cc0677b 100644 +index f71749f72..cc0677bdf 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/sd-login/sd-login.c @@ -82,7 +82,7 @@ _public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) { @@ -299,7 +299,7 @@ index f71749f..cc0677b 100644 assert_return(fd >= 0, -EINVAL); diff --git a/src/network/networkctl.c b/src/network/networkctl.c -index aa83f32..778670b 100644 +index aa83f32f5..778670b73 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -964,7 +964,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) { @@ -312,7 +312,7 @@ index aa83f32..778670b 100644 r = safe_atollu(b, &x); diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c -index 74b0634..bc1a90d 100644 +index 74b063414..bc1a90db1 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -252,7 +252,7 @@ static int dns_transaction_open_tcp(DnsTransaction *t) { @@ -325,7 +325,7 @@ index 74b0634..bc1a90d 100644 /* Otherwise, try to talk to the owner of a * the IP address, in case this is a reverse diff --git a/src/resolve/test-dns-domain.c b/src/resolve/test-dns-domain.c -index ebc8d98..4963a9c 100644 +index ebc8d98fc..4963a9c6a 100644 --- a/src/resolve/test-dns-domain.c +++ b/src/resolve/test-dns-domain.c @@ -162,7 +162,7 @@ static void test_dns_name_single_label(void) { @@ -338,7 +338,7 @@ index ebc8d98..4963a9c 100644 assert_se(in_addr_from_string_auto(address, &familya, &a) >= 0); diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c -index 73907c6..20a69bd 100644 +index 73907c635..20a69bdbf 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -55,7 +55,7 @@ static const BaseFilesystem table[] = { @@ -351,7 +351,7 @@ index 73907c6..20a69bd 100644 fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); if (fd < 0) diff --git a/src/shared/capability.c b/src/shared/capability.c -index 915ceb9..2b963fd 100644 +index 915ceb9d9..2b963fde3 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -55,7 +55,7 @@ unsigned long cap_last_cap(void) { @@ -364,7 +364,7 @@ index 915ceb9..2b963fd 100644 if (valid) diff --git a/src/shared/copy.c b/src/shared/copy.c -index 0239a58..2a0cb28 100644 +index 0239a5806..2a0cb2808 100644 --- a/src/shared/copy.c +++ b/src/shared/copy.c @@ -360,7 +360,7 @@ int copy_file_fd(const char *from, int fdt, bool try_reflink) { @@ -395,7 +395,7 @@ index 0239a58..2a0cb28 100644 assert(fdf >= 0); assert(fdt >= 0); diff --git a/src/shared/install.c b/src/shared/install.c -index 9962508..61aaafe 100644 +index 9962508b1..61aaafe7b 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -2046,7 +2046,7 @@ UnitFileState unit_file_lookup_state( @@ -408,7 +408,7 @@ index 9962508..61aaafe 100644 assert(paths); assert(name); diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c -index 8c37411..a572be9 100644 +index 8c374116a..a572be94b 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -993,7 +993,7 @@ static int show_journal(FILE *f, @@ -421,7 +421,7 @@ index 8c37411..a572be9 100644 /* Check whether the cutoff line is too early */ diff --git a/src/shared/util.c b/src/shared/util.c -index 3030261..4c441a5 100644 +index 303026152..4c441a544 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3073,7 +3073,7 @@ int getttyname_malloc(int fd, char **ret) { @@ -443,7 +443,7 @@ index 3030261..4c441a5 100644 e = strv_env_get(env, *i+1); diff --git a/src/test/test-path.c b/src/test/test-path.c -index 4f9f5c1..a3295aa 100644 +index 4f9f5c134..a3295aa99 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -33,7 +33,7 @@ static int setup_test(Manager **m) { @@ -456,7 +456,7 @@ index 4f9f5c1..a3295aa 100644 assert_se(m); diff --git a/src/test/test-pty.c b/src/test/test-pty.c -index cab569a..67c125a 100644 +index cab569a9d..67c125a4c 100644 --- a/src/test/test-pty.c +++ b/src/test/test-pty.c @@ -97,7 +97,7 @@ static void run_parent(Pty *pty) { @@ -469,7 +469,7 @@ index cab569a..67c125a 100644 rcvsiz = 0; zero(rcvbuf); diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c -index 489593f..ad6a82e 100644 +index 489593f4f..ad6a82e50 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -474,7 +474,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config, diff --git a/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch b/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch index f2389ba..81075d0 100644 --- a/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch +++ b/SOURCES/0377-journalctl-rework-code-that-checks-whether-we-have-a.patch @@ -19,7 +19,7 @@ Related: #1318994 3 files changed, 119 insertions(+), 105 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 6ba8847..f60e641 100644 +index 6ba884779..f60e6415f 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1680,61 +1680,76 @@ static int verify(sd_journal *j) { @@ -187,7 +187,7 @@ index 6ba8847..f60e641 100644 return r; diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c -index e67e9ac..d18a02f 100644 +index e67e9acb6..d18a02f50 100644 --- a/src/shared/acl-util.c +++ b/src/shared/acl-util.c @@ -82,17 +82,18 @@ int calc_acl_mask_if_needed(acl_t *acl_p) { @@ -325,7 +325,7 @@ index e67e9ac..d18a02f 100644 int parse_acl(char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask) { diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h -index fdb9006..c8bcc26 100644 +index fdb90063f..c8bcc266d 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-util.h @@ -32,7 +32,7 @@ diff --git a/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch b/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch index 4aab7e3..c9ebbff 100644 --- a/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch +++ b/SOURCES/0378-journalctl-Improve-boot-ID-lookup.patch @@ -35,7 +35,7 @@ Related: #1318994 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index f60e641..c7a19f2 100644 +index f60e6415f..c7a19f236 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1166,11 +1166,10 @@ static int add_boot(sd_journal *j) { diff --git a/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch b/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch index 0e5da0f..88ca484 100644 --- a/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch +++ b/SOURCES/0379-journalctl-only-have-a-single-exit-path-from-main.patch @@ -13,7 +13,7 @@ Related: #1318994 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index c7a19f2..31da357 100644 +index c7a19f236..31da357c1 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -532,7 +532,7 @@ static int parse_argv(int argc, char *argv[]) { diff --git a/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch b/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch index 3e53a70..b59cb95 100644 --- a/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch +++ b/SOURCES/0380-journalctl-free-all-command-line-argument-objects.patch @@ -12,7 +12,7 @@ Related: #1318994 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 31da357..92ee3fb 100644 +index 31da357c1..92ee3fb27 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -39,7 +39,6 @@ diff --git a/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch b/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch index 32478bf..1b947c3 100644 --- a/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch +++ b/SOURCES/0381-journalctl-rename-boot_id_t-to-BootId.patch @@ -14,7 +14,7 @@ Related: #1318994 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 92ee3fb..e84dd4c 100644 +index 92ee3fb27..e84dd4c9d 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -128,12 +128,12 @@ static enum { diff --git a/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch b/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch index 864ec1e..2ffef78 100644 --- a/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch +++ b/SOURCES/0382-util-introduce-CMSG_FOREACH-macro-and-make-use-of-it.patch @@ -28,7 +28,7 @@ Related: #1318994 15 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index c502199..71dd70c 100644 +index c5021993e..71dd70c94 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1679,7 +1679,7 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t @@ -41,7 +41,7 @@ index c502199..71dd70c 100644 fd_array = (int*) CMSG_DATA(cmsg); diff --git a/src/core/namespace.c b/src/core/namespace.c -index ebd5fb3..00495c1 100644 +index ebd5fb334..00495c144 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -658,12 +658,11 @@ int setup_netns(int netns_storage_socket[2]) { @@ -59,7 +59,7 @@ index ebd5fb3..00495c1 100644 if (setns(netns, CLONE_NEWNET) < 0) { r = -errno; diff --git a/src/import/importd.c b/src/import/importd.c -index 9aaf991..a29630b 100644 +index 9aaf991f8..a29630b12 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -507,12 +507,8 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void @@ -78,7 +78,7 @@ index 9aaf991..a29630b 100644 cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) { diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 6a35ebb..1eb1394 100644 +index 6a35ebbde..1eb1394d1 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1176,7 +1176,7 @@ int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void @@ -91,7 +91,7 @@ index 6a35ebb..1eb1394 100644 if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS && diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c -index 5f90617..870850e 100644 +index 5f90617b9..870850ed3 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -1590,7 +1590,7 @@ static int client_receive_message_raw(sd_event_source *s, int fd, @@ -104,7 +104,7 @@ index 5f90617..870850e 100644 cmsg->cmsg_type == PACKET_AUXDATA && cmsg->cmsg_len == CMSG_LEN(sizeof(struct tpacket_auxdata))) { diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c -index 0f284eb..c9d0ace 100644 +index 0f284eb6a..c9d0ace72 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -903,7 +903,7 @@ static int server_receive_message(sd_event_source *s, int fd, @@ -117,7 +117,7 @@ index 0f284eb..c9d0ace 100644 cmsg->cmsg_type == IP_PKTINFO && cmsg->cmsg_len == CMSG_LEN(sizeof(struct in_pktinfo))) { diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c -index d29b98a..10ab714 100644 +index d29b98a26..10ab71431 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/sd-bus/bus-container.c @@ -222,7 +222,7 @@ int bus_container_connect_kernel(sd_bus *b) { @@ -130,7 +130,7 @@ index d29b98a..10ab714 100644 int *fds; unsigned n_fds; diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index a3c3a45..ab56ef4 100644 +index a3c3a45b4..ab56ef4f3 100644 --- a/src/libsystemd/sd-bus/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c @@ -503,7 +503,6 @@ static int bus_socket_read_auth(sd_bus *b) { @@ -192,7 +192,7 @@ index a3c3a45..ab56ef4 100644 r = bus_socket_read_message_need(bus, &need); if (r < 0) diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c -index 9276bbd..cc84253 100644 +index 9276bbdeb..cc84253f1 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -1444,7 +1444,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool @@ -205,7 +205,7 @@ index 9276bbd..cc84253 100644 cmsg->cmsg_type == SCM_CREDENTIALS && cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) { diff --git a/src/resolve/resolved-dns-stream.c b/src/resolve/resolved-dns-stream.c -index 4c0b557..7f47e72 100644 +index 4c0b557ba..7f47e7223 100644 --- a/src/resolve/resolved-dns-stream.c +++ b/src/resolve/resolved-dns-stream.c @@ -113,7 +113,8 @@ static int dns_stream_identify(DnsStream *s) { @@ -219,7 +219,7 @@ index 4c0b557..7f47e72 100644 if (cmsg->cmsg_level == IPPROTO_IPV6) { assert(s->peer.sa.sa_family == AF_INET6); diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c -index 7c253aa..173ab8a 100644 +index 7c253aa13..173ab8a14 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -920,7 +920,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { @@ -232,7 +232,7 @@ index 7c253aa..173ab8a 100644 if (cmsg->cmsg_level == IPPROTO_IPV6) { assert(p->family == AF_INET6); diff --git a/src/shared/macro.h b/src/shared/macro.h -index 9d857dc..7a57f4e 100644 +index 9d857dc8d..7a57f4e5b 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -471,4 +471,7 @@ static inline bool GID_IS_INVALID(gid_t gid) { @@ -244,7 +244,7 @@ index 9d857dc..7a57f4e 100644 + #include "log.h" diff --git a/src/shared/util.c b/src/shared/util.c -index 4c441a5..357fbfe 100644 +index 4c441a544..357fbfe7d 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -7887,7 +7887,7 @@ int openpt_in_namespace(pid_t pid, int flags) { @@ -274,7 +274,7 @@ index 4c441a5..357fbfe 100644 const char *p; char *r, *t; diff --git a/src/shared/util.h b/src/shared/util.h -index be04524..12afcc3 100644 +index be04524cc..12afcc342 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -1082,6 +1082,8 @@ void sigkill_wait(pid_t *pid); @@ -287,7 +287,7 @@ index be04524..12afcc3 100644 typedef enum ExtractFlags { diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c -index 73ac7ee..5cc1968 100644 +index 73ac7eecb..5cc196820 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -539,7 +539,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re diff --git a/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch b/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch index 1811890..c7941a4 100644 --- a/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch +++ b/SOURCES/0383-journald-don-t-employ-inner-loop-for-reading-from-in.patch @@ -19,7 +19,7 @@ Cherry-picked from: a315ac4e076c4ce7ce3e5c95792cf916d5e918c5 1 file changed, 100 insertions(+), 104 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 1eb1394..275224d 100644 +index 1eb1394d1..275224dc9 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1103,6 +1103,42 @@ finish: diff --git a/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch b/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch index c41559a..4739407 100644 --- a/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch +++ b/SOURCES/0384-journald-fix-count-of-object-meta-fields.patch @@ -15,7 +15,7 @@ Related: #1318994 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h -index c96877c..b1263a7 100644 +index c96877c50..b1263a758 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -148,7 +148,7 @@ typedef struct Server { diff --git a/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch b/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch index 30d010b..878e42a 100644 --- a/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch +++ b/SOURCES/0385-journal-cat-return-a-correct-error-not-1.patch @@ -10,7 +10,7 @@ Related: #1318994 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/cat.c b/src/journal/cat.c -index 79706b6..ed467b0 100644 +index 79706b692..ed467b078 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -96,7 +96,7 @@ static int parse_argv(int argc, char *argv[]) { diff --git a/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch b/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch index ec754dc..5566602 100644 --- a/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch +++ b/SOURCES/0386-journalctl-introduce-short-options-for-since-and-unt.patch @@ -13,7 +13,7 @@ Related: #1318994 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/man/journalctl.xml b/man/journalctl.xml -index 0981fba..dedcf19 100644 +index 0981fba72..dedcf1925 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -528,7 +528,9 @@ @@ -27,7 +27,7 @@ index 0981fba..dedcf19 100644 <listitem><para>Start showing entries on or newer than the diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index e84dd4c..ba9ae05 100644 +index e84dd4c9d..ba9ae05f7 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -274,8 +274,8 @@ static void help(void) { diff --git a/SOURCES/0387-journal-s-Envalid-Invalid.patch b/SOURCES/0387-journal-s-Envalid-Invalid.patch index f1cae03..2e9ab6f 100644 --- a/SOURCES/0387-journal-s-Envalid-Invalid.patch +++ b/SOURCES/0387-journal-s-Envalid-Invalid.patch @@ -10,7 +10,7 @@ Related: #1318994 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index 8a66ac7..250d4c7 100644 +index 8a66ac7f0..250d4c758 100644 --- a/src/journal/journal-verify.c +++ b/src/journal/journal-verify.c @@ -899,7 +899,7 @@ int journal_file_verify( diff --git a/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch b/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch index fefb1b5..98ad607 100644 --- a/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch +++ b/SOURCES/0388-journald-dispatch-SIGTERM-SIGINT-with-a-low-priority.patch @@ -15,7 +15,7 @@ Related: #1318994 1 file changed, 12 insertions(+) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 275224d..2b7ecd0 100644 +index 275224dc9..2b7ecd09a 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1284,10 +1284,22 @@ static int setup_signals(Server *s) { diff --git a/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch b/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch index 2dd758d..f47c9ea 100644 --- a/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch +++ b/SOURCES/0389-lz4-fix-size-check-which-had-no-chance-of-working-on.patch @@ -11,7 +11,7 @@ Related: #1318994 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/compress.c b/src/journal/compress.c -index c9a3399..4fb09f5 100644 +index c9a3399cc..4fb09f596 100644 --- a/src/journal/compress.c +++ b/src/journal/compress.c @@ -190,7 +190,7 @@ int decompress_blob_lz4(const void *src, uint64_t src_size, diff --git a/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch b/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch index bbdc47e..fb2f8b2 100644 --- a/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch +++ b/SOURCES/0390-journal-normalize-priority-of-logging-sources.patch @@ -27,7 +27,7 @@ Related: #1318994 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c -index 851625d..2c9cf6e 100644 +index 851625de0..2c9cf6e7a 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -457,5 +457,9 @@ int server_open_native_socket(Server*s) { @@ -41,7 +41,7 @@ index 851625d..2c9cf6e 100644 return 0; } diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c -index 15a554c..b860714 100644 +index 15a554c34..b8607144b 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -448,7 +448,7 @@ int server_open_stdout_socket(Server *s) { @@ -54,7 +54,7 @@ index 15a554c..b860714 100644 return log_error_errno(r, "Failed to adjust priority of stdout server event source: %m"); diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index 4e118aa..8602b4a 100644 +index 4e118aabc..8602b4a95 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -421,6 +421,10 @@ int server_open_syslog_socket(Server *s) { diff --git a/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch b/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch index c381989..b49140e 100644 --- a/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch +++ b/SOURCES/0391-Fix-miscalculated-buffer-size-and-uses-of-size-unlim.patch @@ -15,7 +15,7 @@ Related: #1318994 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index 8602b4a..b499a0d 100644 +index 8602b4a95..b499a0d38 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -317,7 +317,7 @@ void server_process_syslog_message( diff --git a/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch b/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch index d1c3c5b..fd367cb 100644 --- a/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch +++ b/SOURCES/0392-journal-Drop-monotonicity-check-when-appending-to-jo.patch @@ -18,7 +18,7 @@ Related: #1318994 1 file changed, 4 deletions(-) diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 2a93460..8034b77 100644 +index 2a93460d4..8034b771d 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -1419,10 +1419,6 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st diff --git a/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch b/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch index 93b9348..571f3f5 100644 --- a/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch +++ b/SOURCES/0393-journalctl-unify-how-we-free-boot-id-lists-a-bit.patch @@ -13,7 +13,7 @@ Related: #1318994 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index ba9ae05..5864ff5 100644 +index ba9ae05f7..5864ff50a 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -932,6 +932,15 @@ static int add_matches(sd_journal *j, char **args) { diff --git a/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch b/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch index 1aa83fb..eadde64 100644 --- a/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch +++ b/SOURCES/0394-journalctl-don-t-trust-the-per-field-entry-tables-wh.patch @@ -52,7 +52,7 @@ Related: #1318994 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 5864ff5..723854a 100644 +index 5864ff50a..723854a2e 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -941,18 +941,18 @@ static void boot_id_free_all(BootId *l) { diff --git a/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch b/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch index cca08e1..9566cfd 100644 --- a/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch +++ b/SOURCES/0395-units-remove-udev-control-socket-when-systemd-stops-.patch @@ -23,7 +23,7 @@ Resolves: #1370133 1 file changed, 1 insertion(+) diff --git a/units/systemd-udevd-control.socket b/units/systemd-udevd-control.socket -index 8330a1c..46f704e 100644 +index 8330a1c03..46f704ed7 100644 --- a/units/systemd-udevd-control.socket +++ b/units/systemd-udevd-control.socket @@ -17,3 +17,4 @@ Service=systemd-udevd.service diff --git a/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch b/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch index 75055f3..df6a335 100644 --- a/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch +++ b/SOURCES/0396-logind-don-t-assert-if-the-slice-is-missing.patch @@ -13,7 +13,7 @@ Resolves: #1371437 1 file changed, 1 deletion(-) diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index 59f5a7a..746e50a 100644 +index 59f5a7ad5..746e50aa5 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -507,7 +507,6 @@ static int session_start_scope(Session *s) { diff --git a/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch b/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch index 48f6860..57d622c 100644 --- a/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch +++ b/SOURCES/0397-core-enable-transient-unit-support-for-slice-units.patch @@ -11,7 +11,7 @@ Resolves: #1370299 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 9eef290..8d3758a 100644 +index 9eef290ca..8d3758ac7 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -633,7 +633,18 @@ static int transient_unit_from_message( @@ -35,7 +35,7 @@ index 9eef290..8d3758a 100644 return sd_bus_error_setf(error, BUS_ERROR_UNIT_EXISTS, "Unit %s already exists.", name); diff --git a/src/core/slice.c b/src/core/slice.c -index 61ff9d3..9154558 100644 +index 61ff9d331..9154558b7 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -272,6 +272,7 @@ const UnitVTable slice_vtable = { diff --git a/SOURCES/0398-sd-bus-bump-message-queue-size.patch b/SOURCES/0398-sd-bus-bump-message-queue-size.patch index 12ac5b5..b1fbb26 100644 --- a/SOURCES/0398-sd-bus-bump-message-queue-size.patch +++ b/SOURCES/0398-sd-bus-bump-message-queue-size.patch @@ -15,7 +15,7 @@ Resolves: #1371205 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h -index 071b3da..6a10686 100644 +index 071b3da79..6a106862e 100644 --- a/src/libsystemd/sd-bus/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.h @@ -326,8 +326,8 @@ struct sd_bus { diff --git a/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch b/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch index fc0079d..1c9894b 100644 --- a/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch +++ b/SOURCES/0399-install-fix-disable-when-etc-systemd-system-is-a-sym.patch @@ -10,7 +10,7 @@ Resolves: #1285996 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 61aaafe..ab86cd1 100644 +index 61aaafe7b..ab86cd145 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -476,7 +476,7 @@ static int remove_marked_symlinks( diff --git a/SOURCES/0400-rules-add-NVMe-rules-3136.patch b/SOURCES/0400-rules-add-NVMe-rules-3136.patch index ba874de..5c4290f 100644 --- a/SOURCES/0400-rules-add-NVMe-rules-3136.patch +++ b/SOURCES/0400-rules-add-NVMe-rules-3136.patch @@ -20,7 +20,7 @@ Resolves: #1274651 1 file changed, 4 insertions(+) diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index 71ab974..cc01acb 100644 +index 71ab97484..cc01acb16 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -22,6 +22,10 @@ TEST=="whole_disk", GOTO="persistent_storage_end" diff --git a/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch b/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch index a6d5133..ae49974 100644 --- a/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch +++ b/SOURCES/0401-rules-introduce-disk-by-id-model_serial-symlinks-for.patch @@ -18,7 +18,7 @@ Related: #1274651 1 file changed, 6 insertions(+) diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index cc01acb..74f8f21 100644 +index cc01acb16..74f8f21f3 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -26,6 +26,12 @@ ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" diff --git a/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch b/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch index 504b0e8..8e48cbf 100644 --- a/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch +++ b/SOURCES/0402-rules-fix-for-possible-whitespace-in-the-model-attri.patch @@ -15,7 +15,7 @@ Related: #1274651 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules -index 74f8f21..06e3329 100644 +index 74f8f21f3..06e3329cc 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -27,10 +27,10 @@ KERNEL=="nvme*[0-9]n*[0-9]", ATTR{wwid}=="?*", SYMLINK+="disk/by-id/nvme-$attr{w diff --git a/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch b/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch index 95a1cef..5d8b6a2 100644 --- a/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch +++ b/SOURCES/0403-systemctl-pid1-do-not-warn-about-missing-install-inf.patch @@ -24,7 +24,7 @@ Resolves: #1373950 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml -index 2d0678d..bb21f3a 100644 +index 2d0678d18..bb21f3a88 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -1012,22 +1012,22 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service @@ -64,7 +64,7 @@ index 2d0678d..bb21f3a 100644 </listitem> </varlistentry> diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index e4b404a..e854508 100644 +index e4b404abc..e854508d9 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5367,6 +5367,7 @@ static int enable_unit(sd_bus *bus, char **args) { diff --git a/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch b/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch index f3c6446..c701661 100644 --- a/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch +++ b/SOURCES/0404-systemctl-core-ignore-masked-units-in-preset-all.patch @@ -27,7 +27,7 @@ Related: #1375097 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 8d3758a..c2067c0 100644 +index 8d3758ac7..c2067c099 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1598,11 +1598,13 @@ static int reply_unit_file_changes_and_free( @@ -50,7 +50,7 @@ index 8d3758a..c2067c0 100644 r = sd_bus_message_new_method_return(message, &reply); if (r < 0) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 9d70798..75d0370 100644 +index 9d70798cd..75d03708e 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1893,11 +1893,17 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, Un @@ -74,7 +74,7 @@ index 9d70798..75d0370 100644 return r; } diff --git a/src/shared/install.c b/src/shared/install.c -index ab86cd1..62da52d 100644 +index ab86cd145..62da52d3b 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -2402,6 +2402,9 @@ int unit_file_preset_all( @@ -96,7 +96,7 @@ index ab86cd1..62da52d 100644 DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType); diff --git a/src/shared/install.h b/src/shared/install.h -index 87a40b6..f0e3666 100644 +index 87a40b67c..f0e36661b 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -60,10 +60,15 @@ typedef enum UnitFilePresetMode { @@ -116,7 +116,7 @@ index 87a40b6..f0e3666 100644 UnitFileChangeType type; char *path; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index e4b404a..a688d69 100644 +index e4b404abc..a688d6905 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1944,12 +1944,20 @@ static void dump_unit_file_changes(const UnitFileChange *changes, unsigned n_cha diff --git a/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch b/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch index abdb752..021edcd 100644 --- a/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch +++ b/SOURCES/0405-shared-install-handle-dangling-aliases-as-an-explici.patch @@ -21,7 +21,7 @@ Resolves: #1375097 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index 75d0370..d357760 100644 +index 75d03708e..d35776087 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1897,6 +1897,8 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, Un @@ -34,7 +34,7 @@ index 75d0370..d357760 100644 log_notice("Manager reported unknown change type \"%s\" for %s.", type, path); } diff --git a/src/shared/install.c b/src/shared/install.c -index 62da52d..b0a29dd 100644 +index 62da52d3b..b0a29ddd7 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1253,12 +1253,15 @@ static int install_info_traverse( @@ -86,7 +86,7 @@ index 62da52d..b0a29dd 100644 DEFINE_STRING_TABLE_LOOKUP(unit_file_change_type, UnitFileChangeType); diff --git a/src/shared/install.h b/src/shared/install.h -index f0e3666..7e40445 100644 +index f0e36661b..7e40445d3 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -61,6 +61,7 @@ typedef enum UnitFileChangeType { @@ -98,7 +98,7 @@ index f0e3666..7e40445 100644 _UNIT_FILE_CHANGE_TYPE_INVALID = -1 } UnitFileChangeType; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index a688d69..39f0150 100644 +index a688d6905..39f0150e5 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1955,6 +1955,9 @@ static void dump_unit_file_changes(const UnitFileChange *changes, unsigned n_cha diff --git a/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch b/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch index 025a8ca..6d099d4 100644 --- a/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch +++ b/SOURCES/0406-shared-install-ignore-unit-symlinks-when-doing-prese.patch @@ -47,7 +47,7 @@ Related: #1375097 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index b0a29dd..f01a212 100644 +index b0a29ddd7..f01a21262 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -2270,12 +2270,20 @@ static int preset_prepare_one( diff --git a/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch b/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch index a9e060c..3346db0 100644 --- a/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch +++ b/SOURCES/0407-40-redhat.rules-don-t-hoplug-memory-on-s390x.patch @@ -9,7 +9,7 @@ Resolves: #1370161 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 3335fe5..4c56950 100644 +index 3335fe507..4c56950da 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -4,7 +4,7 @@ diff --git a/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch b/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch index 570e7e5..3ac0db2 100644 --- a/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch +++ b/SOURCES/0408-If-the-notification-message-length-is-0-ignore-the-m.patch @@ -15,7 +15,7 @@ Resolves: #1380175 1 file changed, 4 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c -index 71dd70c..689b266 100644 +index 71dd70c94..689b26615 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1678,6 +1678,10 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t diff --git a/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch b/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch index ef419ce..43ade4a 100644 --- a/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch +++ b/SOURCES/0409-systemctl-suppress-errors-with-show-for-nonexistent-.patch @@ -26,7 +26,7 @@ Resolves: #1380259 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 0644784..a578897 100644 +index 0644784a5..a578897d9 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -4272,12 +4272,14 @@ static int show_one( diff --git a/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch b/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch index 91508f2..2bcd11b 100644 --- a/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch +++ b/SOURCES/0410-40-redhat.rules-disable-auto-online-of-hot-plugged-m.patch @@ -10,7 +10,7 @@ Related: #1375603 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 4c56950..0164dc9 100644 +index 4c56950da..0164dc921 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -4,7 +4,7 @@ diff --git a/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch b/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch index fae1ff4..c9eca03 100644 --- a/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch +++ b/SOURCES/0411-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch @@ -16,7 +16,7 @@ Resolves: #1380259 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 689b266..ed81059 100644 +index 689b26615..ed8105955 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1673,10 +1673,14 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t diff --git a/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch b/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch index 6c592ed..6fb6d68 100644 --- a/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch +++ b/SOURCES/0412-pid1-process-zero-length-notification-messages-again.patch @@ -19,7 +19,7 @@ Resolves: #1380259 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index ed81059..0376c4d 100644 +index ed8105955..0376c4d4b 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1614,13 +1614,12 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui diff --git a/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch b/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch index 8e4c381..63d5797 100644 --- a/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch +++ b/SOURCES/0413-pid1-more-informative-error-message-for-ignored-noti.patch @@ -17,7 +17,7 @@ Resolves: #1380259 1 file changed, 8 insertions(+) diff --git a/src/core/manager.c b/src/core/manager.c -index 0376c4d..27f032b 100644 +index 0376c4d4b..27f032b9d 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1631,6 +1631,14 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const diff --git a/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch b/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch index 5bee81c..ed6eda4 100644 --- a/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch +++ b/SOURCES/0414-manager-219-needs-u-id-in-log_unit_debug.patch @@ -10,7 +10,7 @@ Related: #1380259 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 27f032b..6d045fd 100644 +index 27f032b9d..6d045fdf3 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1637,7 +1637,7 @@ static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const diff --git a/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch b/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch index bc15271..f40e585 100644 --- a/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch +++ b/SOURCES/0415-virt-add-possibility-to-skip-the-check-for-chroot.patch @@ -12,7 +12,7 @@ Resolves: #1379852 3 files changed, 15 insertions(+) diff --git a/src/shared/env-util.c b/src/shared/env-util.c -index 038246d..e8da4c9 100644 +index 038246d21..e8da4c978 100644 --- a/src/shared/env-util.c +++ b/src/shared/env-util.c @@ -449,3 +449,13 @@ char **strv_env_clean_with_callback(char **e, void (*invalid_callback)(const cha @@ -30,7 +30,7 @@ index 038246d..e8da4c9 100644 + return parse_boolean(e); +} diff --git a/src/shared/env-util.h b/src/shared/env-util.h -index 618441a..252d87b 100644 +index 618441a65..252d87be1 100644 --- a/src/shared/env-util.h +++ b/src/shared/env-util.h @@ -45,3 +45,5 @@ char **strv_env_unset_many(char **l, ...) _sentinel_; @@ -40,7 +40,7 @@ index 618441a..252d87b 100644 + +int getenv_bool(const char *p); diff --git a/src/shared/util.c b/src/shared/util.c -index 357fbfe..eab5ab8 100644 +index 357fbfe7d..eab5ab816 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3776,6 +3776,9 @@ int files_same(const char *filea, const char *fileb) { diff --git a/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch b/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch index fe342de..2335a3e 100644 --- a/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch +++ b/SOURCES/0416-load-fragment-fix-parsing-values-in-bytes-and-preven.patch @@ -22,7 +22,7 @@ Resolves: #1396277 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 2f6209e..83b6e7e 100644 +index 2f6209e05..83b6e7efc 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1105,7 +1105,7 @@ static int rlim_parse_size(const char *val, rlim_t *res) { @@ -35,7 +35,7 @@ index 2f6209e..83b6e7e 100644 if (r == 0) *res = (rlim_t) u; diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 8acf071..0384305 100644 +index 8acf071ff..038430505 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -554,6 +554,10 @@ static void test_config_parse_rlimit(void) { diff --git a/SOURCES/0417-core-fix-assertion-check.patch b/SOURCES/0417-core-fix-assertion-check.patch index 7f42948..c5e5b29 100644 --- a/SOURCES/0417-core-fix-assertion-check.patch +++ b/SOURCES/0417-core-fix-assertion-check.patch @@ -12,7 +12,7 @@ Resolves: #1396312 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/timer.c b/src/core/timer.c -index 972dd73..f318dc6 100644 +index 972dd73df..f318dc6f4 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -321,7 +321,7 @@ static void add_random(Timer *t, usec_t *v) { diff --git a/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch b/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch index 304755b..dea3e05 100644 --- a/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch +++ b/SOURCES/0418-tmp.mount.hm4-After-swap.target-3087.patch @@ -11,7 +11,7 @@ Resolves: #1298355 1 file changed, 1 insertion(+) diff --git a/units/tmp.mount b/units/tmp.mount -index af0cf4a..8c53a87 100644 +index af0cf4a55..8c53a8705 100644 --- a/units/tmp.mount +++ b/units/tmp.mount @@ -13,6 +13,7 @@ ConditionPathIsSymbolicLink=!/tmp diff --git a/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch b/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch index 29c733b..0d0625e 100644 --- a/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch +++ b/SOURCES/0419-make-sure-all-swap-units-are-ordered-before-the-swap.patch @@ -29,7 +29,7 @@ Resolves: #1298355 1 file changed, 8 insertions(+) diff --git a/src/core/swap.c b/src/core/swap.c -index 42f9959..984be2d 100644 +index 42f995990..984be2d9a 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -210,6 +210,8 @@ static int swap_add_device_links(Swap *s) { diff --git a/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch b/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch index 83cd46d..05180ad 100644 --- a/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch +++ b/SOURCES/0420-Recognise-Lustre-as-a-remote-file-system-4530.patch @@ -12,7 +12,7 @@ Resolves: #1390542 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/shared/util.c b/src/shared/util.c -index eab5ab8..66729f7 100644 +index eab5ab816..66729f70e 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1924,7 +1924,11 @@ bool fstype_is_network(const char *fstype) { diff --git a/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch b/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch index 2c52dc8..8cb9e11 100644 --- a/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch +++ b/SOURCES/0421-unit-don-t-add-Requires-for-tmp.mount.patch @@ -10,7 +10,7 @@ Resolves: #1372249 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 0e90d13..a7d6d2f 100644 +index 0e90d130a..a7d6d2f45 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1155,7 +1155,7 @@ static int unit_add_mount_dependencies(Unit *u) { diff --git a/SOURCES/0422-core-return-0-from-device_serialize.patch b/SOURCES/0422-core-return-0-from-device_serialize.patch index 15aa10a..a6cc1f5 100644 --- a/SOURCES/0422-core-return-0-from-device_serialize.patch +++ b/SOURCES/0422-core-return-0-from-device_serialize.patch @@ -18,7 +18,7 @@ Resolves: #1403249 1 file changed, 2 insertions(+) diff --git a/src/core/device.c b/src/core/device.c -index bdc8466..befbae8 100644 +index bdc8466ab..befbae83f 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -168,6 +168,8 @@ static int device_serialize(Unit *u, FILE *f, FDSet *fds) { diff --git a/SOURCES/0423-mtd_probe-include-stdint.patch b/SOURCES/0423-mtd_probe-include-stdint.patch index a4938d0..a7b5b43 100644 --- a/SOURCES/0423-mtd_probe-include-stdint.patch +++ b/SOURCES/0423-mtd_probe-include-stdint.patch @@ -10,7 +10,7 @@ Resolves: #1404251 1 file changed, 1 insertion(+) diff --git a/src/udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h -index d99be9a..cead374 100644 +index d99be9add..cead37402 100644 --- a/src/udev/mtd_probe/mtd_probe.h +++ b/src/udev/mtd_probe/mtd_probe.h @@ -20,6 +20,7 @@ diff --git a/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch b/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch index dd6503e..9cfda58 100644 --- a/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch +++ b/SOURCES/0424-tests-fix-failure-of-test-execute-if-dev-mem-is-not-.patch @@ -16,7 +16,7 @@ Resolves: #1410056 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/exec-privatedevices-no.service b/test/exec-privatedevices-no.service -index cf4f275..af1daf7 100644 +index cf4f275fb..af1daf78f 100644 --- a/test/exec-privatedevices-no.service +++ b/test/exec-privatedevices-no.service @@ -2,6 +2,6 @@ @@ -28,7 +28,7 @@ index cf4f275..af1daf7 100644 Type=oneshot PrivateDevices=no diff --git a/test/exec-privatedevices-yes.service b/test/exec-privatedevices-yes.service -index 85b3f4f..384a7b0 100644 +index 85b3f4f98..384a7b01a 100644 --- a/test/exec-privatedevices-yes.service +++ b/test/exec-privatedevices-yes.service @@ -2,6 +2,6 @@ diff --git a/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch b/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch index c5c75e1..eecd2fd 100644 --- a/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch +++ b/SOURCES/0425-sd-journal-properly-export-has_-persistent-runtime-_.patch @@ -10,7 +10,7 @@ Resolves: #1409527 1 file changed, 6 insertions(+) diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4 -index 76a8c92..b1c2b43 100644 +index 76a8c921c..b1c2b43dd 100644 --- a/src/libsystemd/libsystemd.sym.m4 +++ b/src/libsystemd/libsystemd.sym.m4 @@ -163,6 +163,12 @@ global: diff --git a/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch b/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch index 5469980..ace4a1f 100644 --- a/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch +++ b/SOURCES/0426-core-add-possibility-to-set-action-for-ctrl-alt-del-.patch @@ -19,13 +19,14 @@ Resolves: #1353028 5 files changed, 68 insertions(+), 14 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index 39d19bc..236c20d 100644 +index 39d19bc71..236c20d5f 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml -@@ -102,6 +102,17 @@ +@@ -101,6 +101,17 @@ + arguments.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>CtrlAltDelBurstAction=</varname></term> + + <listitem><para>Defines what action will be performed @@ -36,12 +37,11 @@ index 39d19bc..236c20d 100644 + </para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>CPUAffinity=</varname></term> - <listitem><para>Configures the initial CPU affinity for the diff --git a/src/core/main.c b/src/core/main.c -index c9d8ce4..6ac9c9d 100644 +index c9d8ce4a4..6ac9c9d44 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -115,6 +115,7 @@ static FILE* arg_serialization = NULL; @@ -78,7 +78,7 @@ index c9d8ce4..6ac9c9d 100644 manager_set_default_rlimits(m, arg_default_rlimit); manager_environment_add(m, NULL, arg_default_environment); diff --git a/src/core/manager.c b/src/core/manager.c -index 6d045fd..9048dde 100644 +index 6d045fdf3..9048dde96 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1859,6 +1859,35 @@ static int manager_start_target(Manager *m, const char *name, JobMode mode) { @@ -151,7 +151,7 @@ index 6d045fd..9048dde 100644 + +DEFINE_STRING_TABLE_LOOKUP(cad_burst_action, CADBurstAction); diff --git a/src/core/manager.h b/src/core/manager.h -index 3e855db..42be1fc 100644 +index 3e855db46..42be1fc43 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -64,6 +64,14 @@ typedef enum ManagerExitCode { @@ -188,7 +188,7 @@ index 3e855db..42be1fc 100644 +const char *cad_burst_action_to_string(CADBurstAction a) _const_; +CADBurstAction cad_burst_action_from_string(const char *s) _pure_; diff --git a/src/core/system.conf b/src/core/system.conf -index 2316090..a11f599 100644 +index 231609033..a11f59903 100644 --- a/src/core/system.conf +++ b/src/core/system.conf @@ -20,6 +20,7 @@ diff --git a/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch b/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch index 402b175..89b5d7c 100644 --- a/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch +++ b/SOURCES/0427-failure-action-generalize-failure-action-to-emergenc.patch @@ -26,7 +26,7 @@ Resolves: #1353028 rename src/core/{failure-action.h => emergency-action.h} (58%) diff --git a/Makefile.am b/Makefile.am -index 3848338..b347aed 100644 +index 3848338a2..b347aed7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1182,8 +1182,8 @@ libsystemd_core_la_SOURCES = \ @@ -41,7 +41,7 @@ index 3848338..b347aed 100644 nodist_libsystemd_core_la_SOURCES = \ src/core/load-fragment-gperf.c \ diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c -index 6d4713b..325ed13 100644 +index 6d4713bab..325ed13f5 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -34,7 +34,7 @@ static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType @@ -66,7 +66,7 @@ index 6d4713b..325ed13 100644 SD_BUS_PROPERTY("RootDirectoryStartOnly", "b", bus_property_get_bool, offsetof(Service, root_directory_start_only), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RemainAfterExit", "b", bus_property_get_bool, offsetof(Service, remain_after_exit), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c -index c3654db..89b00e9 100644 +index c3654db9e..89b00e94c 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -33,7 +33,7 @@ @@ -91,7 +91,7 @@ diff --git a/src/core/failure-action.c b/src/core/emergency-action.c similarity index 63% rename from src/core/failure-action.c rename to src/core/emergency-action.c -index ce522a4..f07b125 100644 +index ce522a4e4..f07b1257a 100644 --- a/src/core/failure-action.c +++ b/src/core/emergency-action.c @@ -27,44 +27,45 @@ @@ -237,7 +237,7 @@ diff --git a/src/core/failure-action.h b/src/core/emergency-action.h similarity index 58% rename from src/core/failure-action.h rename to src/core/emergency-action.h -index 1af4dd9..d3ac0f3 100644 +index 1af4dd987..d3ac0f31c 100644 --- a/src/core/failure-action.h +++ b/src/core/emergency-action.h @@ -22,22 +22,22 @@ @@ -278,7 +278,7 @@ index 1af4dd9..d3ac0f3 100644 +const char* emergency_action_to_string(EmergencyAction i) _const_; +EmergencyAction emergency_action_from_string(const char *s) _pure_; diff --git a/src/core/job.c b/src/core/job.c -index c2876de..7032864 100644 +index c2876dec1..703286496 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -916,7 +916,7 @@ static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *user @@ -291,7 +291,7 @@ index c2876de..7032864 100644 return 0; } diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index ce1397c..45d1ead 100644 +index ce1397c7e..45d1ead45 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -156,7 +156,7 @@ Unit.OnFailureIsolate, config_parse_job_mode_isolate, 0, @@ -316,7 +316,7 @@ index ce1397c..45d1ead 100644 Service.Restart, config_parse_service_restart, 0, offsetof(Service, restart) Service.PermissionsStartOnly, config_parse_bool, 0, offsetof(Service, permissions_start_only) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 83b6e7e..4fecb83 100644 +index 83b6e7efc..4fecb8314 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2382,7 +2382,7 @@ int config_parse_unit_condition_null( @@ -338,7 +338,7 @@ index 83b6e7e..4fecb83 100644 { config_parse_service_sockets, "SOCKETS" }, { config_parse_environ, "ENVIRON" }, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 359794d..6114796 100644 +index 359794d0a..611479612 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -78,7 +78,7 @@ int config_parse_unit_condition_string(const char *unit, const char *filename, u @@ -351,7 +351,7 @@ index 359794d..6114796 100644 int config_parse_syscall_filter(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_syscall_archs(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/core/manager.h b/src/core/manager.h -index 42be1fc..59913f4 100644 +index 42be1fc43..59913f489 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -85,7 +85,7 @@ typedef enum StatusType { @@ -364,7 +364,7 @@ index 42be1fc..59913f4 100644 struct Manager { /* Note that the set of units we know of is allowed to be diff --git a/src/core/service.c b/src/core/service.c -index babd3c5..6e7baa7 100644 +index babd3c52a..6e7baa76c 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1280,7 +1280,7 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) @@ -386,7 +386,7 @@ index babd3c5..6e7baa7 100644 static int service_start(Unit *u) { diff --git a/src/core/service.h b/src/core/service.h -index dfeee6a..1f937df 100644 +index dfeee6a68..1f937dfe5 100644 --- a/src/core/service.h +++ b/src/core/service.h @@ -29,7 +29,7 @@ typedef struct ServiceFDStore ServiceFDStore; @@ -410,7 +410,7 @@ index dfeee6a..1f937df 100644 UnitRef accept_socket; diff --git a/src/core/unit.c b/src/core/unit.c -index a7d6d2f..4eb0d78 100644 +index a7d6d2f45..4eb0d78f4 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -937,8 +937,8 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { @@ -425,7 +425,7 @@ index a7d6d2f..4eb0d78 100644 if (u->job_timeout_reboot_arg) fprintf(f, "%s\tJob Timeout Reboot Argument: %s\n", prefix, u->job_timeout_reboot_arg); diff --git a/src/core/unit.h b/src/core/unit.h -index 35287a5..85f52df 100644 +index 35287a5b7..85f52df18 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -41,7 +41,7 @@ typedef struct UnitStatusMessageFormats UnitStatusMessageFormats; @@ -447,7 +447,7 @@ index 35287a5..85f52df 100644 /* References to this */ diff --git a/src/test/test-tables.c b/src/test/test-tables.c -index bda224b..e409790 100644 +index bda224bec..e4097903c 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -67,7 +67,7 @@ int main(int argc, char **argv) { diff --git a/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch b/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch index e7ca328..5442c84 100644 --- a/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch +++ b/SOURCES/0428-core-use-emergency_action-for-ctr-alt-del-burst.patch @@ -15,7 +15,7 @@ Resolves: #1353028 4 files changed, 12 insertions(+), 48 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index 236c20d..57b3b90 100644 +index 236c20d5f..57b3b90be 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -105,9 +105,10 @@ @@ -33,7 +33,7 @@ index 236c20d..57b3b90 100644 </para></listitem> </varlistentry> diff --git a/src/core/main.c b/src/core/main.c -index 6ac9c9d..6f83676 100644 +index 6ac9c9d44..6f8367632 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -77,6 +77,7 @@ @@ -72,7 +72,7 @@ index 6ac9c9d..6f83676 100644 }; diff --git a/src/core/manager.c b/src/core/manager.c -index 9048dde..8bd80e6 100644 +index 9048dde96..8bd80e687 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1864,28 +1864,11 @@ static void manager_handle_ctrl_alt_del(Manager *m) { @@ -121,7 +121,7 @@ index 9048dde..8bd80e6 100644 - -DEFINE_STRING_TABLE_LOOKUP(cad_burst_action, CADBurstAction); diff --git a/src/core/manager.h b/src/core/manager.h -index 59913f4..231c076 100644 +index 59913f489..231c076b1 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -64,14 +64,6 @@ typedef enum ManagerExitCode { diff --git a/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch b/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch index 0ed438d..021e726 100644 --- a/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch +++ b/SOURCES/0429-udev-path_id-introduce-support-for-NVMe-devices-4169.patch @@ -19,7 +19,7 @@ Resolves: #1373150 1 file changed, 9 insertions(+) diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index a3b019b..88a812f 100644 +index a3b019bfc..88a812ff5 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -709,6 +709,15 @@ restart: diff --git a/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch b/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch index 73d8027..5016384 100644 --- a/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch +++ b/SOURCES/0430-core-fix-CapabilityBoundingSet-merging.patch @@ -12,7 +12,7 @@ Resolves: #1409586 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 4fecb83..90d42b0 100644 +index 4fecb8314..90d42b002 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1027,6 +1027,7 @@ int config_parse_bounding_set(const char *unit, diff --git a/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch b/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch index e7bb490..0cd5648 100644 --- a/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch +++ b/SOURCES/0431-core-fix-capability-bounding-set-parsing.patch @@ -12,7 +12,7 @@ Resolves: #1409586 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 90d42b0..7056419 100644 +index 90d42b002..705641971 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1069,7 +1069,7 @@ int config_parse_bounding_set(const char *unit, diff --git a/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch b/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch index a879e38..fc5bd24 100644 --- a/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch +++ b/SOURCES/0432-core-make-parsing-of-RLIMIT_NICE-aware-of-actual-nic.patch @@ -16,7 +16,7 @@ Resolves: #1409588 5 files changed, 81 insertions(+), 3 deletions(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index 0cd469c..c5199d3 100644 +index 0cd469cd9..c5199d3a5 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -575,7 +575,12 @@ @@ -34,7 +34,7 @@ index 0cd469c..c5199d3 100644 <para>Note that most process resource limits configured with these options are per-process, and processes may fork in order diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 45d1ead..f3a6e13 100644 +index 45d1ead45..f3a6e13d9 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -71,7 +71,7 @@ $1.LimitMEMLOCK, config_parse_bytes_limit, RLIMIT_MEML @@ -47,7 +47,7 @@ index 45d1ead..f3a6e13 100644 $1.LimitRTTIME, config_parse_usec_limit, RLIMIT_RTTIME, offsetof($1, exec_context.rlimit) $1.ReadWriteDirectories, config_parse_namespace_path_strv, 0, offsetof($1, exec_context.read_write_dirs) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 7056419..3a3c456 100644 +index 705641971..3a3c456da 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1154,6 +1154,56 @@ static int rlim_parse_usec(const char *val, rlim_t *res) { @@ -137,7 +137,7 @@ index 7056419..3a3c456 100644 #ifdef HAVE_SYSV_COMPAT int config_parse_sysv_priority(const char *unit, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 6114796..7c69e53 100644 +index 611479612..7c69e5369 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -59,6 +59,7 @@ int config_parse_limit(const char *unit, const char *filename, unsigned line, co @@ -149,7 +149,7 @@ index 6114796..7c69e53 100644 int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/core/main.c b/src/core/main.c -index 6f83676..820cbc3 100644 +index 6f8367632..820cbc3e5 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -669,7 +669,7 @@ static int parse_config_file(void) { diff --git a/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch b/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch index cf8fa4f..c865174 100644 --- a/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch +++ b/SOURCES/0433-shared-fix-double-free-in-unmask-5005.patch @@ -19,7 +19,7 @@ Resolves: #1409997 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index f01a212..1b59a96 100644 +index f01a21262..1b59a96b1 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1602,7 +1602,7 @@ int unit_file_unmask( diff --git a/SOURCES/0434-shared-fix-double-free-in-link.patch b/SOURCES/0434-shared-fix-double-free-in-link.patch index 3bde215..ca6e2fd 100644 --- a/SOURCES/0434-shared-fix-double-free-in-link.patch +++ b/SOURCES/0434-shared-fix-double-free-in-link.patch @@ -91,7 +91,7 @@ Related: #1409997 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 1b59a96..87d805c 100644 +index 1b59a96b1..87d805c94 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1682,7 +1682,7 @@ int unit_file_link( diff --git a/SOURCES/0435-shared-check-strdup-NULL.patch b/SOURCES/0435-shared-check-strdup-NULL.patch index 0cf5a0e..4f0c1f6 100644 --- a/SOURCES/0435-shared-check-strdup-NULL.patch +++ b/SOURCES/0435-shared-check-strdup-NULL.patch @@ -12,7 +12,7 @@ Related: #1409997 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/shared/install.c b/src/shared/install.c -index 87d805c..62bdf67 100644 +index 87d805c94..62bdf674c 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1639,7 +1639,11 @@ int unit_file_unmask( diff --git a/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch b/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch index 1f9b9bc..92689e7 100644 --- a/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch +++ b/SOURCES/0436-core-improve-error-message-when-RefuseManualStart-St.patch @@ -12,7 +12,7 @@ Resolves: #1026648 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c -index 89b00e9..056a17a 100644 +index 89b00e94c..056a17ac1 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -843,7 +843,7 @@ int bus_unit_queue_job( @@ -25,7 +25,7 @@ index 89b00e9..056a17a 100644 r = manager_add_job(u->manager, type, u, mode, true, error, &j); if (r < 0) diff --git a/src/core/dbus.c b/src/core/dbus.c -index 29524d4..0061211 100644 +index 29524d49a..0061211fa 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -187,7 +187,7 @@ static int signal_activation_request(sd_bus *bus, sd_bus_message *message, void diff --git a/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch b/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch index 132dc06..219dd20 100644 --- a/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch +++ b/SOURCES/0437-systemctl-fix-is-enabled-exit-status-on-failure-when.patch @@ -11,7 +11,7 @@ Resolves: #1413964 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index a578897..1e1009f 100644 +index a578897d9..1e1009f38 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5739,7 +5739,7 @@ static int unit_is_enabled(sd_bus *bus, char **args) { diff --git a/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch b/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch index 68cbd5c..a934dc7 100644 --- a/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch +++ b/SOURCES/0438-man-document-that-the-automatic-journal-limits-are-c.patch @@ -11,7 +11,7 @@ Resolves: #1418547 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/man/journald.conf.xml b/man/journald.conf.xml -index c4f71e8..46a498b 100644 +index c4f71e887..46a498b67 100644 --- a/man/journald.conf.xml +++ b/man/journald.conf.xml @@ -210,7 +210,8 @@ diff --git a/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch b/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch index f5492ba..9c9e233 100644 --- a/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch +++ b/SOURCES/0439-random-seed-raise-POOL_SIZE_MIN-to-1024.patch @@ -9,7 +9,7 @@ Resolves: #1386824 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c -index ce1bd19..3ccc8f6 100644 +index ce1bd195d..3ccc8f681 100644 --- a/src/random-seed/random-seed.c +++ b/src/random-seed/random-seed.c @@ -29,7 +29,7 @@ diff --git a/SOURCES/0440-bash-completion-add-support-for-now-5155.patch b/SOURCES/0440-bash-completion-add-support-for-now-5155.patch index b8449e6..2f26307 100644 --- a/SOURCES/0440-bash-completion-add-support-for-now-5155.patch +++ b/SOURCES/0440-bash-completion-add-support-for-now-5155.patch @@ -10,7 +10,7 @@ Resolves: #1351806 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in -index 0a022c4..a1dde32 100644 +index 0a022c4cf..a1dde32c3 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -91,7 +91,7 @@ _systemctl () { diff --git a/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch b/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch index 0477fc7..0f89cad 100644 --- a/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch +++ b/SOURCES/0441-basic-fix-touch-creating-files-with-07777-mode.patch @@ -15,7 +15,7 @@ Resolves: #1416062 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/util.c b/src/shared/util.c -index 66729f7..1070e32 100644 +index 66729f70e..1070e32c4 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -3908,7 +3908,8 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi diff --git a/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch b/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch index f977bc4..5b951cc 100644 --- a/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch +++ b/SOURCES/0442-udev-net_id-add-support-for-phys_port_name-attribute.patch @@ -16,7 +16,7 @@ Resolves: #1392426 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 19e1f26..7c15435 100644 +index 19e1f2631..7c154355d 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -38,7 +38,7 @@ diff --git a/SOURCES/0443-install-introduce-UnitFileFlags.patch b/SOURCES/0443-install-introduce-UnitFileFlags.patch index 79c2e59..8123106 100644 --- a/SOURCES/0443-install-introduce-UnitFileFlags.patch +++ b/SOURCES/0443-install-introduce-UnitFileFlags.patch @@ -19,7 +19,7 @@ Related: #1413041 7 files changed, 135 insertions(+), 113 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index c2067c0..5b40aa2 100644 +index c2067c099..5b40aa20f 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -41,6 +41,11 @@ @@ -183,7 +183,7 @@ index c2067c0..5b40aa2 100644 return r; diff --git a/src/core/main.c b/src/core/main.c -index 820cbc3..a0df1e5 100644 +index 820cbc3e5..a0df1e5ce 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1658,7 +1658,7 @@ int main(int argc, char *argv[]) { @@ -196,7 +196,7 @@ index 820cbc3..a0df1e5 100644 log_warning_errno(r, "Failed to populate /etc with preset unit settings, ignoring: %m"); else diff --git a/src/shared/install.c b/src/shared/install.c -index 62bdf67..b3df6b3 100644 +index 62bdf674c..b3df6b35c 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -1549,10 +1549,9 @@ static int install_context_mark_for_removal( @@ -455,7 +455,7 @@ index 62bdf67..b3df6b3 100644 static void unit_file_list_free_one(UnitFileList *f) { diff --git a/src/shared/install.h b/src/shared/install.h -index 7e40445..c961b53 100644 +index 7e40445d3..c961b53d0 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -66,6 +66,11 @@ typedef enum UnitFileChangeType { @@ -499,7 +499,7 @@ index 7e40445..c961b53 100644 int unit_file_lookup_state(UnitFileScope scope, const char *root_dir,const LookupPaths *paths, const char *name, UnitFileState *ret); int unit_file_get_state(UnitFileScope scope, const char *root_dir, const char *filename, UnitFileState *ret); diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 1e1009f..e0dbf0f 100644 +index 1e1009f38..e0dbf0fda 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -165,6 +165,11 @@ static int daemon_reload(sd_bus *bus, char **args); @@ -575,7 +575,7 @@ index 1e1009f..e0dbf0f 100644 log_error_errno(r, "Operation failed: %m"); goto finish; diff --git a/src/test/test-install-root.c b/src/test/test-install-root.c -index 667c374..cb417d4 100644 +index 667c3748c..cb417d4c1 100644 --- a/src/test/test-install-root.c +++ b/src/test/test-install-root.c @@ -62,7 +62,7 @@ static void test_basic_mask_and_enable(const char *root) { @@ -830,7 +830,7 @@ index 667c374..cb417d4 100644 assert_se(n_changes > 0); diff --git a/src/test/test-install.c b/src/test/test-install.c -index 08a1faf..0cae0e7 100644 +index 08a1faf2c..0cae0e794 100644 --- a/src/test/test-install.c +++ b/src/test/test-install.c @@ -73,12 +73,12 @@ int main(int argc, char* argv[]) { diff --git a/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch b/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch index 037d1a4..e33c4e1 100644 --- a/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch +++ b/SOURCES/0444-shared-systemctl-teach-is-enabled-to-show-installati.patch @@ -27,7 +27,7 @@ Resolves: #1413041 6 files changed, 145 insertions(+), 17 deletions(-) diff --git a/man/systemctl.xml b/man/systemctl.xml -index bb21f3a..4a1aff2 100644 +index bb21f3a88..4a1aff227 100644 --- a/man/systemctl.xml +++ b/man/systemctl.xml @@ -223,6 +223,8 @@ @@ -48,7 +48,7 @@ index bb21f3a..4a1aff2 100644 <table> diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 5b40aa2..7ba1b51 100644 +index 5b40aa20f..7ba1b519e 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1958,6 +1958,49 @@ static int method_add_dependency_unit_files(sd_bus *bus, sd_bus_message *message @@ -110,22 +110,22 @@ index 5b40aa2..7ba1b51 100644 SD_BUS_SIGNAL("UnitNew", "so", 0), SD_BUS_SIGNAL("UnitRemoved", "so", 0), diff --git a/src/core/org.freedesktop.systemd1.conf b/src/core/org.freedesktop.systemd1.conf -index 6a7a37e..3997dd0 100644 +index 6a7a37ee9..3997dd0b4 100644 --- a/src/core/org.freedesktop.systemd1.conf +++ b/src/core/org.freedesktop.systemd1.conf -@@ -78,6 +78,10 @@ - - <allow send_destination="org.freedesktop.systemd1" +@@ -76,6 +76,10 @@ send_interface="org.freedesktop.systemd1.Manager" -+ send_member="GetUnitFileLinks"/> -+ + send_member="GetUnitFileState"/> + + <allow send_destination="org.freedesktop.systemd1" + send_interface="org.freedesktop.systemd1.Manager" - send_member="ListJobs"/> - ++ send_member="GetUnitFileLinks"/> ++ <allow send_destination="org.freedesktop.systemd1" + send_interface="org.freedesktop.systemd1.Manager" + send_member="ListJobs"/> diff --git a/src/shared/install.c b/src/shared/install.c -index b3df6b3..bdfd7b9 100644 +index b3df6b35c..bdfd7b96a 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -340,6 +340,7 @@ static int remove_marked_symlinks_fd( @@ -248,7 +248,7 @@ index b3df6b3..bdfd7b9 100644 r = 0; diff --git a/src/shared/install.h b/src/shared/install.h -index c961b53..c236dcf 100644 +index c961b53d0..c236dcfd8 100644 --- a/src/shared/install.h +++ b/src/shared/install.h @@ -68,7 +68,8 @@ typedef enum UnitFileChangeType { @@ -262,7 +262,7 @@ index c961b53..c236dcf 100644 static inline bool unit_file_change_is_modification(UnitFileChangeType type) { diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index e0dbf0f..ff8b4e9 100644 +index e0dbf0fda..ff8b4e978 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5722,6 +5722,63 @@ finish: diff --git a/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch b/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch index 8595f73..0aaf4a9 100644 --- a/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch +++ b/SOURCES/0445-udev-fix-crash-with-invalid-udev.log-priority.patch @@ -15,7 +15,7 @@ Resolves: #1245293 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 21e7e7f..82c7a54 100644 +index 21e7e7f9a..82c7a5425 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -990,7 +990,10 @@ static void kernel_cmdline_options(struct udev *udev) { diff --git a/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch b/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch index f6483f9..0a685cd 100644 --- a/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch +++ b/SOURCES/0446-core-make-exec-code-a-bit-more-readable.patch @@ -13,7 +13,7 @@ Related: #1421181 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c -index e9b4359..59340ec 100644 +index e9b4359a7..59340ec05 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1256,6 +1256,36 @@ static int build_environment( diff --git a/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch b/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch index 7da95e2..9ac4d3c 100644 --- a/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch +++ b/SOURCES/0447-core-Private-Protect-options-with-RootDirectory.patch @@ -21,7 +21,7 @@ Resolves: #1421181 4 files changed, 100 insertions(+), 15 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c -index 59340ec..863babd 100644 +index 59340ec05..863babd76 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1305,6 +1305,7 @@ static int exec_child( @@ -61,7 +61,7 @@ index 59340ec..863babd 100644 *exit_status = EXIT_CHROOT; return -errno; diff --git a/src/core/namespace.c b/src/core/namespace.c -index 00495c1..5747462 100644 +index 00495c144..574746273 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -44,6 +44,7 @@ @@ -228,7 +228,7 @@ index 00495c1..5747462 100644 return 0; diff --git a/src/core/namespace.h b/src/core/namespace.h -index 42b92e7..00ab22b 100644 +index 42b92e780..00ab22bf2 100644 --- a/src/core/namespace.h +++ b/src/core/namespace.h @@ -41,7 +41,8 @@ typedef enum ProtectSystem { @@ -242,7 +242,7 @@ index 42b92e7..00ab22b 100644 char **inaccessible_dirs, const char *tmp_dir, diff --git a/src/test/test-ns.c b/src/test/test-ns.c -index 7cd7b77..72a0004 100644 +index 7cd7b7715..72a0004e3 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -42,10 +42,12 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch b/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch index f75e106..ff06ca3 100644 --- a/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch +++ b/SOURCES/0448-core-if-the-start-command-vanishes-during-runtime-do.patch @@ -16,7 +16,7 @@ Resolves: #1421658 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/core/service.c b/src/core/service.c -index 6e7baa7..84e0057 100644 +index 6e7baa76c..84e00573f 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1563,7 +1563,15 @@ static void service_enter_start(Service *s) { diff --git a/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch b/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch index d054751..d9b80ce 100644 --- a/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch +++ b/SOURCES/0449-systemctl-make-sure-that-now-is-carried-out-5209.patch @@ -12,7 +12,7 @@ Resolves: #1417459 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index ff8b4e9..0333599 100644 +index ff8b4e978..0333599c8 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5549,16 +5549,20 @@ static int enable_unit(sd_bus *bus, char **args) { diff --git a/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch b/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch index 8535cfe..651a0f5 100644 --- a/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch +++ b/SOURCES/0450-udev-inform-systemd-how-many-workers-we-can-potentia.patch @@ -11,7 +11,7 @@ Resolves: #1361601 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 82c7a54..1d21182 100644 +index 82c7a5425..1d21182fb 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -697,6 +697,10 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl) { diff --git a/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch b/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch index 59c16f6..db0bceb 100644 --- a/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch +++ b/SOURCES/0451-service-log_unit-consumes-id-of-unit-not-a-unit.patch @@ -10,7 +10,7 @@ Related: #1421658 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/service.c b/src/core/service.c -index 84e0057..3bd6c33 100644 +index 84e00573f..3bd6c3338 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1567,7 +1567,7 @@ static void service_enter_start(Service *s) { diff --git a/SOURCES/0452-automount-add-expire-support.patch b/SOURCES/0452-automount-add-expire-support.patch index f904603..29485fa 100644 --- a/SOURCES/0452-automount-add-expire-support.patch +++ b/SOURCES/0452-automount-add-expire-support.patch @@ -17,7 +17,7 @@ Resolves: #1354410 8 files changed, 269 insertions(+), 28 deletions(-) diff --git a/man/systemd.automount.xml b/man/systemd.automount.xml -index b5b5885..9561590 100644 +index b5b5885cd..9561590c5 100644 --- a/man/systemd.automount.xml +++ b/man/systemd.automount.xml @@ -135,6 +135,14 @@ @@ -36,13 +36,14 @@ index b5b5885..9561590 100644 </refsect1> diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml -index 8e652e1..04ed1e1 100644 +index 8e652e133..04ed1e1cf 100644 --- a/man/systemd.mount.xml +++ b/man/systemd.mount.xml -@@ -178,6 +178,15 @@ +@@ -177,6 +177,15 @@ + for details.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><option>x-systemd.idle-timeout=</option></term> + + <listitem><para>Configures the idleness timeout of the @@ -51,12 +52,11 @@ index 8e652e1..04ed1e1 100644 + for details.</para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><option>x-systemd.device-timeout=</option></term> - <listitem><para>Configure how long systemd should wait for a diff --git a/src/core/automount.c b/src/core/automount.c -index b391f61..4e06661 100644 +index b391f6198..4e066613d 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -42,6 +42,7 @@ @@ -433,7 +433,7 @@ index b391f61..4e06661 100644 log_unit_error(UNIT(a)->id, "Received unknown automount request %i", packet.hdr.type); break; diff --git a/src/core/automount.h b/src/core/automount.h -index 60f5522..2a50fef 100644 +index 60f552238..2a50fef68 100644 --- a/src/core/automount.h +++ b/src/core/automount.h @@ -47,6 +47,7 @@ struct Automount { @@ -463,7 +463,7 @@ index 60f5522..2a50fef 100644 const char* automount_state_to_string(AutomountState i) _const_; AutomountState automount_state_from_string(const char *s) _pure_; diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c -index b2a510a..c62ad82 100644 +index b2a510ad0..c62ad8242 100644 --- a/src/core/dbus-automount.c +++ b/src/core/dbus-automount.c @@ -32,5 +32,6 @@ const sd_bus_vtable bus_automount_vtable[] = { @@ -474,7 +474,7 @@ index b2a510a..c62ad82 100644 SD_BUS_VTABLE_END }; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index f3a6e13..c866a9c 100644 +index f3a6e13d9..c866a9cd0 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -318,6 +318,7 @@ KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl @@ -486,7 +486,7 @@ index f3a6e13..c866a9c 100644 Swap.What, config_parse_path, 0, offsetof(Swap, parameters_fragment.what) Swap.Priority, config_parse_int, 0, offsetof(Swap, parameters_fragment.priority) diff --git a/src/core/mount.c b/src/core/mount.c -index 3fbdb7d..7ca7f5a 100644 +index 3fbdb7daf..7ca7f5a25 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -552,7 +552,7 @@ static int mount_load(Unit *u) { @@ -531,7 +531,7 @@ index 3fbdb7d..7ca7f5a 100644 if (state != old_state) log_unit_debug(UNIT(m)->id, diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 029eb16..a943393 100644 +index 029eb1638..a943393b0 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -213,6 +213,30 @@ static int write_requires_mounts_for(FILE *f, const char *opts) { diff --git a/SOURCES/0453-fstab-generator-fix-memleak.patch b/SOURCES/0453-fstab-generator-fix-memleak.patch index 4338eeb..c21b465 100644 --- a/SOURCES/0453-fstab-generator-fix-memleak.patch +++ b/SOURCES/0453-fstab-generator-fix-memleak.patch @@ -15,7 +15,7 @@ Related: #1354410 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index a943393..32aca22 100644 +index a943393b0..32aca2244 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -214,13 +214,13 @@ static int write_requires_mounts_for(FILE *f, const char *opts) { diff --git a/SOURCES/0454-remove-bus-proxyd.patch b/SOURCES/0454-remove-bus-proxyd.patch index 6bcc656..0caaa66 100644 --- a/SOURCES/0454-remove-bus-proxyd.patch +++ b/SOURCES/0454-remove-bus-proxyd.patch @@ -65,7 +65,7 @@ Resolves: #1317518 delete mode 100644 units/user/systemd-bus-proxyd.socket diff --git a/.gitignore b/.gitignore -index 0360f7c..5ac188b 100644 +index 0360f7c6b..5ac188bfb 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,6 @@ @@ -77,7 +77,7 @@ index 0360f7c..5ac188b 100644 /systemd-cgls /systemd-cgroups-agent diff --git a/Makefile-man.am b/Makefile-man.am -index 7ec709c..734c805 100644 +index 7ec709c8b..734c80598 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -1762,8 +1762,6 @@ EXTRA_DIST += \ @@ -90,7 +90,7 @@ index 7ec709c..734c805 100644 man/systemd-cgls.xml \ man/systemd-cgtop.xml \ diff --git a/Makefile.am b/Makefile.am -index b347aed..924b34b 100644 +index b347aed7d..924b34b69 100644 --- a/Makefile.am +++ b/Makefile.am @@ -397,7 +397,6 @@ rootlibexec_PROGRAMS = \ @@ -218,7 +218,7 @@ index b347aed..924b34b 100644 systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent/tty-ask-password-agent.c diff --git a/README b/README -index ffc2cf9..bf75909 100644 +index ffc2cf9f2..bf75909f8 100644 --- a/README +++ b/README @@ -198,9 +198,6 @@ USERS AND GROUPS: @@ -232,7 +232,7 @@ index ffc2cf9..bf75909 100644 systemd ships with three NSS modules: diff --git a/TODO b/TODO -index 498d82c..9947307 100644 +index 498d82c21..99473078a 100644 --- a/TODO +++ b/TODO @@ -431,10 +431,6 @@ Features: @@ -247,7 +247,7 @@ index 498d82c..9947307 100644 - kdbus: add counter for refused unicast messages that is passed out via the RECV ioctl. SImilar to the counter for dropped multicast messages we already have. diff --git a/man/busctl.xml b/man/busctl.xml -index 0635280..c68fe23 100644 +index 0635280ea..c68fe236c 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -468,7 +468,6 @@ o "/org/freedesktop/systemd1/job/42684"</programlisting> @@ -260,7 +260,7 @@ index 0635280..c68fe23 100644 </para> diff --git a/man/systemd-bus-proxyd.xml b/man/systemd-bus-proxyd.xml deleted file mode 100644 -index e0efe99..0000000 +index e0efe9985..000000000 --- a/man/systemd-bus-proxyd.xml +++ /dev/null @@ -1,109 +0,0 @@ @@ -375,7 +375,7 @@ index e0efe99..0000000 -</refentry> diff --git a/man/systemd-bus-proxyd@.service.xml b/man/systemd-bus-proxyd@.service.xml deleted file mode 100644 -index dc4f07f..0000000 +index dc4f07ff1..000000000 --- a/man/systemd-bus-proxyd@.service.xml +++ /dev/null @@ -1,81 +0,0 @@ @@ -462,7 +462,7 @@ index dc4f07f..0000000 -</refentry> diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile deleted file mode 120000 -index d0b0e8e..0000000 +index d0b0e8e00..000000000 --- a/src/bus-proxyd/Makefile +++ /dev/null @@ -1 +0,0 @@ @@ -470,7 +470,7 @@ index d0b0e8e..0000000 \ No newline at end of file diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c deleted file mode 100644 -index b6550ed..0000000 +index b6550ed3c..000000000 --- a/src/bus-proxyd/bus-proxyd.c +++ /dev/null @@ -1,346 +0,0 @@ @@ -822,7 +822,7 @@ index b6550ed..0000000 -} diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c deleted file mode 100644 -index f6ac0c0..0000000 +index f6ac0c009..000000000 --- a/src/bus-proxyd/bus-xml-policy.c +++ /dev/null @@ -1,1325 +0,0 @@ @@ -2153,7 +2153,7 @@ index f6ac0c0..0000000 -DEFINE_STRING_TABLE_LOOKUP(policy_item_class, PolicyItemClass); diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/bus-proxyd/bus-xml-policy.h deleted file mode 100644 -index f2ec1bb..0000000 +index f2ec1bbea..000000000 --- a/src/bus-proxyd/bus-xml-policy.h +++ /dev/null @@ -1,151 +0,0 @@ @@ -2310,7 +2310,7 @@ index f2ec1bb..0000000 -DEFINE_TRIVIAL_CLEANUP_FUNC(SharedPolicy*, shared_policy_free); diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c deleted file mode 100644 -index bc2c0c8..0000000 +index bc2c0c86f..000000000 --- a/src/bus-proxyd/driver.c +++ /dev/null @@ -1,608 +0,0 @@ @@ -2924,7 +2924,7 @@ index bc2c0c8..0000000 -} diff --git a/src/bus-proxyd/driver.h b/src/bus-proxyd/driver.h deleted file mode 100644 -index b8cedf5..0000000 +index b8cedf5ce..000000000 --- a/src/bus-proxyd/driver.h +++ /dev/null @@ -1,27 +0,0 @@ @@ -2957,7 +2957,7 @@ index b8cedf5..0000000 -int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPolicy *sp, const struct ucred *ucred, Set *owned_names); diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c deleted file mode 100644 -index e13cf5e..0000000 +index e13cf5e2e..000000000 --- a/src/bus-proxyd/proxy.c +++ /dev/null @@ -1,864 +0,0 @@ @@ -3827,7 +3827,7 @@ index e13cf5e..0000000 -} diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h deleted file mode 100644 -index 782c4e6..0000000 +index 782c4e60b..000000000 --- a/src/bus-proxyd/proxy.h +++ /dev/null @@ -1,53 +0,0 @@ @@ -3886,7 +3886,7 @@ index 782c4e6..0000000 -DEFINE_TRIVIAL_CLEANUP_FUNC(Proxy*, proxy_free); diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c deleted file mode 100644 -index 9fb3e9f..0000000 +index 9fb3e9fc4..000000000 --- a/src/bus-proxyd/stdio-bridge.c +++ /dev/null @@ -1,263 +0,0 @@ @@ -4155,7 +4155,7 @@ index 9fb3e9f..0000000 -} diff --git a/src/bus-proxyd/synthesize.c b/src/bus-proxyd/synthesize.c deleted file mode 100644 -index e1b0fd3..0000000 +index e1b0fd353..000000000 --- a/src/bus-proxyd/synthesize.c +++ /dev/null @@ -1,228 +0,0 @@ @@ -4389,7 +4389,7 @@ index e1b0fd3..0000000 -} diff --git a/src/bus-proxyd/synthesize.h b/src/bus-proxyd/synthesize.h deleted file mode 100644 -index a55f171..0000000 +index a55f171cb..000000000 --- a/src/bus-proxyd/synthesize.h +++ /dev/null @@ -1,34 +0,0 @@ @@ -4429,7 +4429,7 @@ index a55f171..0000000 -int synthesize_name_acquired(sd_bus *a, sd_bus *b, sd_bus_message *m); diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c deleted file mode 100644 -index 421487e..0000000 +index 421487e03..000000000 --- a/src/bus-proxyd/test-bus-xml-policy.c +++ /dev/null @@ -1,182 +0,0 @@ @@ -4617,7 +4617,7 @@ index 421487e..0000000 -} diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c new file mode 100644 -index 0000000..791e545 +index 000000000..791e545ab --- /dev/null +++ b/src/stdio-bridge/stdio-bridge.c @@ -0,0 +1,303 @@ @@ -4925,7 +4925,7 @@ index 0000000..791e545 + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/src/test/test-tables.c b/src/test/test-tables.c -index e409790..afd4ab7 100644 +index e4097903c..afd4ab7fb 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -46,7 +46,6 @@ @@ -4946,7 +4946,7 @@ index e409790..afd4ab7 100644 test_table(protect_system, PROTECT_SYSTEM); test_table(rlimit, RLIMIT); diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd.conf.m4 -index 23175de..3d3e237 100644 +index 23175de1f..3d3e2374e 100644 --- a/sysusers.d/systemd.conf.m4 +++ b/sysusers.d/systemd.conf.m4 @@ -6,9 +6,6 @@ @@ -4960,7 +4960,7 @@ index 23175de..3d3e237 100644 u systemd-network - "systemd Network Management" )m4_dnl diff --git a/units/.gitignore b/units/.gitignore -index 7f3e0d0..48c8f72 100644 +index 7f3e0d093..48c8f7217 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -1,4 +1,3 @@ @@ -4978,7 +4978,7 @@ index 7f3e0d0..48c8f72 100644 /systemd-fsck@.service diff --git a/units/systemd-bus-proxyd.service.m4.in b/units/systemd-bus-proxyd.service.m4.in deleted file mode 100644 -index ffaf0bd..0000000 +index ffaf0bdc8..000000000 --- a/units/systemd-bus-proxyd.service.m4.in +++ /dev/null @@ -1,19 +0,0 @@ @@ -5003,7 +5003,7 @@ index ffaf0bd..0000000 -ProtectHome=yes diff --git a/units/systemd-bus-proxyd.socket b/units/systemd-bus-proxyd.socket deleted file mode 100644 -index 3f80a1d..0000000 +index 3f80a1d54..000000000 --- a/units/systemd-bus-proxyd.socket +++ /dev/null @@ -1,12 +0,0 @@ @@ -5020,7 +5020,7 @@ index 3f80a1d..0000000 -[Socket] -ListenStream=/var/run/dbus/system_bus_socket diff --git a/units/user/.gitignore b/units/user/.gitignore -index 6111b10..41a74f5 100644 +index 6111b10cc..41a74f546 100644 --- a/units/user/.gitignore +++ b/units/user/.gitignore @@ -1,3 +1 @@ @@ -5029,7 +5029,7 @@ index 6111b10..41a74f5 100644 -/systemd-consoled.service diff --git a/units/user/systemd-bus-proxyd.service.in b/units/user/systemd-bus-proxyd.service.in deleted file mode 100644 -index e1e399d..0000000 +index e1e399dc3..000000000 --- a/units/user/systemd-bus-proxyd.service.in +++ /dev/null @@ -1,13 +0,0 @@ @@ -5048,7 +5048,7 @@ index e1e399d..0000000 -NotifyAccess=main diff --git a/units/user/systemd-bus-proxyd.socket b/units/user/systemd-bus-proxyd.socket deleted file mode 100644 -index b9efc0e..0000000 +index b9efc0e7c..000000000 --- a/units/user/systemd-bus-proxyd.socket +++ /dev/null @@ -1,12 +0,0 @@ diff --git a/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch b/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch index f03f615..0465b70 100644 --- a/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch +++ b/SOURCES/0455-execute-Add-new-PassEnvironment-directive.patch @@ -39,13 +39,14 @@ Resolves: #1426214 11 files changed, 189 insertions(+), 4 deletions(-) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index c5199d3..aa5831c 100644 +index c5199d3a5..aa5831cc2 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml -@@ -294,6 +294,33 @@ +@@ -293,6 +293,33 @@ + earlier setting.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>PassEnvironment=</varname></term> + + <listitem><para>Pass environment variables from the systemd system @@ -72,12 +73,11 @@ index c5199d3..aa5831c 100644 + for details about environment variables.</para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>StandardInput=</varname></term> <listitem><para>Controls where file descriptor 0 (STDIN) of - the executed processes is connected to. Takes one of diff --git a/shell-completion/bash/systemd-run b/shell-completion/bash/systemd-run -index 5145cd3..36ffa46 100644 +index 5145cd3f2..36ffa46db 100644 --- a/shell-completion/bash/systemd-run +++ b/shell-completion/bash/systemd-run @@ -73,7 +73,7 @@ _systemd_run() { @@ -90,7 +90,7 @@ index 5145cd3..36ffa46 100644 COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) return 0 diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index a9f7971..da8b10d 100644 +index a9f7971cd..da8b10d2b 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -597,6 +597,7 @@ const sd_bus_vtable bus_exec_vtable[] = { @@ -142,7 +142,7 @@ index a9f7971..da8b10d 100644 uint64_t rl; rlim_t x; diff --git a/src/core/execute.c b/src/core/execute.c -index 863babd..f72b209 100644 +index 863babd76..f72b20966 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1256,6 +1256,34 @@ static int build_environment( @@ -227,7 +227,7 @@ index 863babd..f72b209 100644 fprintf(f, "%sNice: %i\n", diff --git a/src/core/execute.h b/src/core/execute.h -index 6e0c9fa..cadd0e6 100644 +index 6e0c9faa7..cadd0e6b4 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -96,6 +96,7 @@ struct ExecRuntime { @@ -239,7 +239,7 @@ index 6e0c9fa..cadd0e6 100644 struct rlimit *rlimit[_RLIMIT_MAX]; char *working_directory, *root_directory; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index c866a9c..b50fe45 100644 +index c866a9cd0..b50fe45b4 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -33,6 +33,7 @@ $1.CPUAffinity, config_parse_exec_cpu_affinity, 0, @@ -251,7 +251,7 @@ index c866a9c..b50fe45 100644 $1.StandardOutput, config_parse_output, 0, offsetof($1, exec_context.std_output) $1.StandardError, config_parse_output, 0, offsetof($1, exec_context.std_error) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 3a3c456..c450fe2 100644 +index 3a3c456da..c450fe2c7 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2265,6 +2265,71 @@ int config_parse_environ(const char *unit, @@ -327,7 +327,7 @@ index 3a3c456..c450fe2 100644 const char *filename, unsigned line, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 7c69e53..9dd7d1b 100644 +index 7c69e5369..9dd7d1bda 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -85,6 +85,7 @@ int config_parse_syscall_filter(const char *unit, const char *filename, unsigned @@ -339,7 +339,7 @@ index 7c69e53..9dd7d1b 100644 int config_parse_cpu_shares(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_memory_limit(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index d357760..ed0849b 100644 +index d35776087..ed0849b63 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1535,7 +1535,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen @@ -352,7 +352,7 @@ index d357760..ed0849b 100644 r = sd_bus_message_append(m, "v", "as", 1, eq); diff --git a/src/shared/env-util.c b/src/shared/env-util.c -index e8da4c9..581d84a 100644 +index e8da4c978..581d84a20 100644 --- a/src/shared/env-util.c +++ b/src/shared/env-util.c @@ -136,6 +136,21 @@ bool strv_env_is_valid(char **e) { @@ -378,7 +378,7 @@ index e8da4c9..581d84a 100644 char **p, **q; diff --git a/src/shared/env-util.h b/src/shared/env-util.h -index 252d87b..b8c2d81 100644 +index 252d87be1..b8c2d81e4 100644 --- a/src/shared/env-util.h +++ b/src/shared/env-util.h @@ -34,6 +34,7 @@ bool strv_env_is_valid(char **e); diff --git a/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch b/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch index 54789b0..ef805c9 100644 --- a/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch +++ b/SOURCES/0456-test-execute-Add-tests-for-new-PassEnvironment-direc.patch @@ -28,7 +28,7 @@ Related: #1426214 create mode 100644 test/exec-passenvironment.service diff --git a/Makefile.am b/Makefile.am -index 924b34b..e9ceac9 100644 +index 924b34b69..e9ceac98a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1477,6 +1477,10 @@ EXTRA_DIST += \ @@ -43,7 +43,7 @@ index 924b34b..e9ceac9 100644 test/exec-ignoresigpipe-no.service \ test/exec-ignoresigpipe-yes.service \ diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 5a02960..8def194 100644 +index 5a02960e7..8def1946d 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -142,6 +142,19 @@ static void test_exec_environment(Manager *m) { @@ -76,7 +76,7 @@ index 5a02960..8def194 100644 NULL, diff --git a/test/exec-passenvironment-absent.service b/test/exec-passenvironment-absent.service new file mode 100644 -index 0000000..7d5e32a +index 000000000..7d5e32a4e --- /dev/null +++ b/test/exec-passenvironment-absent.service @@ -0,0 +1,7 @@ @@ -89,7 +89,7 @@ index 0000000..7d5e32a +PassEnvironment=VAR1 VAR2 VAR3 diff --git a/test/exec-passenvironment-empty.service b/test/exec-passenvironment-empty.service new file mode 100644 -index 0000000..c93c197 +index 000000000..c93c197c1 --- /dev/null +++ b/test/exec-passenvironment-empty.service @@ -0,0 +1,8 @@ @@ -103,7 +103,7 @@ index 0000000..c93c197 +PassEnvironment= diff --git a/test/exec-passenvironment-repeated.service b/test/exec-passenvironment-repeated.service new file mode 100644 -index 0000000..5e8c56f +index 000000000..5e8c56f26 --- /dev/null +++ b/test/exec-passenvironment-repeated.service @@ -0,0 +1,8 @@ @@ -117,7 +117,7 @@ index 0000000..5e8c56f +PassEnvironment=VAR1 VAR3 diff --git a/test/exec-passenvironment.service b/test/exec-passenvironment.service new file mode 100644 -index 0000000..b4a9909 +index 000000000..b4a990968 --- /dev/null +++ b/test/exec-passenvironment.service @@ -0,0 +1,7 @@ diff --git a/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch b/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch index a2a4d47..1791b46 100644 --- a/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch +++ b/SOURCES/0457-test-execute-Clarify-interaction-of-PassEnvironment-.patch @@ -29,7 +29,7 @@ Related: #1426214 1 file changed, 21 insertions(+) diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 8def194..6e5567c 100644 +index 8def1946d..6e5567c3e 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -143,6 +143,17 @@ static void test_exec_environment(Manager *m) { diff --git a/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch b/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch index 1107f2b..81c54f2 100644 --- a/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch +++ b/SOURCES/0458-load-fragment-resolve-specifiers-in-RuntimeDirectory.patch @@ -10,7 +10,7 @@ Resolves: #1428110 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index c450fe2..6fc4d74 100644 +index c450fe2c7..6fc4d745d 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3384,6 +3384,7 @@ int config_parse_runtime_directory( diff --git a/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch b/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch index 35371ba..efbd01b 100644 --- a/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch +++ b/SOURCES/0459-Add-microphone-mute-keymap-for-Dell-Precision.patch @@ -11,7 +11,7 @@ Resolves: #1413477 1 file changed, 2 insertions(+) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb -index 8890665..a7ae2f8 100644 +index 88906655e..a7ae2f867 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -263,6 +263,8 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS12-9Q33*:pvr* diff --git a/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch b/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch index 54d6f0c..107b6ea 100644 --- a/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch +++ b/SOURCES/0460-hwdb-update-micmute-YCODE-on-device-node-at-DELL-LAT.patch @@ -12,7 +12,7 @@ Related: #1413477 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb -index a7ae2f8..a9cd73b 100644 +index a7ae2f867..a9cd73b72 100644 --- a/hwdb/60-keyboard.hwdb +++ b/hwdb/60-keyboard.hwdb @@ -265,7 +265,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS12-9Q33*:pvr* diff --git a/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch b/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch index e825b29..31a791d 100644 --- a/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch +++ b/SOURCES/0461-udev-path_id-improve-and-enhance-bus-detection-for-L.patch @@ -31,7 +31,7 @@ Resolves: #1274401 2 files changed, 60 insertions(+), 28 deletions(-) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 0164dc9..c928d41 100644 +index 0164dc921..c928d412b 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -15,3 +15,28 @@ SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_target", TEST!="[module/sg]", RUN+="/sbin @@ -64,7 +64,7 @@ index 0164dc9..c928d41 100644 + +LABEL="zfcp_scsi_device_end" diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c -index 88a812f..1944720 100644 +index 88a812ff5..19447201b 100644 --- a/src/udev/udev-builtin-path_id.c +++ b/src/udev/udev-builtin-path_id.c @@ -615,27 +615,23 @@ static struct udev_device *handle_bcma(struct udev_device *parent, char **path) diff --git a/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch b/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch index 987940f..b493f34 100644 --- a/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch +++ b/SOURCES/0462-core-port-config_parse_bounding_set-to-extract_first.patch @@ -10,7 +10,7 @@ Resolves: #1387398 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 6fc4d74..4830d7a 100644 +index 6fc4d745d..4830d7ad6 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1028,10 +1028,10 @@ int config_parse_bounding_set(const char *unit, diff --git a/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch b/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch index e1aaac1..abef70a 100644 --- a/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch +++ b/SOURCES/0463-core-simplify-parsing-of-capability-bounding-set-set.patch @@ -16,7 +16,7 @@ Resolves: #1387398 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 4830d7a..ab3b0c2 100644 +index 4830d7ad6..ab3b0c2e9 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1015,23 +1015,22 @@ int config_parse_exec_secure_bits(const char *unit, diff --git a/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch b/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch index b149dd6..7c441e8 100644 --- a/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch +++ b/SOURCES/0464-test-add-test-for-capability-bounding-set-parsing.patch @@ -10,7 +10,7 @@ Resolves: #1387398 1 file changed, 45 insertions(+) diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 0384305..0f00a8f 100644 +index 038430505..0f00a8fff 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -24,6 +24,7 @@ diff --git a/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch b/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch index 73904e0..16d72f1 100644 --- a/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch +++ b/SOURCES/0465-capabilities-keep-bounding-set-in-non-inverted-forma.patch @@ -25,7 +25,7 @@ Resolves: #1387398 13 files changed, 96 insertions(+), 81 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index da8b10d..a564c53 100644 +index da8b10d2b..a564c53fa 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -324,9 +324,7 @@ static int property_get_capability_bounding_set( @@ -40,7 +40,7 @@ index da8b10d..a564c53 100644 static int property_get_capabilities( diff --git a/src/core/execute.c b/src/core/execute.c -index f72b209..40db11e 100644 +index f72b20966..40db11e28 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1733,8 +1733,8 @@ static int exec_child( @@ -78,7 +78,7 @@ index f72b209..40db11e 100644 fputs("\n", f); diff --git a/src/core/execute.h b/src/core/execute.h -index cadd0e6..40f7b79 100644 +index cadd0e6b4..40f7b794c 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -150,7 +150,7 @@ struct ExecContext { @@ -91,7 +91,7 @@ index cadd0e6..40f7b79 100644 cap_t capabilities; int secure_bits; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index b50fe45..e4ce292 100644 +index b50fe45b4..e4ce29210 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -47,7 +47,7 @@ $1.SyslogLevel, config_parse_log_level, 0, @@ -104,7 +104,7 @@ index b50fe45..e4ce292 100644 $1.NoNewPrivileges, config_parse_no_new_privileges, 0, offsetof($1, exec_context) m4_ifdef(`HAVE_SECCOMP', diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index ab3b0c2..dbaaf2f 100644 +index ab3b0c2e9..dbaaf2fee 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1015,7 +1015,7 @@ int config_parse_exec_secure_bits(const char *unit, @@ -169,7 +169,7 @@ index ab3b0c2..dbaaf2f 100644 { config_parse_unit_deps, "UNIT [...]" }, { config_parse_exec, "PATH [ARGUMENT [...]]" }, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 9dd7d1b..2059353 100644 +index 9dd7d1bda..2059353d3 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -54,7 +54,7 @@ int config_parse_exec_cpu_sched_prio(const char *unit, const char *filename, uns @@ -182,7 +182,7 @@ index 9dd7d1b..2059353 100644 int config_parse_bytes_limit(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_sec_limit(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/core/main.c b/src/core/main.c -index a0df1e5..cba992c 100644 +index a0df1e5ce..cba992cea 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -108,7 +108,7 @@ static usec_t arg_runtime_watchdog = 0; @@ -222,7 +222,7 @@ index a0df1e5..cba992c 100644 log_emergency_errno(r, "Failed to drop capability bounding set: %m"); error_message = "Failed to drop capability bounding set"; diff --git a/src/core/unit.c b/src/core/unit.c -index 4eb0d78..103f920 100644 +index 4eb0d78f4..103f92084 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -3213,7 +3213,7 @@ int unit_patch_contexts(Unit *u) { @@ -235,7 +235,7 @@ index 4eb0d78..103f920 100644 cc = unit_get_cgroup_context(u); diff --git a/src/import/import-common.c b/src/import/import-common.c -index f10a453..243e657 100644 +index f10a453ee..243e657c5 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -526,7 +526,7 @@ int import_fork_tar(const char *path, pid_t *ret) { @@ -248,7 +248,7 @@ index f10a453..243e657 100644 log_error_errno(r, "Failed to drop capabilities, ignoring: %m"); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index a37b640..d0003d3 100644 +index a37b64094..d0003d379 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1863,7 +1863,7 @@ static int setup_journal(const char *directory) { @@ -261,7 +261,7 @@ index a37b640..d0003d3 100644 static int register_machine(pid_t pid, int local_ifindex) { diff --git a/src/shared/capability.c b/src/shared/capability.c -index 2b963fd..3ed31df 100644 +index 2b963fde3..3ed31df5a 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -98,7 +98,7 @@ unsigned long cap_last_cap(void) { @@ -328,7 +328,7 @@ index 2b963fd..3ed31df 100644 return log_error_errno(r, "Failed to drop capabilities: %m"); diff --git a/src/shared/capability.h b/src/shared/capability.h -index 6f2f6f9..04cd6e5 100644 +index 6f2f6f997..04cd6e54e 100644 --- a/src/shared/capability.h +++ b/src/shared/capability.h @@ -27,10 +27,12 @@ @@ -357,7 +357,7 @@ index 6f2f6f9..04cd6e5 100644 + return (caps & m) == m; +} diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 0f00a8f..38ecfe9 100644 +index 0f00a8fff..38ecfe972 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -550,6 +550,53 @@ static uint64_t make_cap(int cap) { diff --git a/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch b/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch index 148916f..4df2b21 100644 --- a/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch +++ b/SOURCES/0466-capabilities-added-support-for-ambient-capabilities.patch @@ -45,7 +45,7 @@ Resolves: #1387398 9 files changed, 174 insertions(+), 17 deletions(-) diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index a564c53..817ef80 100644 +index a564c53fa..817ef80d1 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -327,6 +327,24 @@ static int property_get_capability_bounding_set( @@ -82,7 +82,7 @@ index a564c53..817ef80 100644 SD_BUS_PROPERTY("Group", "s", NULL, offsetof(ExecContext, group), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("SupplementaryGroups", "as", NULL, offsetof(ExecContext, supplementary_groups), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/core/execute.c b/src/core/execute.c -index 40db11e..4265b9c 100644 +index 40db11e28..4265b9c34 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -696,12 +696,7 @@ static int enforce_user(const ExecContext *context, uid_t uid) { @@ -226,7 +226,7 @@ index 40db11e..4265b9c 100644 fprintf(f, "%sUser: %s\n", prefix, c->user); if (c->group) diff --git a/src/core/execute.h b/src/core/execute.h -index 40f7b79..00bf99c 100644 +index 40f7b794c..00bf99cbe 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -152,6 +152,8 @@ struct ExecContext { @@ -239,7 +239,7 @@ index 40f7b79..00bf99c 100644 int secure_bits; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index e4ce292..f996032 100644 +index e4ce29210..f996032cf 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -48,6 +48,7 @@ $1.SyslogLevelPrefix, config_parse_bool, 0, @@ -251,7 +251,7 @@ index e4ce292..f996032 100644 $1.NoNewPrivileges, config_parse_no_new_privileges, 0, offsetof($1, exec_context) m4_ifdef(`HAVE_SECCOMP', diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index dbaaf2f..7d1ac6c 100644 +index dbaaf2fee..7d1ac6c25 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -61,6 +61,7 @@ @@ -280,7 +280,7 @@ index dbaaf2f..7d1ac6c 100644 } diff --git a/src/shared/capability.c b/src/shared/capability.c -index 3ed31df..6e3d7d2 100644 +index 3ed31df5a..6e3d7d22e 100644 --- a/src/shared/capability.c +++ b/src/shared/capability.c @@ -98,6 +98,61 @@ unsigned long cap_last_cap(void) { @@ -346,7 +346,7 @@ index 3ed31df..6e3d7d2 100644 _cleanup_cap_free_ cap_t after_cap = NULL; cap_flag_value_t fv; diff --git a/src/shared/capability.h b/src/shared/capability.h -index 04cd6e5..76a7568 100644 +index 04cd6e54e..76a756856 100644 --- a/src/shared/capability.h +++ b/src/shared/capability.h @@ -36,6 +36,9 @@ int capability_bounding_set_drop_usermode(uint64_t keep); @@ -360,7 +360,7 @@ index 04cd6e5..76a7568 100644 DEFINE_TRIVIAL_CLEANUP_FUNC(cap_t, cap_free); diff --git a/src/shared/missing.h b/src/shared/missing.h -index 4b36a9c..a7771bc 100644 +index 4b36a9c93..a7771bc99 100644 --- a/src/shared/missing.h +++ b/src/shared/missing.h @@ -1004,3 +1004,19 @@ static inline int kcmp(pid_t pid1, pid_t pid2, int type, unsigned long idx1, uns @@ -384,7 +384,7 @@ index 4b36a9c..a7771bc 100644 +#define PR_CAP_AMBIENT_CLEAR_ALL 4 +#endif diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 38ecfe9..cfa3d23 100644 +index 38ecfe972..cfa3d2316 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -38,6 +38,7 @@ diff --git a/SOURCES/0467-man-add-AmbientCapabilities-entry.patch b/SOURCES/0467-man-add-AmbientCapabilities-entry.patch index bcd8f1c..f279e12 100644 --- a/SOURCES/0467-man-add-AmbientCapabilities-entry.patch +++ b/SOURCES/0467-man-add-AmbientCapabilities-entry.patch @@ -10,13 +10,14 @@ Resolves: #1387398 1 file changed, 29 insertions(+) diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml -index aa5831c..1b14ced 100644 +index aa5831cc2..1b14ced78 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml -@@ -767,6 +767,35 @@ +@@ -766,6 +766,35 @@ + settings.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>AmbientCapabilities=</varname></term> + + <listitem><para>Controls which capabilities to include in the @@ -45,7 +46,6 @@ index aa5831c..1b14ced 100644 + capabilities over the user change.</para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>SecureBits=</varname></term> <listitem><para>Controls the secure bits set for the executed - process. Takes a space-separated combination of options from diff --git a/SOURCES/0468-test-capability-rebase-to-upstream-version.patch b/SOURCES/0468-test-capability-rebase-to-upstream-version.patch index f450918..3c51724 100644 --- a/SOURCES/0468-test-capability-rebase-to-upstream-version.patch +++ b/SOURCES/0468-test-capability-rebase-to-upstream-version.patch @@ -26,7 +26,7 @@ Related: #1387398 create mode 100644 test/exec-capabilityboundingset-simple.service diff --git a/src/test/test-capability.c b/src/test/test-capability.c -index 4376992..67a9ec2 100644 +index 43769923b..67a9ec2d1 100644 --- a/src/test/test-capability.c +++ b/src/test/test-capability.c @@ -17,21 +17,22 @@ @@ -164,7 +164,7 @@ index 4376992..67a9ec2 100644 return 0; } diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 6e5567c..8e70702 100644 +index 6e5567c3e..8e70702cb 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -17,7 +17,11 @@ @@ -241,7 +241,7 @@ index 6e5567c..8e70702 100644 test_function_t *test = NULL; diff --git a/test/exec-capabilityambientset-merge-nfsnobody.service b/test/exec-capabilityambientset-merge-nfsnobody.service new file mode 100644 -index 0000000..00bec58 +index 000000000..00bec581b --- /dev/null +++ b/test/exec-capabilityambientset-merge-nfsnobody.service @@ -0,0 +1,9 @@ @@ -256,7 +256,7 @@ index 0000000..00bec58 +AmbientCapabilities=CAP_NET_RAW diff --git a/test/exec-capabilityambientset-merge.service b/test/exec-capabilityambientset-merge.service new file mode 100644 -index 0000000..6496438 +index 000000000..64964380e --- /dev/null +++ b/test/exec-capabilityambientset-merge.service @@ -0,0 +1,9 @@ @@ -271,7 +271,7 @@ index 0000000..6496438 +AmbientCapabilities=CAP_NET_RAW diff --git a/test/exec-capabilityambientset-nfsnobody.service b/test/exec-capabilityambientset-nfsnobody.service new file mode 100644 -index 0000000..614cfdd +index 000000000..614cfdd58 --- /dev/null +++ b/test/exec-capabilityambientset-nfsnobody.service @@ -0,0 +1,8 @@ @@ -285,7 +285,7 @@ index 0000000..614cfdd +AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW diff --git a/test/exec-capabilityambientset.service b/test/exec-capabilityambientset.service new file mode 100644 -index 0000000..d63f884 +index 000000000..d63f884ef --- /dev/null +++ b/test/exec-capabilityambientset.service @@ -0,0 +1,8 @@ @@ -299,7 +299,7 @@ index 0000000..d63f884 +AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW diff --git a/test/exec-capabilityboundingset-invert.service b/test/exec-capabilityboundingset-invert.service new file mode 100644 -index 0000000..fd5d248 +index 000000000..fd5d24870 --- /dev/null +++ b/test/exec-capabilityboundingset-invert.service @@ -0,0 +1,7 @@ @@ -312,7 +312,7 @@ index 0000000..fd5d248 +CapabilityBoundingSet=~CAP_CHOWN diff --git a/test/exec-capabilityboundingset-merge.service b/test/exec-capabilityboundingset-merge.service new file mode 100644 -index 0000000..5c7fcaf +index 000000000..5c7fcaf43 --- /dev/null +++ b/test/exec-capabilityboundingset-merge.service @@ -0,0 +1,8 @@ @@ -326,7 +326,7 @@ index 0000000..5c7fcaf +CapabilityBoundingSet=CAP_KILL CAP_CHOWN diff --git a/test/exec-capabilityboundingset-reset.service b/test/exec-capabilityboundingset-reset.service new file mode 100644 -index 0000000..d7d3320 +index 000000000..d7d332020 --- /dev/null +++ b/test/exec-capabilityboundingset-reset.service @@ -0,0 +1,8 @@ @@ -340,7 +340,7 @@ index 0000000..d7d3320 +CapabilityBoundingSet= diff --git a/test/exec-capabilityboundingset-simple.service b/test/exec-capabilityboundingset-simple.service new file mode 100644 -index 0000000..bf1a7f5 +index 000000000..bf1a7f575 --- /dev/null +++ b/test/exec-capabilityboundingset-simple.service @@ -0,0 +1,7 @@ diff --git a/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch b/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch index f3dad25..e967192 100644 --- a/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch +++ b/SOURCES/0469-namespace-don-t-fail-on-masked-mounts.patch @@ -15,7 +15,7 @@ Resolves: #1433687 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/shared/util.c b/src/shared/util.c -index 1070e32..3e13cc1 100644 +index 1070e32c4..3e13cc1fd 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -7332,22 +7332,21 @@ int bind_remount_recursive(const char *prefix, bool ro) { diff --git a/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch b/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch index 45c4a35..ff0d13c 100644 --- a/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch +++ b/SOURCES/0470-sysv-generator-Provides-network-should-also-pull-net.patch @@ -15,7 +15,7 @@ Resolves: #1438749 1 file changed, 3 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 7e0e7fc..fe6fae1 100644 +index 7e0e7fc28..fe6fae151 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -500,6 +500,9 @@ static int load_sysv(SysvStub *s) { diff --git a/SOURCES/0471-Install-correctly-report-symlink-creations.patch b/SOURCES/0471-Install-correctly-report-symlink-creations.patch index 20790be..3af8ca7 100644 --- a/SOURCES/0471-Install-correctly-report-symlink-creations.patch +++ b/SOURCES/0471-Install-correctly-report-symlink-creations.patch @@ -22,7 +22,7 @@ Resolves: #1435098 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/install.c b/src/shared/install.c -index bdfd7b9..e73f0c9 100644 +index bdfd7b96a..e73f0c95b 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -283,7 +283,7 @@ static int create_symlink( diff --git a/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch b/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch index 22b204f..9a4a0b7 100644 --- a/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch +++ b/SOURCES/0472-rules-40-redhat.rules-rules-should-be-on-one-line.patch @@ -10,7 +10,7 @@ Related: #1274401 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index c928d41..34a1df9 100644 +index c928d412b..34a1df9c4 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -29,14 +29,10 @@ ACTION=="remove", GOTO="zfcp_scsi_device_end" diff --git a/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch b/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch index 1aa1649..e5672b7 100644 --- a/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch +++ b/SOURCES/0473-tmpfiles-add-new-e-action-which-cleans-up-a-dir-with.patch @@ -18,23 +18,23 @@ Resolves: #1225739 2 files changed, 23 insertions(+), 37 deletions(-) diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml -index fc1fe13..fc9db62 100644 +index fc1fe13ac..fc9db622e 100644 --- a/man/tmpfiles.d.xml +++ b/man/tmpfiles.d.xml -@@ -162,6 +162,13 @@ +@@ -161,6 +161,13 @@ + <listitem><para>Create or empty a directory.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>e</varname></term> + <listitem><para>Clean directory contents based on the age argument. + Lines of this type accept shell-style globs in + place of normal path names.</para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>v</varname></term> <listitem><para>Create a subvolume if the path does not - exist yet and the file system supports this @@ -467,7 +474,7 @@ <para>The age field only applies to lines @@ -45,7 +45,7 @@ index fc1fe13..fc9db62 100644 <literal>-</literal>, no automatic clean-up is done.</para> diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index bda89df..df7676b 100644 +index bda89df5b..df7676b57 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -79,6 +79,7 @@ typedef enum ItemType { diff --git a/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch b/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch index cdaaf2b..1ba2f79 100644 --- a/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch +++ b/SOURCES/0474-util-bind_remount_recursive-handle-return-0-of-set_c.patch @@ -14,7 +14,7 @@ Resolves: #1433687 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/util.c b/src/shared/util.c -index 3e13cc1..cadadde 100644 +index 3e13cc1fd..cadaddee3 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -7327,7 +7327,7 @@ int bind_remount_recursive(const char *prefix, bool ro) { diff --git a/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch b/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch index e4a5b78..5fa27c0 100644 --- a/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch +++ b/SOURCES/0475-core-add-support-for-the-pids-cgroup-controller.patch @@ -40,7 +40,7 @@ Resolves: #1337244 14 files changed, 236 insertions(+), 27 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index 57b3b90..d367ccd 100644 +index 57b3b90be..d367ccd13 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -51,14 +51,14 @@ @@ -84,7 +84,7 @@ index 57b3b90..d367ccd 100644 for details on the per-unit settings.</para></listitem> </varlistentry> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml -index 8f4e7a3..6b9329b 100644 +index 8f4e7a3f1..6b9329bbe 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -103,10 +103,10 @@ @@ -123,7 +123,7 @@ index 8f4e7a3..6b9329b 100644 <varname>DefaultMemoryAccounting=</varname> in <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> </listitem> -@@ -186,10 +187,11 @@ +@@ -186,26 +187,64 @@ memory size in bytes. If the value is suffixed with K, M, G or T, the specified memory size is parsed as Kilobytes, Megabytes, Gigabytes, or Terabytes (with the base 1024), @@ -139,10 +139,10 @@ index 8f4e7a3..6b9329b 100644 url="https://www.kernel.org/doc/Documentation/cgroups/memory.txt">memory.txt</ulink>.</para> <para>Implies <literal>MemoryAccounting=true</literal>.</para> -@@ -197,15 +199,52 @@ + </listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>TasksAccounting=</varname></term> + + <listitem> @@ -179,7 +179,7 @@ index 8f4e7a3..6b9329b 100644 + </listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>BlockIOAccounting=</varname></term> <listitem> @@ -195,7 +195,7 @@ index 8f4e7a3..6b9329b 100644 <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> </listitem> diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index b7f08fb..d4a8f9c 100644 +index b7f08fb42..d4a8f9cbe 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -40,6 +40,7 @@ void cgroup_context_init(CGroupContext *c) { @@ -285,7 +285,7 @@ index b7f08fb..d4a8f9c 100644 [CGROUP_AUTO] = "auto", [CGROUP_CLOSED] = "closed", diff --git a/src/core/cgroup.h b/src/core/cgroup.h -index 8fa851d..8af3eaa 100644 +index 8fa851de3..8af3eaa3a 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -72,6 +72,7 @@ struct CGroupContext { @@ -314,7 +314,7 @@ index 8fa851d..8af3eaa 100644 const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_; CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_; diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index 4a9df06..a4465dc 100644 +index 4a9df0601..a4465dc7a 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -168,6 +168,8 @@ const sd_bus_vtable bus_cgroup_vtable[] = { @@ -380,7 +380,7 @@ index 4a9df06..a4465dc 100644 if (u->transient && u->load_state == UNIT_STUB) { diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c -index 056a17a..1d0d6f6 100644 +index 056a17ac1..1d0d6f67c 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -673,11 +673,36 @@ static int property_get_current_memory( @@ -421,7 +421,7 @@ index 056a17a..1d0d6f6 100644 }; diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index f996032..26e4c61 100644 +index f996032cf..26e4c618e 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -125,6 +125,8 @@ $1.StartupBlockIOWeight, config_parse_blockio_weight, 0, @@ -434,7 +434,7 @@ index f996032..26e4c61 100644 )m4_dnl Unit.Description, config_parse_unit_string_printf, 0, offsetof(Unit, description) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 7d1ac6c..7d2e737 100644 +index 7d1ac6c25..7d2e737d0 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3052,7 +3052,7 @@ int config_parse_memory_limit( @@ -496,7 +496,7 @@ index 7d1ac6c..7d2e737 100644 const char *unit, const char *filename, diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h -index 2059353..8d334f2 100644 +index 2059353d3..8d334f2c8 100644 --- a/src/core/load-fragment.h +++ b/src/core/load-fragment.h @@ -89,6 +89,7 @@ int config_parse_pass_environ(const char *unit, const char *filename, unsigned l @@ -508,7 +508,7 @@ index 2059353..8d334f2 100644 int config_parse_device_allow(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_blockio_weight(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); diff --git a/src/core/main.c b/src/core/main.c -index cba992c..aca05a5 100644 +index cba992cea..aca05a535 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -117,6 +117,7 @@ static bool arg_default_cpu_accounting = false; @@ -536,7 +536,7 @@ index cba992c..aca05a5 100644 m->shutdown_watchdog = arg_shutdown_watchdog; diff --git a/src/core/manager.h b/src/core/manager.h -index 231c076..96dcd83 100644 +index 231c076b1..96dcd83dc 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -261,6 +261,7 @@ struct Manager { @@ -548,7 +548,7 @@ index 231c076..96dcd83 100644 usec_t default_timer_accuracy_usec; diff --git a/src/core/unit.c b/src/core/unit.c -index 103f920..2fcb4fb 100644 +index 103f92084..2fcb4fbf0 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -126,6 +126,7 @@ static void unit_init(Unit *u) { @@ -560,7 +560,7 @@ index 103f920..2fcb4fb 100644 ec = unit_get_exec_context(u); diff --git a/src/shared/cgroup-util.h b/src/shared/cgroup-util.h -index 96a3d3b..31bd8d3 100644 +index 96a3d3baf..31bd8d311 100644 --- a/src/shared/cgroup-util.h +++ b/src/shared/cgroup-util.h @@ -35,6 +35,7 @@ typedef enum CGroupControllerMask { @@ -572,7 +572,7 @@ index 96a3d3b..31bd8d3 100644 } CGroupControllerMask; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 0333599..b1862b5 100644 +index 0333599c8..b1862b567 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -3280,6 +3280,8 @@ typedef struct UnitStatusInfo { diff --git a/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch b/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch index fdcf952..2c6a5dc 100644 --- a/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch +++ b/SOURCES/0476-core-add-new-DefaultTasksMax-setting-for-system.conf.patch @@ -22,7 +22,7 @@ Related: #1337244 10 files changed, 33 insertions(+), 7 deletions(-) diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml -index d367ccd..53e8ff6 100644 +index d367ccd13..53e8ff665 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -1,4 +1,4 @@ @@ -31,10 +31,11 @@ index d367ccd..53e8ff6 100644 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -@@ -320,6 +320,17 @@ +@@ -319,6 +319,17 @@ + for details on the per-unit settings.</para></listitem> </varlistentry> - <varlistentry> ++ <varlistentry> + <term><varname>DefaultTasksMax=</varname></term> + + <listitem><para>Configure the default value for the per-unit @@ -45,12 +46,11 @@ index d367ccd..53e8ff6 100644 + units.</para></listitem> + </varlistentry> + -+ <varlistentry> + <varlistentry> <term><varname>DefaultLimitCPU=</varname></term> <term><varname>DefaultLimitFSIZE=</varname></term> - <term><varname>DefaultLimitDATA=</varname></term> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml -index 6b9329b..217105e 100644 +index 6b9329bbe..217105ee5 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -231,7 +231,10 @@ @@ -66,7 +66,7 @@ index 6b9329b..217105e 100644 </varlistentry> diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 7ba1b51..c92f8c6 100644 +index 7ba1b519e..c92f8c6bf 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -2039,6 +2039,7 @@ const sd_bus_vtable bus_manager_vtable[] = { @@ -78,7 +78,7 @@ index 7ba1b51..c92f8c6 100644 SD_BUS_METHOD("GetUnit", "s", "o", method_get_unit, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetUnitByPID", "u", "o", method_get_unit_by_pid, SD_BUS_VTABLE_UNPRIVILEGED), diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 -index 26e4c61..b2fe627 100644 +index 26e4c618e..b2fe627af 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -126,7 +126,7 @@ $1.BlockIODeviceWeight, config_parse_blockio_device_weight, 0, @@ -91,7 +91,7 @@ index 26e4c61..b2fe627 100644 )m4_dnl Unit.Description, config_parse_unit_string_printf, 0, offsetof(Unit, description) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 7d2e737..c1ffee2 100644 +index 7d2e737d0..c1ffee2c7 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3081,12 +3081,11 @@ int config_parse_tasks_max( @@ -119,7 +119,7 @@ index 7d2e737..c1ffee2 100644 } diff --git a/src/core/main.c b/src/core/main.c -index aca05a5..50c9714 100644 +index aca05a535..50c9714f7 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -118,6 +118,7 @@ static bool arg_default_blockio_accounting = false; @@ -147,7 +147,7 @@ index aca05a5..50c9714 100644 m->shutdown_watchdog = arg_shutdown_watchdog; diff --git a/src/core/manager.h b/src/core/manager.h -index 96dcd83..e91e7bd 100644 +index 96dcd83dc..e91e7bd8b 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -263,6 +263,7 @@ struct Manager { @@ -159,7 +159,7 @@ index 96dcd83..e91e7bd 100644 struct rlimit *rlimit[_RLIMIT_MAX]; diff --git a/src/core/system.conf b/src/core/system.conf -index a11f599..91ef01c 100644 +index a11f59903..91ef01cd0 100644 --- a/src/core/system.conf +++ b/src/core/system.conf @@ -40,6 +40,8 @@ @@ -172,7 +172,7 @@ index a11f599..91ef01c 100644 #DefaultLimitFSIZE= #DefaultLimitDATA= diff --git a/src/core/unit.c b/src/core/unit.c -index 2fcb4fb..6a2ad6e 100644 +index 2fcb4fbf0..6a2ad6ed3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -127,6 +127,9 @@ static void unit_init(Unit *u) { @@ -186,7 +186,7 @@ index 2fcb4fb..6a2ad6e 100644 ec = unit_get_exec_context(u); diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c -index cf757d2..c5d9e4b 100644 +index cf757d2b2..c5d9e4bb5 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -1606,7 +1606,8 @@ static const char mask_names[] = diff --git a/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch b/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch index 1425404..78951ef 100644 --- a/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch +++ b/SOURCES/0477-logind-add-a-new-UserTasksMax-setting-to-logind.conf.patch @@ -32,7 +32,7 @@ Resolves: #1337244 9 files changed, 160 insertions(+), 25 deletions(-) diff --git a/man/logind.conf.xml b/man/logind.conf.xml -index 54651f0..bcc8ee9 100644 +index 54651f07d..bcc8ee975 100644 --- a/man/logind.conf.xml +++ b/man/logind.conf.xml @@ -1,4 +1,4 @@ @@ -62,7 +62,7 @@ index 54651f0..bcc8ee9 100644 <varlistentry> diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index fb84e92..63b9a0d 100644 +index fb84e92e5..63b9a0df3 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2325,13 +2325,101 @@ int manager_dispatch_delayed(Manager *manager) { @@ -180,7 +180,7 @@ index fb84e92..63b9a0d 100644 if (r < 0) return r; diff --git a/src/login/logind-gperf.gperf b/src/login/logind-gperf.gperf -index 6246067..8a064e2 100644 +index 62460673b..8a064e2a9 100644 --- a/src/login/logind-gperf.gperf +++ b/src/login/logind-gperf.gperf @@ -33,3 +33,4 @@ Login.IdleAction, config_parse_handle_action, 0, offsetof(Manag @@ -189,7 +189,7 @@ index 6246067..8a064e2 100644 Login.RemoveIPC, config_parse_bool, 0, offsetof(Manager, remove_ipc) +Login.UserTasksMax, config_parse_uint64, 0, offsetof(Manager, user_tasks_max) diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index 746e50a..4575a02 100644 +index 746e50aa5..4575a029f 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -510,21 +510,28 @@ static int session_start_scope(Session *s) { @@ -239,7 +239,7 @@ index 746e50a..4575a02 100644 return 0; } diff --git a/src/login/logind-session.h b/src/login/logind-session.h -index 5002b68..d662082 100644 +index 5002b6868..d662082d8 100644 --- a/src/login/logind-session.h +++ b/src/login/logind-session.h @@ -115,7 +115,8 @@ struct Session { @@ -253,7 +253,7 @@ index 5002b68..d662082 100644 sd_bus_message *create_message; diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index 97eb4fe..4298704 100644 +index 97eb4feca..4298704ce 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -33,6 +33,7 @@ @@ -329,7 +329,7 @@ index 97eb4fe..4298704 100644 return 0; } diff --git a/src/login/logind.c b/src/login/logind.c -index e8d0669..16c931c 100644 +index e8d0669bb..16c931c3e 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -63,6 +63,7 @@ Manager *manager_new(void) { @@ -341,7 +341,7 @@ index e8d0669..16c931c 100644 m->devices = hashmap_new(&string_hash_ops); m->seats = hashmap_new(&string_hash_ops); diff --git a/src/login/logind.conf b/src/login/logind.conf -index be8d7df..d33e0b3 100644 +index be8d7dff2..d33e0b34d 100644 --- a/src/login/logind.conf +++ b/src/login/logind.conf @@ -31,3 +31,4 @@ @@ -350,7 +350,7 @@ index be8d7df..d33e0b3 100644 #RemoveIPC=no +#UserTasksMax= diff --git a/src/login/logind.h b/src/login/logind.h -index e0cb7d0..8503eb2 100644 +index e0cb7d023..8503eb24d 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -128,6 +128,7 @@ struct Manager { diff --git a/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch b/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch index c234520..67dac1d 100644 --- a/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch +++ b/SOURCES/0478-core-support-percentage-specifications-on-TasksMax.patch @@ -20,7 +20,7 @@ Related: #1337244 7 files changed, 187 insertions(+), 12 deletions(-) diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml -index 217105e..f507c67 100644 +index 217105ee5..f507c6748 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -221,15 +221,12 @@ @@ -46,7 +46,7 @@ index 217105e..f507c67 100644 <para>Implies <literal>TasksAccounting=true</literal>. The system default for this setting may be controlled with diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c -index a4465dc..fa76c60 100644 +index a4465dc7a..fa76c60c1 100644 --- a/src/core/dbus-cgroup.c +++ b/src/core/dbus-cgroup.c @@ -694,6 +694,8 @@ int bus_cgroup_set_property( @@ -58,10 +58,11 @@ index a4465dc..fa76c60 100644 if (mode != UNIT_CHECK) { c->tasks_max = limit; -@@ -706,6 +708,26 @@ int bus_cgroup_set_property( +@@ -705,6 +707,26 @@ int bus_cgroup_set_property( + unit_write_drop_in_private_format(u, mode, name, "TasksMax=%" PRIu64, limit); } - return 1; ++ return 1; + } else if (streq(name, "TasksMaxScale")) { + uint64_t limit; + uint32_t raw; @@ -81,12 +82,11 @@ index a4465dc..fa76c60 100644 + (uint32_t) (DIV_ROUND_UP((uint64_t) raw * 100U, (uint64_t) UINT32_MAX))); + } + -+ return 1; + return 1; } - if (u->transient && u->load_state == UNIT_STUB) { diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index c1ffee2..4114750 100644 +index c1ffee2c7..411475024 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3089,9 +3089,18 @@ int config_parse_tasks_max( @@ -112,7 +112,7 @@ index c1ffee2..4114750 100644 } diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index ed0849b..f46fa2b 100644 +index ed0849b63..f46fa2bbf 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1409,7 +1409,26 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen @@ -143,7 +143,7 @@ index ed0849b..f46fa2b 100644 uint64_t u; diff --git a/src/shared/util.c b/src/shared/util.c -index cadadde..bbb4577 100644 +index cadaddee3..bbb457759 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -94,6 +94,7 @@ @@ -242,7 +242,7 @@ index cadadde..bbb4577 100644 + return m / max; +} diff --git a/src/shared/util.h b/src/shared/util.h -index 12afcc3..f1b6c34 100644 +index 12afcc342..f1b6c348f 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -1098,3 +1098,8 @@ typedef enum ExtractFlags { @@ -255,7 +255,7 @@ index 12afcc3..f1b6c34 100644 +uint64_t system_tasks_max(void); +uint64_t system_tasks_max_scale(uint64_t v, uint64_t max); diff --git a/src/test/test-util.c b/src/test/test-util.c -index 9ae347b..971f97d 100644 +index 9ae347b43..971f97d7c 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -1530,6 +1530,43 @@ static void test_shell_maybe_quote(void) { diff --git a/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch b/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch index a90101f..540a1bf 100644 --- a/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch +++ b/SOURCES/0479-core-reinstate-propagation-of-stop-restart-jobs-via-.patch @@ -25,7 +25,7 @@ Related: #1436021 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/src/core/transaction.c b/src/core/transaction.c -index 57e9cb3..428b767 100644 +index 57e9cb3f8..428b7671b 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -1008,40 +1008,25 @@ int transaction_add_job_and_dependencies( diff --git a/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch b/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch index 65266bb..4053e4e 100644 --- a/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch +++ b/SOURCES/0480-core-when-propagating-restart-requests-due-to-deps-d.patch @@ -24,7 +24,7 @@ Resolves: #1436021 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/core/job.c b/src/core/job.c -index 7032864..1617e24 100644 +index 703286496..1617e24c0 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -392,38 +392,38 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { @@ -81,7 +81,7 @@ index 7032864..1617e24 100644 } diff --git a/src/core/job.h b/src/core/job.h -index e4191ee..ce81607 100644 +index e4191ee77..ce81607de 100644 --- a/src/core/job.h +++ b/src/core/job.h @@ -210,7 +210,7 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) _pure_; @@ -94,7 +94,7 @@ index e4191ee..ce81607 100644 int job_type_merge_and_collapse(JobType *a, JobType b, Unit *u); diff --git a/src/core/manager.c b/src/core/manager.c -index 8bd80e6..287cf6a 100644 +index 8bd80e687..287cf6a74 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1303,7 +1303,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove @@ -107,7 +107,7 @@ index 8bd80e6..287cf6a 100644 tr = transaction_new(mode == JOB_REPLACE_IRREVERSIBLY); if (!tr) diff --git a/src/core/transaction.c b/src/core/transaction.c -index 428b767..34df157 100644 +index 428b7671b..34df15718 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -855,8 +855,7 @@ int transaction_add_job_and_dependencies( diff --git a/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch b/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch index a31278f..4c49410 100644 --- a/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch +++ b/SOURCES/0481-core-properly-handle-jobs-that-are-suppressed-to-JOB.patch @@ -11,7 +11,7 @@ Resolves: #1436021 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/transaction.c b/src/core/transaction.c -index 34df157..66bbb60 100644 +index 34df15718..66bbb6066 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -1023,8 +1023,13 @@ int transaction_add_job_and_dependencies( diff --git a/SOURCES/0482-tests-set-tasks_max-to-infinity.patch b/SOURCES/0482-tests-set-tasks_max-to-infinity.patch index 74692de..3d35647 100644 --- a/SOURCES/0482-tests-set-tasks_max-to-infinity.patch +++ b/SOURCES/0482-tests-set-tasks_max-to-infinity.patch @@ -13,13 +13,14 @@ Related: #1337244 2 files changed, 16 insertions(+) diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c -index 9e9de23..471adb2 100644 +index 9e9de23e0..471adb25b 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c -@@ -46,6 +46,17 @@ static int test_cgroup_mask(void) { +@@ -45,6 +45,17 @@ static int test_cgroup_mask(void) { + puts("manager_new: Permission denied. Skipping test."); return EXIT_TEST_SKIP; } - assert_se(r >= 0); ++ assert_se(r >= 0); + + /* Turn off all kinds of default accouning, so that we can + * verify the masks resulting of our configuration and nothing @@ -30,12 +31,11 @@ index 9e9de23..471adb2 100644 + m->default_tasks_accounting = false; + m->default_tasks_max = (uint64_t) -1; + -+ assert_se(r >= 0); + assert_se(r >= 0); assert_se(manager_startup(m, serial, fdset) >= 0); - /* Load units and verify hierarchy. */ diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 8e70702..627097f 100644 +index 8e70702cb..627097fcf 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -270,6 +270,11 @@ int main(int argc, char *argv[]) { diff --git a/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch b/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch index 1dc39f2..85acc3d 100644 --- a/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch +++ b/SOURCES/0483-Avoid-forever-loop-for-journalctl-list-boots-command.patch @@ -21,7 +21,7 @@ Related: #1294516 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index 723854a..c771cff 100644 +index 723854a2e..c771cff8b 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1039,7 +1039,7 @@ static int get_boots( diff --git a/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch b/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch index 82b87c5..a53f4b3 100644 --- a/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch +++ b/SOURCES/0484-sd-journal-return-SD_JOURNAL_INVALIDATE-only-if-jour.patch @@ -27,7 +27,7 @@ Resolves: #1446140 1 file changed, 1 insertion(+) diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c -index 20456c3..72f312b 100644 +index 20456c3a1..72f312b67 100644 --- a/src/journal/sd-journal.c +++ b/src/journal/sd-journal.c @@ -2190,6 +2190,7 @@ _public_ int sd_journal_process(sd_journal *j) { diff --git a/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch b/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch index 72d7243..a4b0a15 100644 --- a/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch +++ b/SOURCES/0485-load-fragment-don-t-print-error-about-incorrect-synt.patch @@ -12,7 +12,7 @@ Resolves: #1377055 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index 4114750..58e44b8 100644 +index 411475024..58e44b89b 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -367,8 +367,9 @@ int config_parse_socket_listen(const char *unit, diff --git a/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch b/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch index 3b2886d..2f32336 100644 --- a/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch +++ b/SOURCES/0486-core-manager-add-some-missing-dbus-properties.patch @@ -14,7 +14,7 @@ Resolves: #1427927 1 file changed, 10 insertions(+) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index c92f8c6..9d4f633 100644 +index c92f8c6bf..9d4f63377 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -2039,6 +2039,16 @@ const sd_bus_vtable bus_manager_vtable[] = { diff --git a/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch b/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch index 534ee6a..135a0d7 100644 --- a/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch +++ b/SOURCES/0487-core-manager-expose-DefaultLimit-as-properties-on-db.patch @@ -16,7 +16,7 @@ Resolves: #1427927 3 files changed, 56 insertions(+) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c -index 9d4f633..d34ed04 100644 +index 9d4f63377..d34ed042f 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -2049,6 +2049,22 @@ const sd_bus_vtable bus_manager_vtable[] = { @@ -43,7 +43,7 @@ index 9d4f633..d34ed04 100644 SD_BUS_METHOD("GetUnit", "s", "o", method_get_unit, SD_BUS_VTABLE_UNPRIVILEGED), diff --git a/src/libsystemd/sd-bus/bus-util.c b/src/libsystemd/sd-bus/bus-util.c -index f46fa2b..2634574 100644 +index f46fa2bbf..263457427 100644 --- a/src/libsystemd/sd-bus/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c @@ -1937,3 +1937,42 @@ int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, Un @@ -90,7 +90,7 @@ index f46fa2b..2634574 100644 + return sd_bus_message_append(reply, "t", u); +} diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h -index 8c8846c..d5f4e97 100644 +index 8c8846c6e..d5f4e9750 100644 --- a/src/libsystemd/sd-bus/bus-util.h +++ b/src/libsystemd/sd-bus/bus-util.h @@ -214,3 +214,4 @@ int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet); diff --git a/SOURCES/0488-fstab-generator-remove-bogus-condition.patch b/SOURCES/0488-fstab-generator-remove-bogus-condition.patch index 32a1d56..a62491f 100644 --- a/SOURCES/0488-fstab-generator-remove-bogus-condition.patch +++ b/SOURCES/0488-fstab-generator-remove-bogus-condition.patch @@ -16,7 +16,7 @@ Resolves: #1446171 1 file changed, 2 deletions(-) diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c -index 32aca22..23b5457 100644 +index 32aca2244..23b5457e4 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -476,8 +476,6 @@ static int parse_fstab(bool initrd) { diff --git a/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch b/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch index 39d36d0..92d72b9 100644 --- a/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch +++ b/SOURCES/0489-readahead-collect-don-t-print-warning-message-when-h.patch @@ -14,7 +14,7 @@ Resolves: #1387095 1 file changed, 3 insertions(+) diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c -index 822a803..90f7f70 100644 +index 822a803a4..90f7f70bc 100644 --- a/src/readahead/readahead-collect.c +++ b/src/readahead/readahead-collect.c @@ -106,6 +106,9 @@ static int pack_file(FILE *pack, const char *fn, bool on_btrfs) { diff --git a/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch b/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch index abb27ed..101ea0b 100644 --- a/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch +++ b/SOURCES/0490-tmpfiles-don-t-recursively-descend-into-journal-dire.patch @@ -24,7 +24,7 @@ Related: #1411199 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4 -index b447b01..d9d51af 100644 +index b447b01f5..d9d51af92 100644 --- a/tmpfiles.d/systemd.conf.m4 +++ b/tmpfiles.d/systemd.conf.m4 @@ -35,7 +35,7 @@ z /var/log/journal 2755 root systemd-journal - - diff --git a/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch b/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch index 9b5cf4f..8848799 100644 --- a/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch +++ b/SOURCES/0491-tmpfiles-also-set-acls-on-var-log-journal.patch @@ -15,7 +15,7 @@ Related: #1411199 1 file changed, 2 insertions(+) diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4 -index d9d51af..fcd6ec0 100644 +index d9d51af92..fcd6ec026 100644 --- a/tmpfiles.d/systemd.conf.m4 +++ b/tmpfiles.d/systemd.conf.m4 @@ -34,6 +34,8 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x diff --git a/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch b/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch index 50c0149..24d608e 100644 --- a/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch +++ b/SOURCES/0492-tmpfiles-set-acls-on-system.journal-explicitly.patch @@ -11,7 +11,7 @@ Resolves: #1411199 1 file changed, 2 insertions(+) diff --git a/tmpfiles.d/systemd.conf.m4 b/tmpfiles.d/systemd.conf.m4 -index fcd6ec0..0575408 100644 +index fcd6ec026..0575408db 100644 --- a/tmpfiles.d/systemd.conf.m4 +++ b/tmpfiles.d/systemd.conf.m4 @@ -33,11 +33,13 @@ A+ /run/log/journal/%m - - - - group:adm:r-x,group:wheel:r-x diff --git a/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch b/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch index 7f3d89f..990ea6f 100644 --- a/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch +++ b/SOURCES/0493-sysctl-configure-kernel-parameters-in-the-order-they.patch @@ -42,7 +42,7 @@ Resolves: #1382244 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index 4fb293b..bb2bea7 100644 +index 4fb293b9b..bb2bea7cd 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -90,14 +90,14 @@ static int apply_sysctl(const char *property, const char *value) { diff --git a/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch b/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch index 7766cd1..fabc78f 100644 --- a/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch +++ b/SOURCES/0494-units-drop-explicit-NotifyAccess-setting-from-journa.patch @@ -18,7 +18,7 @@ Resolves: #1444356 1 file changed, 1 deletion(-) diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 8575912..c85c349 100644 +index 8575912bb..c85c34932 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in @@ -19,7 +19,6 @@ Sockets=systemd-journald.socket diff --git a/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch b/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch index 122feb5..1873610 100644 --- a/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch +++ b/SOURCES/0495-systemd-notify-Always-pass-a-valid-pid-to-sd_pid_not.patch @@ -18,7 +18,7 @@ Resolves: #1381743 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/notify/notify.c b/src/notify/notify.c -index c89a6cc..0d38299 100644 +index c89a6cc06..0d382992a 100644 --- a/src/notify/notify.c +++ b/src/notify/notify.c @@ -209,7 +209,7 @@ int main(int argc, char* argv[]) { diff --git a/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch b/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch index 17e7eea..e9c1a13 100644 --- a/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch +++ b/SOURCES/0496-sd_pid_notify_with_fds-fix-computing-msg_controllen.patch @@ -13,7 +13,7 @@ Resolves: #1381743 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c -index 1474321..2c4dd9d 100644 +index 1474321c9..2c4dd9d22 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -397,8 +397,9 @@ _public_ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char diff --git a/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch b/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch index b9f2cb7..f192f24 100644 --- a/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch +++ b/SOURCES/0497-rules-move-cpu-hotplug-rule-to-separate-file.patch @@ -22,7 +22,7 @@ rule when generating kdump initrd] create mode 100644 rules/40-redhat-cpu-hotplug.rules diff --git a/Makefile.am b/Makefile.am -index e9ceac9..94fee02 100644 +index e9ceac98a..94fee02c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3511,6 +3511,7 @@ dist_udevrules_DATA += \ @@ -35,7 +35,7 @@ index e9ceac9..94fee02 100644 diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules new file mode 100644 -index 0000000..bc5ddc8 +index 000000000..bc5ddc841 --- /dev/null +++ b/rules/40-redhat-cpu-hotplug.rules @@ -0,0 +1,4 @@ @@ -44,7 +44,7 @@ index 0000000..bc5ddc8 +# CPU hotadd request +SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index 34a1df9..d04c7fc 100644 +index 34a1df9c4..d04c7fc9a 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -1,8 +1,5 @@ diff --git a/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch b/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch index 7b83053..dd6ae56 100644 --- a/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch +++ b/SOURCES/0498-Revert-rules-move-cpu-hotplug-rule-to-separate-file.patch @@ -13,7 +13,7 @@ Resolves: #1465108 delete mode 100644 rules/40-redhat-cpu-hotplug.rules diff --git a/Makefile.am b/Makefile.am -index 94fee02..e9ceac9 100644 +index 94fee02c5..e9ceac98a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3511,7 +3511,6 @@ dist_udevrules_DATA += \ @@ -26,7 +26,7 @@ index 94fee02..e9ceac9 100644 diff --git a/rules/40-redhat-cpu-hotplug.rules b/rules/40-redhat-cpu-hotplug.rules deleted file mode 100644 -index bc5ddc8..0000000 +index bc5ddc841..000000000 --- a/rules/40-redhat-cpu-hotplug.rules +++ /dev/null @@ -1,4 +0,0 @@ @@ -35,7 +35,7 @@ index bc5ddc8..0000000 -# CPU hotadd request -SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" diff --git a/rules/40-redhat.rules b/rules/40-redhat.rules -index d04c7fc..34a1df9 100644 +index d04c7fc9a..34a1df9c4 100644 --- a/rules/40-redhat.rules +++ b/rules/40-redhat.rules @@ -1,5 +1,8 @@ diff --git a/SOURCES/0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch b/SOURCES/0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch index 8f0ab76..92b8938 100644 --- a/SOURCES/0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch +++ b/SOURCES/0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch @@ -14,7 +14,7 @@ Resolves: #1477285 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 7c15435..19e1f26 100644 +index 7c154355d..19e1f2631 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -38,7 +38,7 @@ diff --git a/SOURCES/0500-sysctl-fix-uninitialized-variable.patch b/SOURCES/0500-sysctl-fix-uninitialized-variable.patch index 01b32c4..11226b8 100644 --- a/SOURCES/0500-sysctl-fix-uninitialized-variable.patch +++ b/SOURCES/0500-sysctl-fix-uninitialized-variable.patch @@ -13,7 +13,7 @@ Resolves: #1485121 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index bb2bea7..7fb016c 100644 +index bb2bea7cd..7fb016cee 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -91,7 +91,7 @@ static int apply_sysctl(const char *property, const char *value) { diff --git a/SOURCES/0501-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch b/SOURCES/0501-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch index fafe743..b497247 100644 --- a/SOURCES/0501-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch +++ b/SOURCES/0501-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch @@ -12,7 +12,7 @@ Resolves: #1306539 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index bc115f1..0ba0792 100644 +index bc115f112..0ba079201 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -610,7 +610,11 @@ static int spawn_wait(struct udev_event *event, diff --git a/SOURCES/0502-manager-when-reexecuting-try-to-connect-to-bus-only-.patch b/SOURCES/0502-manager-when-reexecuting-try-to-connect-to-bus-only-.patch index 1267f74..d66b01e 100644 --- a/SOURCES/0502-manager-when-reexecuting-try-to-connect-to-bus-only-.patch +++ b/SOURCES/0502-manager-when-reexecuting-try-to-connect-to-bus-only-.patch @@ -20,7 +20,7 @@ Resolves: #1465737 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 287cf6a..041fac4 100644 +index 287cf6a74..041fac46b 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -799,16 +799,19 @@ static int manager_setup_kdbus(Manager *m) { diff --git a/SOURCES/0503-unmount-Pass-in-mount-options-when-remounting-read-o.patch b/SOURCES/0503-unmount-Pass-in-mount-options-when-remounting-read-o.patch new file mode 100644 index 0000000..fe9a804 --- /dev/null +++ b/SOURCES/0503-unmount-Pass-in-mount-options-when-remounting-read-o.patch @@ -0,0 +1,104 @@ +From 02a5d91ec022be1188875e0f169277cef3b11ad6 Mon Sep 17 00:00:00 2001 +From: Jan Janssen <medhefgo@web.de> +Date: Mon, 26 Oct 2015 15:13:28 +0100 +Subject: [PATCH] unmount: Pass in mount options when remounting read-only + +man 2 mount says that the mountflags and data parameteres should +match the original values except for the desired changes. We only +bother with the mount options since the only flags we can change +are MS_RDONLY, MS_SYNCHRONOUS and MS_MANDLOCK; which shouldn't +matter too much. + +Fixes: #351 + +(cherry picked from commit 471b48ed2ff6539e7071ff4694c03483c5835639) + +Related: #1312002 +--- + src/core/umount.c | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +diff --git a/src/core/umount.c b/src/core/umount.c +index dd7df194d..bfd8aa5f8 100644 +--- a/src/core/umount.c ++++ b/src/core/umount.c +@@ -28,6 +28,7 @@ + #include <linux/loop.h> + #include <linux/dm-ioctl.h> + ++#include "fstab-util.h" + #include "list.h" + #include "mount-setup.h" + #include "umount.h" +@@ -39,6 +40,7 @@ + + typedef struct MountPoint { + char *path; ++ char *options; + dev_t devnum; + LIST_FIELDS(struct MountPoint, mount_point); + } MountPoint; +@@ -71,7 +73,7 @@ static int mount_points_list_get(MountPoint **head) { + return -errno; + + for (i = 1;; i++) { +- _cleanup_free_ char *path = NULL; ++ _cleanup_free_ char *path = NULL, *options = NULL; + char *p = NULL; + MountPoint *m; + int k; +@@ -82,15 +84,15 @@ static int mount_points_list_get(MountPoint **head) { + "%*s " /* (3) major:minor */ + "%*s " /* (4) root */ + "%ms " /* (5) mount point */ +- "%*s" /* (6) mount options */ ++ "%*s" /* (6) mount flags */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ + "%*s " /* (9) file system type */ + "%*s" /* (10) mount source */ +- "%*s" /* (11) mount options 2 */ ++ "%ms" /* (11) mount options */ + "%*[^\n]", /* some rubbish at the end */ +- &path); +- if (k != 1) { ++ &path, &options); ++ if (k != 2) { + if (k == EOF) + break; + +@@ -125,6 +127,9 @@ static int mount_points_list_get(MountPoint **head) { + } + + m->path = p; ++ m->options = options; ++ options = NULL; ++ + LIST_PREPEND(mount_point, *head, m); + } + +@@ -368,6 +373,14 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e + benefits, but might confuse the host, as we remount + the superblock here, not the bind mound. */ + if (detect_container(NULL) <= 0) { ++ _cleanup_free_ char *options = NULL; ++ /* MS_REMOUNT requires that the data parameter ++ * should be the same from the original mount ++ * except for the desired changes. Since we want ++ * to remount read-only, we should filter out ++ * rw (and ro too, because it confuses the kernel) */ ++ (void) fstab_filter_options(m->options, "rw\0ro\0", NULL, NULL, &options); ++ + /* We always try to remount directories + * read-only first, before we go on and umount + * them. +@@ -384,7 +397,8 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e + * alias read-only we hence should be + * relatively safe regarding keeping the fs we + * can otherwise not see dirty. */ +- mount(NULL, m->path, NULL, MS_REMOUNT|MS_RDONLY, NULL); ++ log_info("Remounting '%s' read-only with options '%s'.", m->path, options); ++ (void) mount(NULL, m->path, NULL, MS_REMOUNT|MS_RDONLY, options); + } + + /* Skip / and /usr since we cannot unmount that diff --git a/SOURCES/0504-shutdown-don-t-remount-ro-network-filesystems.-6588.patch b/SOURCES/0504-shutdown-don-t-remount-ro-network-filesystems.-6588.patch new file mode 100644 index 0000000..0581aa2 --- /dev/null +++ b/SOURCES/0504-shutdown-don-t-remount-ro-network-filesystems.-6588.patch @@ -0,0 +1,76 @@ +From c6bb93f0b564d6c0eea9e35197b66521693b2078 Mon Sep 17 00:00:00 2001 +From: NeilBrown <neil@brown.name> +Date: Thu, 31 Aug 2017 02:48:25 +1000 +Subject: [PATCH] shutdown: don't remount,ro network filesystems. (#6588) + +systemd-shutdown is run after the network is stopped, +so remounting a network filesystem read-only can hang. +A simple umount is the most useful thing that can +be done for a network filesystem once the network is down. + +(cherry picked from commit 9cbc4547702aac28466c497f720038b9e2dc510c) + +Resolves: #1312002 +--- + src/core/umount.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/src/core/umount.c b/src/core/umount.c +index bfd8aa5f8..6e8ccc794 100644 +--- a/src/core/umount.c ++++ b/src/core/umount.c +@@ -41,6 +41,7 @@ + typedef struct MountPoint { + char *path; + char *options; ++ char *type; + dev_t devnum; + LIST_FIELDS(struct MountPoint, mount_point); + } MountPoint; +@@ -73,7 +74,7 @@ static int mount_points_list_get(MountPoint **head) { + return -errno; + + for (i = 1;; i++) { +- _cleanup_free_ char *path = NULL, *options = NULL; ++ _cleanup_free_ char *path = NULL, *options = NULL, *type = NULL; + char *p = NULL; + MountPoint *m; + int k; +@@ -87,11 +88,11 @@ static int mount_points_list_get(MountPoint **head) { + "%*s" /* (6) mount flags */ + "%*[^-]" /* (7) optional fields */ + "- " /* (8) separator */ +- "%*s " /* (9) file system type */ ++ "%ms " /* (9) file system type */ + "%*s" /* (10) mount source */ + "%ms" /* (11) mount options */ + "%*[^\n]", /* some rubbish at the end */ +- &path, &options); ++ &path, &type, &options); + if (k != 2) { + if (k == EOF) + break; +@@ -129,6 +130,8 @@ static int mount_points_list_get(MountPoint **head) { + m->path = p; + m->options = options; + options = NULL; ++ m->type = type; ++ type = NULL; + + LIST_PREPEND(mount_point, *head, m); + } +@@ -371,8 +374,12 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e + /* If we are in a container, don't attempt to + read-only mount anything as that brings no real + benefits, but might confuse the host, as we remount +- the superblock here, not the bind mound. */ +- if (detect_container(NULL) <= 0) { ++ the superblock here, not the bind mount. ++ If the filesystem is a network fs, also skip the ++ remount. It brings no value (we cannot leave ++ a "dirty fs") and could hang if the network is down. */ ++ if (detect_container(NULL) <= 0 && ++ !fstype_is_network(m->type)) { + _cleanup_free_ char *options = NULL; + /* MS_REMOUNT requires that the data parameter + * should be the same from the original mount diff --git a/SOURCES/0505-shutdown-fix-incorrect-fscanf-result-check-6806.patch b/SOURCES/0505-shutdown-fix-incorrect-fscanf-result-check-6806.patch new file mode 100644 index 0000000..eea0ee6 --- /dev/null +++ b/SOURCES/0505-shutdown-fix-incorrect-fscanf-result-check-6806.patch @@ -0,0 +1,29 @@ +From b0630cdbb8f16850f6a62447328df77130059efc Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Wed, 13 Sep 2017 10:08:37 +0200 +Subject: [PATCH] shutdown: fix incorrect fscanf() result check (#6806) + +A correction for 090e3c9796ef6468d4f396610804d62f6ffd797f. + +Fixes: #6796 + +(cherry-picked from: 3d4ec01269244c2d35a781abf748ea9ba57666e2) + +Related: #1312002 +--- + src/core/umount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/umount.c b/src/core/umount.c +index 6e8ccc794..3eec0d459 100644 +--- a/src/core/umount.c ++++ b/src/core/umount.c +@@ -93,7 +93,7 @@ static int mount_points_list_get(MountPoint **head) { + "%ms" /* (11) mount options */ + "%*[^\n]", /* some rubbish at the end */ + &path, &type, &options); +- if (k != 2) { ++ if (k != 3) { + if (k == EOF) + break; + diff --git a/SOURCES/0506-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch b/SOURCES/0506-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch new file mode 100644 index 0000000..b69a75d --- /dev/null +++ b/SOURCES/0506-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch @@ -0,0 +1,34 @@ +From f4cfab4baa2365ca1484b7e43a9da434aa102153 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar <msekletar@users.noreply.github.com> +Date: Wed, 1 Nov 2017 02:25:48 -0700 +Subject: [PATCH] manager: fix connecting to bus when dbus is actually around + (#7205) + +manager_connect_bus() is called *before* manager_coldplug(). As a last +thing in service_coldplug() we set service state to +s->deserialized_state, and thus before we do that all services are +inactive and try_connect always evaluates to false. To fix that we must +look at deserialized state instead of current unit state. + +Fixes #7146 + +(cherry picked from commit 41dfa61d35c51a584437481d20541d5c3ccfa93d) + +Related: #1465737 +--- + src/core/manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index 041fac46b..47b09e1e9 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -809,7 +809,7 @@ static int manager_connect_bus(Manager *m, bool reexecuting) { + u = manager_get_unit(m, SPECIAL_DBUS_SERVICE); + + try_bus_connect = +- (u && UNIT_IS_ACTIVE_OR_RELOADING(unit_active_state(u))) && ++ (u && SERVICE(u)->deserialized_state == SERVICE_RUNNING) && + (reexecuting || + (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS"))); + diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index 930a099..4f3689a 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -7,7 +7,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 219 -Release: 42%{?dist}.4 +Release: 42%{?dist}.6 # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -541,6 +541,10 @@ Patch0499: 0499-Revert-udev-net_id-add-support-for-phys_port_name-at.patch Patch0500: 0500-sysctl-fix-uninitialized-variable.patch Patch0501: 0501-udev-ignore-SIGCHLD-from-unexpected-processes-130653.patch Patch0502: 0502-manager-when-reexecuting-try-to-connect-to-bus-only-.patch +Patch0503: 0503-unmount-Pass-in-mount-options-when-remounting-read-o.patch +Patch0504: 0504-shutdown-don-t-remount-ro-network-filesystems.-6588.patch +Patch0505: 0505-shutdown-fix-incorrect-fscanf-result-check-6806.patch +Patch0506: 0506-manager-fix-connecting-to-bus-when-dbus-is-actually-.patch %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} @@ -1509,6 +1513,14 @@ fi %{_mandir}/man8/systemd-resolved.* %changelog +* Tue Jan 09 2018 Lukas Nykryn <lnykryn@redhat.com> - 219-42.6 +- manager: fix connecting to bus when dbus is actually around (#7205) (#1465737) + +* Thu Dec 07 2017 Lukas Nykryn <lnykryn@redhat.com> - 219-42.5 +- unmount: Pass in mount options when remounting read-only (#1312002) +- shutdown: don't remount,ro network filesystems. (#6588) (#1312002) +- shutdown: fix incorrect fscanf() result check (#6806) (#1312002) + * Fri Sep 29 2017 Lukas Nykryn <lnykryn@redhat.com> - 219-42.4 - manager: when reexecuting try to connect to bus only when dbus.service is around (#6773) (#1465737)