From b57d88135f9c18bc86f279b172cedf04c22c55f1aad426ca765c9e7390a98a55 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 23 Apr 2018 08:01:18 +0000 Subject: [PATCH] Accepting request 599905 from home:fbui:systemd:Factory - Import commit d8196805089566ecd846b7c627ff2f3c42588c50 621b247f3 device: skip deserialization of device units when udevd is not running a7da5bdbc device: make sure to always retroactively start device dependencies (bsc#1088052) 303624f6f systemd-udevd: limit children-max by available memory (#8668) (bsc#1086785 bsc#1066422) 76acf3ae9 tmpfiles: fix directory removal with force symlink (#8619) - Ship 99-sysctl.conf instead of creating it during package installation/update (bsc#1088769) Previously this symlink was created in /etc/sysctl.d during %post which made the symlink not owned and more importantly it was created only if /etc/sysctl.conf is already installed which is not always the case during the installation process it seems. So ship the symlink unconditionally and put it in /usr/lib/sysctl.d instead since it's a distro default behavior that might be overriden by sysadmin later. - Be consistent in 60-io-scheduler.rules And use "?*" when checking for the non empty string (instead of "*?"). OBS-URL: https://build.opensuse.org/request/show/599905 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1027 --- 60-io-scheduler.rules | 2 +- scripts-systemd-upgrade-from-pre-210.sh | 6 ----- systemd-mini.changes | 33 ++++++++++++++++++++++++- systemd-mini.spec | 8 +++++- systemd-v237+suse.52.g14b3e00c3.tar.xz | 3 --- systemd-v237+suse.57.gd81968050.tar.xz | 3 +++ systemd.changes | 31 +++++++++++++++++++++++ systemd.spec | 8 +++++- 8 files changed, 81 insertions(+), 13 deletions(-) delete mode 100644 systemd-v237+suse.52.g14b3e00c3.tar.xz create mode 100644 systemd-v237+suse.57.gd81968050.tar.xz diff --git a/60-io-scheduler.rules b/60-io-scheduler.rules index 1753c95f..7c285aef 100644 --- a/60-io-scheduler.rules +++ b/60-io-scheduler.rules @@ -5,7 +5,7 @@ SUBSYSTEM!="block", GOTO="scheduler_end" # Do not change scheduler if `elevator` cmdline parameter is set IMPORT{cmdline}="elevator" -ENV{elevator}=="*?", GOTO="scheduler_end" +ENV{elevator}=="?*", GOTO="scheduler_end" # Determine if BLK-MQ is enabled TEST=="%S%p/mq", ENV{.IS_MQ}="1" diff --git a/scripts-systemd-upgrade-from-pre-210.sh b/scripts-systemd-upgrade-from-pre-210.sh index 24738567..8a168915 100644 --- a/scripts-systemd-upgrade-from-pre-210.sh +++ b/scripts-systemd-upgrade-from-pre-210.sh @@ -22,12 +22,6 @@ if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then ln -s /usr/lib/systemd/system/runlevel${runlevel}.target /etc/systemd/system/default.target fi -# since v207 /etc/sysctl.conf is no longer parsed, however -# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf -if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then - ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf -fi - # migrate any symlink which may refer to the old path for f in $(find /etc/systemd/system -type l -xtype l); do new_target="/usr$(readlink $f)" diff --git a/systemd-mini.changes b/systemd-mini.changes index f3aa511f..82bd34cc 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com + +- Import commit d8196805089566ecd846b7c627ff2f3c42588c50 + + 621b247f3 device: skip deserialization of device units when udevd is not running + a7da5bdbc device: make sure to always retroactively start device dependencies (bsc#1088052) + 303624f6f systemd-udevd: limit children-max by available memory (#8668) (bsc#1086785 bsc#1066422) + 76acf3ae9 tmpfiles: fix directory removal with force symlink (#8619) + +------------------------------------------------------------------- +Fri Apr 20 08:27:41 UTC 2018 - fbui@suse.com + +- Ship 99-sysctl.conf instead of creating it during package installation/update (bsc#1088769) + + Previously this symlink was created in /etc/sysctl.d during %post + which made the symlink not owned and more importantly it was created + only if /etc/sysctl.conf is already installed which is not always + the case during the installation process it seems. + + So ship the symlink unconditionally and put it in /usr/lib/sysctl.d + instead since it's a distro default behavior that might be overriden + by sysadmin later. + +------------------------------------------------------------------- +Mon Apr 9 09:42:16 UTC 2018 - fbui@suse.com + +- Be consistent in 60-io-scheduler.rules + + And use "?*" when checking for the non empty string (instead of "*?"). + ------------------------------------------------------------------- Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com @@ -63,7 +94,7 @@ Wed Mar 28 11:58:10 UTC 2018 - fbui@suse.com - Split systemd-coredump sub-package off (bsc#1083849) ------------------------------------------------------------------- -Tue Mar 27 20:15:06 UTC 2018 - develop7@develop7.info +Tue Mar 27 20:14:41 UTC 2018 - develop7@develop7.info - Enhance IO scheduler tweaking rules to support blk-mq as well diff --git a/systemd-mini.spec b/systemd-mini.spec index 69250b6f..7c164b7b 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.52.g14b3e00c3 +%define suse_version +suse.57.gd81968050 %bcond_with gnuefi %if 0%{?bootstrap} @@ -546,6 +546,11 @@ EOF # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# since v207 /etc/sysctl.conf is no longer parsed (commit +# 04bf3c1a60d82791), however backward compatibility is provided by +# /usr/lib/sysctl.d/99-sysctl.conf. +ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf + # The definition of the basic users/groups are defined by system-user # on SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf @@ -1007,6 +1012,7 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d diff --git a/systemd-v237+suse.52.g14b3e00c3.tar.xz b/systemd-v237+suse.52.g14b3e00c3.tar.xz deleted file mode 100644 index d03f0d39..00000000 --- a/systemd-v237+suse.52.g14b3e00c3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbca10a39e2efa0479fe5d81fb983e08ac4e9655b85e382d8247683a3151834f -size 4627336 diff --git a/systemd-v237+suse.57.gd81968050.tar.xz b/systemd-v237+suse.57.gd81968050.tar.xz new file mode 100644 index 00000000..963d977f --- /dev/null +++ b/systemd-v237+suse.57.gd81968050.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c92c0a8012c1b5b7a2866854ecdbcffca697d5cb65df43ad6a7a2859c95915e +size 4627256 diff --git a/systemd.changes b/systemd.changes index 21cf6571..82bd34cc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com + +- Import commit d8196805089566ecd846b7c627ff2f3c42588c50 + + 621b247f3 device: skip deserialization of device units when udevd is not running + a7da5bdbc device: make sure to always retroactively start device dependencies (bsc#1088052) + 303624f6f systemd-udevd: limit children-max by available memory (#8668) (bsc#1086785 bsc#1066422) + 76acf3ae9 tmpfiles: fix directory removal with force symlink (#8619) + +------------------------------------------------------------------- +Fri Apr 20 08:27:41 UTC 2018 - fbui@suse.com + +- Ship 99-sysctl.conf instead of creating it during package installation/update (bsc#1088769) + + Previously this symlink was created in /etc/sysctl.d during %post + which made the symlink not owned and more importantly it was created + only if /etc/sysctl.conf is already installed which is not always + the case during the installation process it seems. + + So ship the symlink unconditionally and put it in /usr/lib/sysctl.d + instead since it's a distro default behavior that might be overriden + by sysadmin later. + +------------------------------------------------------------------- +Mon Apr 9 09:42:16 UTC 2018 - fbui@suse.com + +- Be consistent in 60-io-scheduler.rules + + And use "?*" when checking for the non empty string (instead of "*?"). + ------------------------------------------------------------------- Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 8c0cf8dd..8e20f9a1 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.52.g14b3e00c3 +%define suse_version +suse.57.gd81968050 %bcond_with gnuefi %if 0%{?bootstrap} @@ -544,6 +544,11 @@ EOF # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# since v207 /etc/sysctl.conf is no longer parsed (commit +# 04bf3c1a60d82791), however backward compatibility is provided by +# /usr/lib/sysctl.d/99-sysctl.conf. +ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf + # The definition of the basic users/groups are defined by system-user # on SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf @@ -1005,6 +1010,7 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d