From 4e023cf1c45d11c52ffe8239f74055708884a441 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Jun 20 2014 12:27:29 +0000 Subject: Fix patch --- diff --git a/0471-Fix-instance-argument-for-systemd-backlight-.service.patch b/0471-Fix-instance-argument-for-systemd-backlight-.service.patch new file mode 100644 index 0000000..9930c30 --- /dev/null +++ b/0471-Fix-instance-argument-for-systemd-backlight-.service.patch @@ -0,0 +1,25 @@ +From d0ca64ab1a4de121b022bd9c4f4b9fc8382883b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 20 Jun 2014 08:10:36 -0400 +Subject: [PATCH] Fix instance argument for systemd-backlight@.service + +When backporting patches, I lost "backlight:" in the udev rule. +--- + rules/99-systemd.rules.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index dd6e7f1..713e052 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -57,8 +57,8 @@ ACTION=="add", SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sy + # Pull in backlight save/restore for all backlight devices and + # keyboard backlights + +-SUBSYSTEM=="backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service" +-SUBSYSTEM=="leds", KERNEL=="*kbd_backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@$name.service" ++SUBSYSTEM=="backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@backlight:$name.service" ++SUBSYSTEM=="leds", KERNEL=="*kbd_backlight", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-backlight@leds:$name.service" + + # Asynchronously mount file systems implemented by these modules as + # soon as they are loaded. diff --git a/systemd.spec b/systemd.spec index d2d7228..22d6f5d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 208 -Release: 18%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 19%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager @@ -509,6 +509,7 @@ Patch467: 0467-backlight-Do-not-clamp-brightness-for-LEDs.patch Patch468: 0468-cryptsetup-introduce-new-cryptsetup-pre.traget-unit-.patch Patch469: 0469-rules-add-loop-control-and-btrfs-control-to-disk-gro.patch Patch470: 0470-hwdb-Update-database-of-Bluetooth-company-identifier.patch +Patch471: 0471-Fix-instance-argument-for-systemd-backlight-.service.patch # kernel-install patch for grubby, drop if grubby is obsolete @@ -1157,6 +1158,9 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g %{_datadir}/systemd/gatewayd %changelog +* Fri Jun 20 2014 Zbigniew Jędrzejewski-Szmek - 208-19 +- Fix patch + * Tue Jun 17 2014 Zbigniew Jędrzejewski-Szmek - 208-18 - Fix permissions on new journal files (#1047729) - Fix systemd-delta output (#1088418)