systemd/0001-units-make-sure-rfkill-service-is-bount-to-the-actua.patch
Dominique Leuenberger 5922abecd1 Accepting request 264783 from Base:System
- fix systemd-nspawn network-veth support (bnc#906709)
  add 513-nspawn-veth.patch

- Add upstream patch
 1098-udev-link_setup-respect-kernel-name-assign-policy.patch
 which may solve bsc#907318

- Add upstream patches
  0001-units-make-sure-rfkill-service-is-bount-to-the-actua.patch
  0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch
  1097-udev-link_setup-respect-kernel-name-assign-policy.patch

- fix systemd-nspawn network-veth support (bnc#906709)
  add 513-nspawn-veth.patch

- Add upstream patch
 1098-udev-link_setup-respect-kernel-name-assign-policy.patch
 which may solve bsc#907318

- Add upstream patches
  0001-units-make-sure-rfkill-service-is-bount-to-the-actua.patch
  0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch
  1097-udev-link_setup-respect-kernel-name-assign-policy.patch

OBS-URL: https://build.opensuse.org/request/show/264783
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=211
2014-12-16 13:47:27 +00:00

33 lines
1.4 KiB
Diff

Based on 812bd1e6ab4c463507557f2bdbb8875fedd92ade Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Nov 2014 01:20:57 +0100
Subject: [PATCH] units: make sure rfkill service is bount to the actual
hardware
---
rules/99-systemd.rules.in | 2 +-
units/systemd-rfkill@.service.in | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
--- rules/99-systemd.rules.in
+++ rules/99-systemd.rules.in
@@ -62,7 +62,7 @@ SUBSYSTEM=="leds", KERNEL=="*kbd_backlight", TAG+="systemd", IMPORT{builtin}="pa
# Pull in rfkill save/restore for all rfkill devices
-SUBSYSTEM=="rfkill", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_WANTS}+="systemd-rfkill@$name.service"
+SUBSYSTEM=="rfkill", TAG+="systemd", IMPORT{builtin}="path_id", ENV{SYSTEMD_ALIAS}+="/sys/subsystem/rfkill/devices/%k", ENV{SYSTEMD_WANTS}+="systemd-rfkill@$name.service"
# Asynchronously mount file systems implemented by these modules as
# soon as they are loaded.
--- units/systemd-rfkill@.service.in
+++ units/systemd-rfkill@.service.in 2014-12-05 11:52:59.433518948 +0000
@@ -9,6 +9,7 @@
Description=Load/Save RF Kill Switch Status of %I
Documentation=man:systemd-rfkill@.service(8)
DefaultDependencies=no
+BindsTo=sys-subsystem-rfkill-devices-%i.device
RequiresMountsFor=/var/lib/systemd/rfkill
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service