rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

Accepting request 599905 from home:fbui:systemd:Factory

Browse Source 
- 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
This commit is contained in:
Franck Bui 2018-04-23 08:01:18 +00:00 committed by Git OBS Bridge
parent fff9c3b6a1
commit b57d88135f
8 changed files with 81 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
60-io-scheduler.rules
View File

@ -5,7 +5,7 @@ SUBSYSTEM!="block", GOTO="scheduler_end"
# Do not change scheduler if `elevator` cmdline parameter is set # Do not change scheduler if `elevator` cmdline parameter is set
IMPORT{cmdline}="elevator" IMPORT{cmdline}="elevator"
ENV{elevator}=="*?", GOTO="scheduler_end" ENV{elevator}=="?*", GOTO="scheduler_end"
# Determine if BLK-MQ is enabled # Determine if BLK-MQ is enabled
TEST=="%S%p/mq", ENV{.IS_MQ}="1" TEST=="%S%p/mq", ENV{.IS_MQ}="1"

6
scripts-systemd-upgrade-from-pre-210.sh
View File

@ -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 ln -s /usr/lib/systemd/system/runlevel${runlevel}.target /etc/systemd/system/default.target
fi 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 # migrate any symlink which may refer to the old path
for f in $(find /etc/systemd/system -type l -xtype l); do for f in $(find /etc/systemd/system -type l -xtype l); do
new_target="/usr$(readlink $f)" new_target="/usr$(readlink $f)"

33
systemd-mini.changes
View File

@ -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 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) - 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 - Enhance IO scheduler tweaking rules to support blk-mq as well

8
systemd-mini.spec
View File

@ -26,7 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
%define mini -mini %define mini -mini
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.52.g14b3e00c3 %define suse_version +suse.57.gd81968050
%bcond_with gnuefi %bcond_with gnuefi
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -546,6 +546,11 @@ EOF
# aaa_base (in procps for now) # aaa_base (in procps for now)
rm -f %{buildroot}%{_sysctldir}/50-default.conf 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 # The definition of the basic users/groups are defined by system-user
# on SUSE (bsc#1006978). # on SUSE (bsc#1006978).
rm -f %{buildroot}%{_sysusersdir}/basic.conf rm -f %{buildroot}%{_sysusersdir}/basic.conf
@ -1007,6 +1012,7 @@ fi
%dir %{_sysctldir} %dir %{_sysctldir}
%dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/sysctl.d
%{_sysctldir}/99-sysctl.conf
%dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xinit/xinitrc.d

3
systemd-v237+suse.52.g14b3e00c3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cbca10a39e2efa0479fe5d81fb983e08ac4e9655b85e382d8247683a3151834f
size 4627336

3
systemd-v237+suse.57.gd81968050.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c92c0a8012c1b5b7a2866854ecdbcffca697d5cb65df43ad6a7a2859c95915e
size 4627256

31
systemd.changes
View File

@ -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 Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com

8
systemd.spec
View File

@ -24,7 +24,7 @@
%define bootstrap 0 %define bootstrap 0
%define mini %nil %define mini %nil
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.52.g14b3e00c3 %define suse_version +suse.57.gd81968050
%bcond_with gnuefi %bcond_with gnuefi
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -544,6 +544,11 @@ EOF
# aaa_base (in procps for now) # aaa_base (in procps for now)
rm -f %{buildroot}%{_sysctldir}/50-default.conf 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 # The definition of the basic users/groups are defined by system-user
# on SUSE (bsc#1006978). # on SUSE (bsc#1006978).
rm -f %{buildroot}%{_sysusersdir}/basic.conf rm -f %{buildroot}%{_sysusersdir}/basic.conf
@ -1005,6 +1010,7 @@ fi
%dir %{_sysctldir} %dir %{_sysctldir}
%dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/sysctl.d
%{_sysctldir}/99-sysctl.conf
%dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit
%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xinit/xinitrc.d