diff --git a/60-ssd-scheduler.rules b/60-ssd-scheduler.rules new file mode 100644 index 00000000..43aa8ea7 --- /dev/null +++ b/60-ssd-scheduler.rules @@ -0,0 +1,11 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="add", GOTO="ssd_scheduler_end" +SUBSYSTEM!="block", GOTO="ssd_scheduler_end" + +IMPORT{cmdline}="elevator" +ENV{elevator}=="*?", GOTO="ssd_scheduler_end" + +KERNEL=="sd*[!0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" + +LABEL="ssd_scheduler_end" diff --git a/80-hotplug-cpu-mem.rules b/80-hotplug-cpu-mem.rules new file mode 100644 index 00000000..9a9614df --- /dev/null +++ b/80-hotplug-cpu-mem.rules @@ -0,0 +1,12 @@ +# 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 +SUBSYSTEM=="memory", ACTION=="add", PROGRAM="/usr/bin/systemd-detect-virt", RESULT!="zvm", ATTR{state}=="offline", \ + ATTR{state}="online", TAG+="tmpfs" + +# See bnc#869603 +TAG=="tmpfs", RUN+="/usr/lib/udev/remount-tmpfs" diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz deleted file mode 100644 index c0fdec25..00000000 --- a/systemd-234.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49daec1195deaa22bd490d70f78aafb7bdc0058ca236125e3c39127688c6db94 -size 3353696 diff --git a/systemd-237.tar.xz b/systemd-237.tar.xz new file mode 100644 index 00000000..7f8d95f5 --- /dev/null +++ b/systemd-237.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db6382de9795d96b41a50ab2ac369b54ba49525181bc00a02ff67dfd970c59be +size 4629324 diff --git a/systemd-mini.changes b/systemd-mini.changes index b10856aa..0ee0ba37 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Mar 1 10:43:09 UTC 2018 - fbui@suse.com + +- BS forces us to own %{_prefix}/lib/modprobe.d + + This seems wrong but that's how the SUSE BS works. + +------------------------------------------------------------------- +Thu Mar 1 10:13:02 UTC 2018 - fbui@suse.com + +- Upgrade to v237 (commit 78221ca750a9c266f9f8497dda59d7ee44000a6c) + + Udev rules 60-ssd-scheduler.rules and 80-hotplug-cpu-mem.rules have + been removed from the git repo and are now maintained at the package + level. Those rules have been rejected by upstream and are defining + some defaults which should maintain by the kernel folks. + +------------------------------------------------------------------- +Tue Feb 27 09:04:32 UTC 2018 - fbui@suse.com + +- Don't call "pam-config --systemd" + + pam_systemd.so has been integrated directly in the PAM stack since + bsc#812462. So there's no need to call pam-config. + ------------------------------------------------------------------- Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index c627c00b..1ab9c036 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -49,7 +49,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 234 +Version: 237 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -124,7 +124,6 @@ Recommends: %{name}-bash-completion Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding -Requires(post): pam-config >= 0.79-5 %endif %if 0%{?bootstrap} @@ -152,7 +151,9 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1065: udev-remount-tmpfs +Source1000: 60-ssd-scheduler.rules +Source1001: 80-hotplug-cpu-mem.rules +Source1002: udev-remount-tmpfs # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the @@ -492,7 +493,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install -install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs + +# The rules that we shouldn't maintain +install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-ssd-scheduler.rules +install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules +install -m0755 -D %{S:1002} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't @@ -676,9 +681,6 @@ if [ $1 -eq 1 ]; then fi %sysusers_create %{_sysusersdir}/systemd.conf -%if ! 0%{?bootstrap} -pam-config -a --systemd || : -%endif [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : @@ -831,7 +833,6 @@ fi %post journal-remote %sysusers_create %{_sysusersdir}/systemd-remote.conf -%tmpfiles_create %{_tmpfilesdir}/systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -940,8 +941,7 @@ fi %{_unitdir}/*.socket %{_unitdir}/*.wants %{_unitdir}/*.path -%{_userunitdir}/*.target -%{_userunitdir}/*.service +%{_userunitdir}/ %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so @@ -1041,6 +1041,10 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif +# FIXME: why should we have to own this dir ? +%dir %{_prefix}/lib/modprobe.d +%{_prefix}/lib/modprobe.d/systemd.conf + # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf @@ -1311,7 +1315,6 @@ fi %{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-upload %{_sysusersdir}/systemd-remote.conf -%{_tmpfilesdir}/systemd-remote.conf %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* diff --git a/systemd.changes b/systemd.changes index b10856aa..0ee0ba37 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Mar 1 10:43:09 UTC 2018 - fbui@suse.com + +- BS forces us to own %{_prefix}/lib/modprobe.d + + This seems wrong but that's how the SUSE BS works. + +------------------------------------------------------------------- +Thu Mar 1 10:13:02 UTC 2018 - fbui@suse.com + +- Upgrade to v237 (commit 78221ca750a9c266f9f8497dda59d7ee44000a6c) + + Udev rules 60-ssd-scheduler.rules and 80-hotplug-cpu-mem.rules have + been removed from the git repo and are now maintained at the package + level. Those rules have been rejected by upstream and are defining + some defaults which should maintain by the kernel folks. + +------------------------------------------------------------------- +Tue Feb 27 09:04:32 UTC 2018 - fbui@suse.com + +- Don't call "pam-config --systemd" + + pam_systemd.so has been integrated directly in the PAM stack since + bsc#812462. So there's no need to call pam-config. + ------------------------------------------------------------------- Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 95da200d..d8cebceb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 234 +Version: 237 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -122,7 +122,6 @@ Recommends: %{name}-bash-completion Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding -Requires(post): pam-config >= 0.79-5 %endif %if 0%{?bootstrap} @@ -150,7 +149,9 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1065: udev-remount-tmpfs +Source1000: 60-ssd-scheduler.rules +Source1001: 80-hotplug-cpu-mem.rules +Source1002: udev-remount-tmpfs # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the @@ -490,7 +491,11 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install -install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs + +# The rules that we shouldn't maintain +install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-ssd-scheduler.rules +install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules +install -m0755 -D %{S:1002} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't @@ -674,9 +679,6 @@ if [ $1 -eq 1 ]; then fi %sysusers_create %{_sysusersdir}/systemd.conf -%if ! 0%{?bootstrap} -pam-config -a --systemd || : -%endif [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : @@ -829,7 +831,6 @@ fi %post journal-remote %sysusers_create %{_sysusersdir}/systemd-remote.conf -%tmpfiles_create %{_tmpfilesdir}/systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -938,8 +939,7 @@ fi %{_unitdir}/*.socket %{_unitdir}/*.wants %{_unitdir}/*.path -%{_userunitdir}/*.target -%{_userunitdir}/*.service +%{_userunitdir}/ %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so @@ -1039,6 +1039,10 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif +# FIXME: why should we have to own this dir ? +%dir %{_prefix}/lib/modprobe.d +%{_prefix}/lib/modprobe.d/systemd.conf + # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf @@ -1309,7 +1313,6 @@ fi %{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-upload %{_sysusersdir}/systemd-remote.conf -%{_tmpfilesdir}/systemd-remote.conf %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.*