From e03fc0c71ae1afd24fdfa029ef0aa717c9c61da44959e4b4299dce4f6e175314 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 28 May 2019 12:15:03 +0000 Subject: [PATCH] Accepting request 705895 from home:fbui:systemd:openSUSE-Factory - Import commit eaa7b8b148927d471609de75e542dffcc1b36df4 7e58b89136 udevd: change the default value of udev.children-max (again) (bsc#1107617) - Add 0001-rc-local-generator-deprecate-halt.local-support.patch /etc/init.d/halt.local support will removed from the next systemd version (v243) so for now on warn (hopefully the few) users who rely on this script so they have a chance to switch to systemd-shutdown interface. OBS-URL: https://build.opensuse.org/request/show/705895 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1064 --- ...nerator-deprecate-halt.local-support.patch | 31 +++++++++++++++++++ systemd-mini.changes | 17 ++++++++++ systemd-mini.spec | 3 +- systemd-v242+suse.75.g9984a86d0d.tar.xz | 3 -- systemd-v242+suse.77.geaa7b8b148.tar.xz | 3 ++ systemd.changes | 17 ++++++++++ systemd.spec | 3 +- 7 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 0001-rc-local-generator-deprecate-halt.local-support.patch delete mode 100644 systemd-v242+suse.75.g9984a86d0d.tar.xz create mode 100644 systemd-v242+suse.77.geaa7b8b148.tar.xz diff --git a/0001-rc-local-generator-deprecate-halt.local-support.patch b/0001-rc-local-generator-deprecate-halt.local-support.patch new file mode 100644 index 00000000..cda1fa59 --- /dev/null +++ b/0001-rc-local-generator-deprecate-halt.local-support.patch @@ -0,0 +1,31 @@ +From 5e397db506aa75e50387bdcb6bfd3d4fa7ac92e7 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Mon, 27 May 2019 14:50:36 +0200 +Subject: [PATCH] rc-local-generator: deprecate halt.local support + +Its support will be dropped after systemd v242, see [1]. So let's give users of +this script a chance to replace it nicely. + +[1] https://github.com/systemd/systemd/pull/12571 +--- + src/rc-local-generator/rc-local-generator.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c +index 7a3948e92d..5699c4f876 100644 +--- a/src/rc-local-generator/rc-local-generator.c ++++ b/src/rc-local-generator/rc-local-generator.c +@@ -68,6 +68,10 @@ static int run(const char *dest, const char *dest_early, const char *dest_late) + if (check_executable(RC_LOCAL_SCRIPT_PATH_STOP) >= 0) { + log_debug("Automatically adding halt-local.service."); + ++ log_warning("Support for %s will be removed soon. " ++ "Please see systemd-shutdown(8) man page for a similar but better alternative.", ++ RC_LOCAL_SCRIPT_PATH_STOP); ++ + k = add_symlink("halt-local.service", "final.target"); + } + +-- +2.21.0 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 785b05f7..adc89a36 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue May 28 11:53:30 UTC 2019 - Franck Bui + +- Import commit eaa7b8b148927d471609de75e542dffcc1b36df4 + + 7e58b89136 udevd: change the default value of udev.children-max (again) (bsc#1107617) + +------------------------------------------------------------------- +Tue May 28 09:51:30 UTC 2019 - Franck Bui + +- Add 0001-rc-local-generator-deprecate-halt.local-support.patch + + /etc/init.d/halt.local support will removed from the next systemd + version (v243) so for now on warn (hopefully the few) users who rely + on this script so they have a chance to switch to systemd-shutdown + interface. + ------------------------------------------------------------------- Mon May 27 09:33:45 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index a2ffbd84..bb101f9f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.75.g9984a86d0d +%define suse_version +suse.77.geaa7b8b148 %bcond_with gnuefi %if 0%{?bootstrap} @@ -168,6 +168,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch Patch3: 0001-Revert-insserv.conf-generator.patch +Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd-v242+suse.75.g9984a86d0d.tar.xz b/systemd-v242+suse.75.g9984a86d0d.tar.xz deleted file mode 100644 index 50615f14..00000000 --- a/systemd-v242+suse.75.g9984a86d0d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5ad0c9c95ffa3b089676482ccdf91c72d6e2a01f4f97eece0264a737afc9af5 -size 5323056 diff --git a/systemd-v242+suse.77.geaa7b8b148.tar.xz b/systemd-v242+suse.77.geaa7b8b148.tar.xz new file mode 100644 index 00000000..a33f98d1 --- /dev/null +++ b/systemd-v242+suse.77.geaa7b8b148.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dbfb5d5a7c25807a420b63449cb2e275f610c31c3bdcdd84264c17797617a3d +size 5322904 diff --git a/systemd.changes b/systemd.changes index 785b05f7..adc89a36 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue May 28 11:53:30 UTC 2019 - Franck Bui + +- Import commit eaa7b8b148927d471609de75e542dffcc1b36df4 + + 7e58b89136 udevd: change the default value of udev.children-max (again) (bsc#1107617) + +------------------------------------------------------------------- +Tue May 28 09:51:30 UTC 2019 - Franck Bui + +- Add 0001-rc-local-generator-deprecate-halt.local-support.patch + + /etc/init.d/halt.local support will removed from the next systemd + version (v243) so for now on warn (hopefully the few) users who rely + on this script so they have a chance to switch to systemd-shutdown + interface. + ------------------------------------------------------------------- Mon May 27 09:33:45 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 583d8bcf..4559a522 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.75.g9984a86d0d +%define suse_version +suse.77.geaa7b8b148 %bcond_with gnuefi %if 0%{?bootstrap} @@ -166,6 +166,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch Patch3: 0001-Revert-insserv.conf-generator.patch +Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB