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 22dd815f330a11596b1f71d1d4f9f3b0e0443738..f448f4e8fbc0afe8190c2f7e1f73a8ba18a4cba5 100644 (file)
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -37,6 +37,7 @@ enum {
         VIRTUALIZATION_MICROSOFT,
         VIRTUALIZATION_ZVM,
         VIRTUALIZATION_PARALLELS,
+        VIRTUALIZATION_BHYVE,
         VIRTUALIZATION_VM_OTHER,
         VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,
 
@@ -68,11 +69,10 @@ int detect_vm(void);
 int detect_container(void);
 #if 0 /// UNNEEDED by elogind
 int detect_virtualization(void);
-#endif // 0
 
+int running_in_userns(void);
+#endif // 0
 int running_in_chroot(void);
 
-#if 0 /// UNNEEDED by elogind
 const char *virtualization_to_string(int v) _const_;
 int virtualization_from_string(const char *s) _pure_;
-#endif // 0