From b8bad3faec7f30b9d41c30598571e94c31ecf3f608d6f516ffe97088dd4eb4eb Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 30 Oct 2018 14:45:41 +0000 Subject: [PATCH] Accepting request 645542 from home:tsaupe:branches:Base:System split off SUSE specific configuration from systemd package (fate#325478) OBS-URL: https://build.opensuse.org/request/show/645542 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1043 --- 60-io-scheduler.rules | 24 ------------------------ 80-hotplug-cpu-mem.rules | 24 ------------------------ 99-wakeup-from-idle.rules | 3 --- systemd-mini.changes | 11 +++++++++++ systemd-mini.spec | 20 +------------------- systemd.changes | 11 +++++++++++ systemd.spec | 20 +------------------- 7 files changed, 24 insertions(+), 89 deletions(-) delete mode 100644 60-io-scheduler.rules delete mode 100644 80-hotplug-cpu-mem.rules delete mode 100644 99-wakeup-from-idle.rules diff --git a/60-io-scheduler.rules b/60-io-scheduler.rules deleted file mode 100644 index 7c285aef..00000000 --- a/60-io-scheduler.rules +++ /dev/null @@ -1,24 +0,0 @@ -# Set optimal IO schedulers for HDD and SSD - -ACTION!="add", GOTO="scheduler_end" -SUBSYSTEM!="block", GOTO="scheduler_end" - -# Do not change scheduler if `elevator` cmdline parameter is set -IMPORT{cmdline}="elevator" -ENV{elevator}=="?*", GOTO="scheduler_end" - -# Determine if BLK-MQ is enabled -TEST=="%S%p/mq", ENV{.IS_MQ}="1" - -# MQ: BFQ scheduler for HDD -ENV{.IS_MQ}=="1", ATTR{queue/rotational}!="0", ATTR{queue/scheduler}="bfq" -# MQ: deadline scheduler for SSD -ENV{.IS_MQ}=="1", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline" - -# Non-MQ: CFQ scheduler for HDD -ENV{.IS_MQ}!="1", ATTR{queue/rotational}!="0", ATTR{queue/scheduler}="cfq" -# Non-MQ: deadline scheduler for SSD -ENV{.IS_MQ}!="1", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" - -LABEL="scheduler_end" - diff --git a/80-hotplug-cpu-mem.rules b/80-hotplug-cpu-mem.rules deleted file mode 100644 index 86a6c272..00000000 --- a/80-hotplug-cpu-mem.rules +++ /dev/null @@ -1,24 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# -# Hotplug physical CPU -# -SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" - -# -# Hotplug physical memory. Instances of tmpfs are remounted so their -# size are recalculated. This might be needed if some sizes were -# specified relative to the total amount of memory (boo#869603). For -# now make it simple and remount all tmpfs regardless of how their -# size are specified. It should be handled by the kernel as it has a -# lot of shortcomings anyways (tmpfs mounted by other processes, mount -# namespaces, ...) -# -SUBSYSTEM=="memory", ACTION=="add", PROGRAM=="/usr/bin/systemd-detect-virt", RESULT!="zvm", ATTR{state}=="offline", \ - ATTR{state}="online", \ - RUN+="/bin/sh -c ' \ - while read src dst fs opts unused; do \ - case $fs in \ - tmpfs) mount -o remount \"$dst\" ;; \ - esac \ - done %{buildroot}%{_libexecdir}/modules-load.d/sg.conf -# load sg module at boot time -sg -EOF - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf @@ -1015,9 +999,7 @@ fi %{_prefix}/lib/systemd/boot/efi/*.stub %endif -%dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d -%{_libexecdir}/modules-load.d/sg.conf %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d diff --git a/systemd.changes b/systemd.changes index 3527ac45..8169e610 100644 --- a/systemd.changes +++ b/systemd.changes @@ -40,6 +40,17 @@ Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com d464f06934 journal: fix syslog_parse_identifier() e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) +------------------------------------------------------------------- +Fri Sep 28 06:05:03 UTC 2018 - Thomas.Blume@suse.com + +- split off SUSE specific configuration from systemd package (fate#325478) + * remove 60-io-scheduler.rules + * remove 80-hotplug-cpu-mem.rules + * remove 99-wakeup-from-idle.rules + * remove /usr/lib/modules-load.d/sg.conf + + these are now maintained in the new package system-tuning-common-SUSE + ------------------------------------------------------------------- Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 022aacc8..008001a7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -154,10 +154,6 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1000: 60-io-scheduler.rules -Source1001: 80-hotplug-cpu-mem.rules -Source1002: 99-wakeup-from-idle.rules - # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the # SUSE git repository. But in very few cases, some stuff might be @@ -502,11 +498,6 @@ install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif -# The rules that we shouldn't maintain -install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules -install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules -install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules - # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... @@ -541,13 +532,6 @@ mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path -# create %%{_libexecdir}/modules-load.d -mkdir -p %{buildroot}%{_libexecdir}/modules-load.d -cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf -# load sg module at boot time -sg -EOF - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf @@ -1013,9 +997,7 @@ fi %{_prefix}/lib/systemd/boot/efi/*.stub %endif -%dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d -%{_libexecdir}/modules-load.d/sg.conf %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d