forked from pool/systemd
5922abecd1
- 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
117 lines
4.5 KiB
Diff
117 lines
4.5 KiB
Diff
Based on 4844262f25a3ff6bd23de05a0a6f84a8e2983d74 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 3 Dec 2014 02:02:11 +0100
|
|
Subject: [PATCH] rfkill: rework how we generate file names from rfkill
|
|
devices
|
|
|
|
Generate the file name from ID_PATH plus the rfkill type (wlan,
|
|
bluetooth, ...) and ignore the rfkill device name, since it apparently
|
|
is not a stable identifier.
|
|
|
|
Also, ensure that devices disappearing don't result in broken services,
|
|
simply exit cleanly.
|
|
---
|
|
src/rfkill/rfkill.c | 47 ++++++++++++++++++++++++-----------------------
|
|
1 file changed, 24 insertions(+), 23 deletions(-)
|
|
|
|
--- src/rfkill/rfkill.c
|
|
+++ src/rfkill/rfkill.c 2014-12-05 12:05:59.053518122 +0000
|
|
@@ -28,8 +28,8 @@
|
|
int main(int argc, char *argv[]) {
|
|
_cleanup_udev_unref_ struct udev *udev = NULL;
|
|
_cleanup_udev_device_unref_ struct udev_device *device = NULL;
|
|
- _cleanup_free_ char *saved = NULL, *escaped_name = NULL, *escaped_path_id = NULL;
|
|
- const char *name, *path_id;
|
|
+ _cleanup_free_ char *saved = NULL, *escaped_type = NULL, *escaped_path_id = NULL;
|
|
+ const char *name, *type, *path_id;
|
|
int r;
|
|
|
|
if (argc != 3) {
|
|
@@ -55,25 +55,28 @@ int main(int argc, char *argv[]) {
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
- errno = 0;
|
|
device = udev_device_new_from_subsystem_sysname(udev, "rfkill", argv[2]);
|
|
if (!device) {
|
|
- if (errno != 0)
|
|
- log_error("Failed to get rfkill device '%s': %m", argv[2]);
|
|
- else
|
|
- log_oom();
|
|
-
|
|
- return EXIT_FAILURE;
|
|
+ log_debug("Failed to get rfkill device '%s', ignoring: %m", argv[2]);
|
|
+ return EXIT_SUCCESS;
|
|
}
|
|
|
|
name = udev_device_get_sysattr_value(device, "name");
|
|
if (!name) {
|
|
- log_error("rfkill device has no name?");
|
|
- return EXIT_FAILURE;
|
|
+ log_error("rfkill device has no name? Ignoring device.");
|
|
+ return EXIT_SUCCESS;
|
|
+ }
|
|
+
|
|
+ log_debug("Operating on rfkill device '%s'.", name);
|
|
+
|
|
+ type = udev_device_get_sysattr_value(device, "type");
|
|
+ if (!type) {
|
|
+ log_error("rfkill device has no type? Ignoring device.");
|
|
+ return EXIT_SUCCESS;
|
|
}
|
|
|
|
- escaped_name = cescape(name);
|
|
- if (!escaped_name) {
|
|
+ escaped_type = cescape(type);
|
|
+ if (!escaped_type) {
|
|
log_oom();
|
|
return EXIT_FAILURE;
|
|
}
|
|
@@ -86,9 +89,9 @@ int main(int argc, char *argv[]) {
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
- saved = strjoin("/var/lib/systemd/rfkill/", escaped_path_id, ":", escaped_name, NULL);
|
|
+ saved = strjoin("/var/lib/systemd/rfkill/", escaped_path_id, ":", escaped_type, NULL);
|
|
} else
|
|
- saved = strjoin("/var/lib/systemd/rfkill/", escaped_name, NULL);
|
|
+ saved = strjoin("/var/lib/systemd/rfkill/", escaped_type, NULL);
|
|
|
|
if (!saved) {
|
|
log_oom();
|
|
@@ -102,19 +105,17 @@ int main(int argc, char *argv[]) {
|
|
return EXIT_SUCCESS;
|
|
|
|
r = read_one_line_file(saved, &value);
|
|
+ if (r == -ENOENT)
|
|
+ return EXIT_SUCCESS;
|
|
if (r < 0) {
|
|
-
|
|
- if (r == -ENOENT)
|
|
- return EXIT_SUCCESS;
|
|
-
|
|
log_error("Failed to read %s: %s", saved, strerror(-r));
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
r = udev_device_set_sysattr_value(device, "soft", value);
|
|
if (r < 0) {
|
|
- log_error("Failed to write system attribute: %s", strerror(-r));
|
|
- return EXIT_FAILURE;
|
|
+ log_debug("Failed to write 'soft' attribute on rfkill device, ignoring: %s", strerror(-r));
|
|
+ return EXIT_SUCCESS;
|
|
}
|
|
|
|
} else if (streq(argv[1], "save")) {
|
|
@@ -122,8 +123,8 @@ int main(int argc, char *argv[]) {
|
|
|
|
value = udev_device_get_sysattr_value(device, "soft");
|
|
if (!value) {
|
|
- log_error("Failed to read system attribute: %s", strerror(-r));
|
|
- return EXIT_FAILURE;
|
|
+ log_debug("Failed to read system attribute, ignoring device: %s", strerror(-r));
|
|
+ return EXIT_SUCCESS;
|
|
}
|
|
|
|
r = write_string_file(saved, value);
|