X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fvirt.h;h=1d88ab9ab681d8bc5bcd7eeaa6fdec2e23f3fd8c;hb=9facc64034a98d593cf5b577e979aa78e3b184bf;hp=d63e028a23cd997008bf1e461907c7212db37729;hpb=64b485bf89b90042c9a624633b038ef417b0325e;p=elogind.git diff --git a/src/basic/virt.h b/src/basic/virt.h index d63e028a2..1d88ab9ab 100644 --- 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 /*** @@ -48,6 +46,7 @@ enum { VIRTUALIZATION_LXC, VIRTUALIZATION_OPENVZ, VIRTUALIZATION_DOCKER, + VIRTUALIZATION_RKT, VIRTUALIZATION_CONTAINER_OTHER, VIRTUALIZATION_CONTAINER_LAST = VIRTUALIZATION_CONTAINER_OTHER, @@ -55,6 +54,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; } @@ -64,8 +64,13 @@ static inline bool VIRTUALIZATION_IS_CONTAINER(int x) { } int detect_vm(void); +#endif // 0 int detect_container(void); -// UNNEEDED int detect_virtualization(void); +#if 0 /// UNNEEDED by elogind +int detect_virtualization(void); +#endif // 0 + +int running_in_chroot(void); const char *virtualization_to_string(int v) _const_; int virtualization_from_string(const char *s) _pure_;