summaryrefslogtreecommitdiff
path: root/src/rfkill
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-10-14 18:52:07 +0200
committerLennart Poettering <lennart@poettering.net>2013-10-14 19:02:44 +0200
commitf6f738db7273f8a2092ac372852f37f2a34cea17 (patch)
treedfc5717d462076cd9baf4f73494e9cb593afea0b /src/rfkill
parenta8ccacf5344c4434b1d5ff3837307acb8fcf93d2 (diff)
rfkill: use ID_PATH as identifier for rfkill state files
Let's include the stable device path for the rfkill devices in the name of the file we store the rfkill state in, so that we have some stability regarding enumeration order.
Diffstat (limited to 'src/rfkill')
-rw-r--r--src/rfkill/rfkill.c40
1 files changed, 16 insertions, 24 deletions
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 91536523b0..ad1d63d32d 100644
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -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, *ss = NULL, *escaped_name = NULL;
- const char *sysname, *name;
+ _cleanup_free_ char *saved = NULL, *escaped_name = NULL, *escaped_path_id = NULL;
+ const char *name, *path_id;
int r;
if (argc != 3) {
@@ -55,30 +55,11 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
- sysname = strchr(argv[2], ':');
- if (!sysname) {
- log_error("Requires pair of subsystem and sysname for specifying rfkill device.");
- return EXIT_FAILURE;
- }
-
- ss = strndup(argv[2], sysname - argv[2]);
- if (!ss) {
- log_oom();
- return EXIT_FAILURE;
- }
-
- sysname++;
-
- if (!streq(ss, "rfkill")) {
- log_error("Not a rfkill device: '%s:%s'", ss, sysname);
- return EXIT_FAILURE;
- }
-
errno = 0;
- device = udev_device_new_from_subsystem_sysname(udev, ss, sysname);
+ device = udev_device_new_from_subsystem_sysname(udev, "rfkill", argv[2]);
if (!device) {
if (errno != 0)
- log_error("Failed to get rfkill device '%s:%s': %m", ss, sysname);
+ log_error("Failed to get rfkill device '%s': %m", argv[2]);
else
log_oom();
@@ -97,7 +78,18 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
- saved = strjoin("/var/lib/systemd/rfkill/", escaped_name, NULL);
+ path_id = udev_device_get_property_value(device, "ID_PATH");
+ if (path_id) {
+ escaped_path_id = cescape(path_id);
+ if (!escaped_path_id) {
+ log_oom();
+ return EXIT_FAILURE;
+ }
+
+ saved = strjoin("/var/lib/systemd/rfkill/", escaped_path_id, "-", escaped_name, NULL);
+ } else
+ saved = strjoin("/var/lib/systemd/rfkill/", escaped_name, NULL);
+
if (!saved) {
log_oom();
return EXIT_FAILURE;