util-lib: move running_in_chroot() into virt.[ch]

It's a very weak kind of virtualization, after all.

diff --git a/src/basic/util.c b/src/basic/util.c
index 66bb00b98264373aeb8433387b93c30cbff3e120..8c5e88f00c57f6c08bf074b30924479bbb1775b8 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -179,16 +179,6 @@ void rename_process(const char name[8]) {
         }
 }
 
-int running_in_chroot(void) {
-        int ret;
-
-        ret = files_same("/proc/1/root", "/");
-        if (ret < 0)
-                return ret;
-
-        return ret == 0;
-}
-
 noreturn void freeze(void) {
 
         /* Make sure nobody waits for us on a socket anymore */

diff --git a/src/basic/util.h b/src/basic/util.h
index 2ebb2754943434df77b57610a89005ed1c28f3cd..c3992349df31fd5cceaedc6370317b0be7ed32a7 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -89,8 +89,6 @@ bool fstype_is_network(const char *fstype);
         assert_message_se((size_t) snprintf(buf, ELEMENTSOF(buf), fmt, __VA_ARGS__) < ELEMENTSOF(buf), \
                           "xsprintf: " #buf "[] must be big enough")
 
-int running_in_chroot(void);
-
 noreturn void freeze(void);
 
 void execute_directories(const char* const* directories, usec_t timeout, char *argv[]);

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 9076cf618f2c53bdd13dcacf41229701a142e5a1..19f93b95aadf709546ea3240710eee3c85162347 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "fileio.h"
+#include "stat-util.h"
 #include "process-util.h"
 #include "string-table.h"
 #include "string-util.h"
@@ -412,6 +413,16 @@ int detect_virtualization(void) {
         return detect_vm();
 }
 
+int running_in_chroot(void) {
+        int ret;
+
+        ret = files_same("/proc/1/root", "/");
+        if (ret < 0)
+                return ret;
+
+        return ret == 0;
+}
+
 static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
         [VIRTUALIZATION_NONE] = "none",
         [VIRTUALIZATION_KVM] = "kvm",

diff --git a/src/basic/virt.h b/src/basic/virt.h
index 449e069901777787fe37a4e16a7cbe3009b97224..ed83608019d1a0c7d765db764efe9e82a39f9a05 100644 (file)
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -67,5 +67,7 @@ int detect_vm(void);
 int detect_container(void);
 int detect_virtualization(void);
 
+int running_in_chroot(void);
+
 const char *virtualization_to_string(int v) _const_;
 int virtualization_from_string(const char *s) _pure_;

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 48d17cb52a61822561d10a4bb0a445b8b6d71088..2166554f4d2736c63ffef0f8e9bb6dcc7ff1d686 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -82,6 +82,7 @@
 #include "util.h"
 #include "utmp-wtmp.h"
 #include "verbs.h"
+#include "virt.h"
 
 static char **arg_types = NULL;
 static char **arg_states = NULL;