util-lib: move shall_restore_state() to shared/reboot-util

It's just a small function, but it is higher-level functionality.
I don't see a good place for it, reboot-util.[ch] seems least bad

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index dfd68053980e3fbfa304cbe854ad26098023cd07..048441429025d966b1f629fff84ed2d8ffe07121 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -13,7 +13,7 @@
 #include "main-func.h"
 #include "mkdir.h"
 #include "parse-util.h"
-#include "proc-cmdline.h"
+#include "reboot-util.h"
 #include "string-util.h"
 #include "strv.h"
 #include "util.h"

diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index 5d29774e09e2deb0a55398f45babaed0dcafaf81..23cda757081f0e21aed421012c70736625c8640d 100644 (file)
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -306,14 +306,3 @@ int proc_cmdline_get_key_many_internal(ProcCmdlineFlags flags, ...) {
 
         return ret;
 }
-
-int shall_restore_state(void) {
-        bool ret;
-        int r;
-
-        r = proc_cmdline_get_bool("systemd.restore_state", &ret);
-        if (r < 0)
-                return r;
-
-        return r > 0 ? ret : true;
-}

diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index 429e7ca4a459ae830dc3e8ff19c05c29f2f8adc3..4115fdbc99fd7d00dbfc33b19681d16d54efcac6 100644 (file)
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -27,8 +27,6 @@ int proc_cmdline_get_key_many_internal(ProcCmdlineFlags flags, ...);
 char *proc_cmdline_key_startswith(const char *s, const char *prefix);
 bool proc_cmdline_key_streq(const char *x, const char *y);
 
-int shall_restore_state(void);
-
 /* A little helper call, to be used in proc_cmdline_parse_t callbacks */
 static inline bool proc_cmdline_value_missing(const char *key, const char *value) {
         if (!value) {

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index f9d309c909a7ecddc235948b09187dc2e2f3d2ad..501982819aa2e9d967b5fefabdca2964c5031dff 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -16,15 +16,15 @@
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
+#include "list.h"
 #include "main-func.h"
 #include "mkdir.h"
 #include "parse-util.h"
-#include "proc-cmdline.h"
+#include "reboot-util.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "udev-util.h"
 #include "util.h"
-#include "list.h"
 
 /* Note that any write is delayed until exit and the rfkill state will not be
  * stored for rfkill indices that disappear after a change. */

diff --git a/src/shared/reboot-util.c b/src/shared/reboot-util.c
index 08569e8bf3409a01aa72bb15ea1fe11d2944c9da..5d76299179b9248d06b8b00dc60efc8120439643 100644 (file)
--- a/src/shared/reboot-util.c
+++ b/src/shared/reboot-util.c
@@ -6,6 +6,7 @@
 #include "alloc-util.h"
 #include "fileio.h"
 #include "log.h"
+#include "proc-cmdline.h"
 #include "raw-reboot.h"
 #include "reboot-util.h"
 #include "string-util.h"
@@ -96,3 +97,14 @@ int reboot_with_parameter(RebootFlags flags) {
 
         return log_full_errno(flags & REBOOT_LOG ? LOG_ERR : LOG_DEBUG, errno, "Failed to reboot: %m");
 }
+
+int shall_restore_state(void) {
+        bool ret;
+        int r;
+
+        r = proc_cmdline_get_bool("systemd.restore_state", &ret);
+        if (r < 0)
+                return r;
+
+        return r > 0 ? ret : true;
+}

diff --git a/src/shared/reboot-util.h b/src/shared/reboot-util.h
index 7bddc91ea60bbf5e840b3a7a5a8b64f8ad4623db..5aeb34821fbc5c2ef7c965ad4c94108a01a24694 100644 (file)
--- a/src/shared/reboot-util.h
+++ b/src/shared/reboot-util.h
@@ -11,3 +11,5 @@ typedef enum RebootFlags {
 
 int read_reboot_parameter(char **parameter);
 int reboot_with_parameter(RebootFlags flags);
+
+int shall_restore_state(void);