basic: add new merge_env_file function

[elogind.git] / src / basic / virt.h

diff --git a/src/basic/virt.h b/src/basic/virt.h
index 17e7310ac818964829dd4f764fd3c7442fabd31b..f448f4e8fbc0afe8190c2f7e1f73a8ba18a4cba5 100644 (file)
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -39,6 +37,7 @@ enum {
         VIRTUALIZATION_MICROSOFT,
         VIRTUALIZATION_ZVM,
         VIRTUALIZATION_PARALLELS,
+        VIRTUALIZATION_BHYVE,
         VIRTUALIZATION_VM_OTHER,
         VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,
 
@@ -56,6 +55,7 @@ enum {
         _VIRTUALIZATION_INVALID = -1
 };
 
+#if 0 /// UNNEEDED by elogind
 static inline bool VIRTUALIZATION_IS_VM(int x) {
         return x >= VIRTUALIZATION_VM_FIRST && x <= VIRTUALIZATION_VM_LAST;
 }
@@ -65,12 +65,13 @@ static inline bool VIRTUALIZATION_IS_CONTAINER(int x) {
 }
 
 int detect_vm(void);
+#endif // 0
 int detect_container(void);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
 int detect_virtualization(void);
-#endif // 0
 
+int running_in_userns(void);
+#endif // 0
 int running_in_chroot(void);
 
 const char *virtualization_to_string(int v) _const_;