forked from pool/systemd
Accepting request 584654 from home:fbui:systemd:Factory
- Remove dropin that was used to turn delegation off for user instances Upstream now enables "memory" and "pids" controllers only which should have a very limited impact on performance compare to the "cpu" controller. - Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3 2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421) 88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py OBS-URL: https://build.opensuse.org/request/show/584654 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1020
This commit is contained in:
parent
40f2805040
commit
f995725348
@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:db6382de9795d96b41a50ab2ac369b54ba49525181bc00a02ff67dfd970c59be
|
oid sha256:b420f2ff5841266d03c6691bd8adb705b2c46c391c33610923a23444232633f4
|
||||||
size 4629324
|
size 4630076
|
||||||
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com
|
||||||
|
|
||||||
|
- Remove dropin that was used to turn delegation off for user instances
|
||||||
|
|
||||||
|
Upstream now enables "memory" and "pids" controllers only which
|
||||||
|
should have a very limited impact on performance compare to the
|
||||||
|
"cpu" controller.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 9 09:30:14 UTC 2018 - fbui@suse.com
|
||||||
|
|
||||||
|
- Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3
|
||||||
|
|
||||||
|
2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421)
|
||||||
|
88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 8 15:22:10 UTC 2018 - fbui@suse.com
|
Thu Mar 8 15:22:10 UTC 2018 - fbui@suse.com
|
||||||
|
|
||||||
|
@ -612,14 +612,6 @@ cat << EOF > %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf
|
|||||||
TTYVTDisallocate=no
|
TTYVTDisallocate=no
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# create drop-in to prevent delegate=yes for root user (bsc#954765,
|
|
||||||
# bnc#953241, fate#320421)
|
|
||||||
mkdir -p %{buildroot}%{_unitdir}/user@0.service.d/
|
|
||||||
cat >%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <<EOF
|
|
||||||
[Service]
|
|
||||||
Delegate=no
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# ensure after.local wrapper is called
|
# ensure after.local wrapper is called
|
||||||
install -m 644 %{S:11} %{buildroot}%{_unitdir}/
|
install -m 644 %{S:11} %{buildroot}%{_unitdir}/
|
||||||
ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
|
ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
|
||||||
@ -964,9 +956,7 @@ fi
|
|||||||
%dir %{_prefix}/lib/systemd/system-shutdown/
|
%dir %{_prefix}/lib/systemd/system-shutdown/
|
||||||
%dir %{_prefix}/lib/systemd/system-sleep/
|
%dir %{_prefix}/lib/systemd/system-sleep/
|
||||||
%dir %{_unitdir}/getty@tty1.service.d
|
%dir %{_unitdir}/getty@tty1.service.d
|
||||||
%dir %{_unitdir}/user@0.service.d
|
|
||||||
%{_unitdir}/getty@tty1.service.d/noclear.conf
|
%{_unitdir}/getty@tty1.service.d/noclear.conf
|
||||||
%{_unitdir}/user@0.service.d/nodelagate.conf
|
|
||||||
/%{_lib}/security/pam_systemd.so
|
/%{_lib}/security/pam_systemd.so
|
||||||
|
|
||||||
%if %{with gnuefi}
|
%if %{with gnuefi}
|
||||||
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com
|
||||||
|
|
||||||
|
- Remove dropin that was used to turn delegation off for user instances
|
||||||
|
|
||||||
|
Upstream now enables "memory" and "pids" controllers only which
|
||||||
|
should have a very limited impact on performance compare to the
|
||||||
|
"cpu" controller.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 9 09:30:14 UTC 2018 - fbui@suse.com
|
||||||
|
|
||||||
|
- Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3
|
||||||
|
|
||||||
|
2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421)
|
||||||
|
88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Mar 8 15:22:10 UTC 2018 - fbui@suse.com
|
Thu Mar 8 15:22:10 UTC 2018 - fbui@suse.com
|
||||||
|
|
||||||
|
10
systemd.spec
10
systemd.spec
@ -610,14 +610,6 @@ cat << EOF > %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf
|
|||||||
TTYVTDisallocate=no
|
TTYVTDisallocate=no
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# create drop-in to prevent delegate=yes for root user (bsc#954765,
|
|
||||||
# bnc#953241, fate#320421)
|
|
||||||
mkdir -p %{buildroot}%{_unitdir}/user@0.service.d/
|
|
||||||
cat >%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <<EOF
|
|
||||||
[Service]
|
|
||||||
Delegate=no
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# ensure after.local wrapper is called
|
# ensure after.local wrapper is called
|
||||||
install -m 644 %{S:11} %{buildroot}%{_unitdir}/
|
install -m 644 %{S:11} %{buildroot}%{_unitdir}/
|
||||||
ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
|
ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/
|
||||||
@ -962,9 +954,7 @@ fi
|
|||||||
%dir %{_prefix}/lib/systemd/system-shutdown/
|
%dir %{_prefix}/lib/systemd/system-shutdown/
|
||||||
%dir %{_prefix}/lib/systemd/system-sleep/
|
%dir %{_prefix}/lib/systemd/system-sleep/
|
||||||
%dir %{_unitdir}/getty@tty1.service.d
|
%dir %{_unitdir}/getty@tty1.service.d
|
||||||
%dir %{_unitdir}/user@0.service.d
|
|
||||||
%{_unitdir}/getty@tty1.service.d/noclear.conf
|
%{_unitdir}/getty@tty1.service.d/noclear.conf
|
||||||
%{_unitdir}/user@0.service.d/nodelagate.conf
|
|
||||||
/%{_lib}/security/pam_systemd.so
|
/%{_lib}/security/pam_systemd.so
|
||||||
|
|
||||||
%if %{with gnuefi}
|
%if %{with gnuefi}
|
||||||
|
Loading…
Reference in New Issue
Block a user