From ab2423caa9ad84bbbc9db585811d2d9bde01619a Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mar 03 2020 08:11:51 +0000 Subject: Update to 245-rc2 --- diff --git a/99-default-disable-fallback.preset b/99-default-disable-fallback.preset deleted file mode 100644 index 1f29b50..0000000 --- a/99-default-disable-fallback.preset +++ /dev/null @@ -1 +0,0 @@ -disable * diff --git a/99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch b/99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch deleted file mode 100644 index dcdff51..0000000 --- a/99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 10 Feb 2020 17:19:52 +0100 -Subject: [PATCH] Revert "Support Plugable UD-PRO8 dock" - -This reverts commit 95f2b4dd237faa57fd3e93245d560e47cdedfc2c. - -Unfortunately the same usb hub is used in other places, and causes -numerous regressions (#14822, -https://bugzilla.redhat.com/show_bug.cgi?id=1800820). Let's revert -until a non-regressing approach is found. ---- - src/login/71-seat.rules.in | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in -index 2a9ddb93aa7..2bbd18363e6 100644 ---- a/src/login/71-seat.rules.in -+++ b/src/login/71-seat.rules.in -@@ -32,12 +32,9 @@ SUBSYSTEM=="pci", ENV{ID_PCI_CLASS_FROM_DATABASE}=="Display controller", \ - SUBSYSTEM=="drm", KERNEL=="card[0-9]*", TAG+="seat", TAG+="master-of-seat" - SUBSYSTEM=="usb", ATTR{bDeviceClass}=="09", TAG+="seat" - --# 'Plugable UD-160' USB hub, sound, network, graphics adapter -+# 'Plugable' USB hub, sound, network, graphics adapter - SUBSYSTEM=="usb", ATTR{idVendor}=="2230", ATTR{idProduct}=="000[13]", ENV{ID_AUTOSEAT}="1" - --# 'Plugable UD-PRO8' USB hub, sound, network, graphics adapter --SUBSYSTEM=="usb", ATTR{idVendor}=="1a40", ATTR{idProduct}=="0201", ENV{ID_AUTOSEAT}="1" -- - # qemu (version 2.4+) has a PCI-PCI bridge (-device pci-bridge-seat) to group - # devices belonging to one seat. See: - # http://git.qemu.org/?p=qemu.git;a=blob;f=docs/multiseat.txt diff --git a/sources b/sources index 951e7b8..f05c9ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-245-rc1.tar.gz) = 2ef9a295f3897c6642a2fac2e3c73467ece9bc6fc196cc4f3707b9c23af2581eb9f74def78909d57513b67604bf1cf6dc5dbb31c6d435f7997677d09a73d006b +SHA512 (systemd-245-rc2.tar.gz) = 71d6a7c8db4845c95abe66aca041bf6df7d868a9f56be94a188c11647f723d33ea8611a8a84d0f2f71ceacafa4d41fa9c26df25c239c60e0121e762570b8a963 diff --git a/systemd.spec b/systemd.spec index 1a4d782..829a42c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,8 +16,8 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 245~rc1 -Release: 4%{?commit:.git%{shortcommit}}%{?dist} +Version: 245~rc2 +Release: 1%{?commit:.git%{shortcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -52,10 +52,6 @@ Source10: systemd-udev-trigger-no-reload.conf Source11: 20-grubby.install Source12: systemd-user -# A stop-gap measure until -# https://src.fedoraproject.org/rpms/fedora-release/pull-request/80 is merged. -Source13: 99-default-disable-fallback.preset - Source21: macros.sysusers Source22: sysusers.attr Source23: sysusers.prov @@ -70,8 +66,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 Patch0001: use-bfq-scheduler.patch -Patch0010: https://github.com/systemd/systemd/commit/99fdffaa194cbfed659b0c1bfd0ace4bfcd2a245.patch - Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1803293 @@ -471,8 +465,6 @@ install -D -t %{buildroot}/usr/lib/systemd/ %{SOURCE3} sed -i 's|#!/usr/bin/env python3|#!%{__python3}|' %{buildroot}/usr/lib/systemd/tests/run-unit-tests.py -install -D -t %{buildroot}/usr/lib/systemd/user-preset/ %{SOURCE13} - install -m 0644 -D -t %{buildroot}%{_rpmconfigdir}/macros.d/ %{SOURCE21} install -m 0644 -D -t %{buildroot}%{_rpmconfigdir}/fileattrs/ %{SOURCE22} install -m 0755 -D -t %{buildroot}%{_rpmconfigdir}/ %{SOURCE23} @@ -775,6 +767,11 @@ fi systemd-pstore.service, all fsck-related functionality, systemd-volatile-root.service, systemd-verity-setup.service, and a few other related files. +- Fix daemon-reload rule to not kill non-systemd pid1 (#1803240) +- Fix namespace-related failure when starting systemd-homed (#1807465) and + group lookup failure in nss_systemd (#1809147) +- Drop autogenerated BOOT_IMAGE= parameter from stored kernel command lines + (#1716164) * Fri Feb 21 2020 Filipe Brandenburger - 245~rc1-4 - Update daemon-reexec fallback to check whether the system is booted with