X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frfkill%2Frfkill.c;h=c7c659292abefb0fb0ece120bbf70878fe4dd47d;hp=ad1d63d32deaaba1a778492397e6b79a775fbec7;hb=edc501d4674dadc304d45a7e1c5b69e207eb8cd4;hpb=f6f738db7273f8a2092ac372852f37f2a34cea17

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index ad1d63d32..c7c659292 100644
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -86,7 +86,7 @@ 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_name, NULL);
         } else
                 saved = strjoin("/var/lib/systemd/rfkill/", escaped_name, NULL);
 
@@ -98,6 +98,9 @@ int main(int argc, char *argv[]) {
         if (streq(argv[1], "load")) {
                 _cleanup_free_ char *value = NULL;
 
+                if (!shall_restore_state())
+                        return EXIT_SUCCESS;
+
                 r = read_one_line_file(saved, &value);
                 if (r < 0) {