diff options
| author | Roy Marples <roy@marples.name> | 2008-03-03 17:19:56 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-03 17:19:56 +0000 |
| commit | 15cf41e7131cebbb74241180f36f59384c7a0477 (patch) | |
| tree | 30accca041088b161a4d5cfcb731dcd40a496868 /src/librc | |
| parent | f3e90dddbfcf838b653846cce7fd2be479c68900 (diff) | |
Split VPS into VSERVER and OPENVZ
Diffstat (limited to 'src/librc')
| -rw-r--r-- | src/librc/librc.c | 7 | ||||
| -rw-r--r-- | src/librc/rc.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/librc/librc.c b/src/librc/librc.c index 16b0f0b7..c6280d15 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -207,8 +207,11 @@ const char *rc_sys (void) } else if (file_regex ("/proc/cpuinfo", "UML")) return (RC_SYS_UML); else if (file_regex ("/proc/self/status", - "(s_context|VxID|envID):[[:space:]]*[1-9]")) - return (RC_SYS_VPS); + "(s_context|VxID):[[:space:]]*[1-9]")) + return (RC_SYS_VSERVER); + else if (file_regex ("/proc/self/status", + "envID:[[:space:]]*[1-9]")) + return (RC_SYS_OPENVZ); #endif return (NULL); diff --git a/src/librc/rc.h b/src/librc/rc.h index d2fde601..0b811f46 100644 --- a/src/librc/rc.h +++ b/src/librc/rc.h @@ -232,9 +232,10 @@ bool rc_service_daemons_crashed (const char *service); * OpenRC can support some special sub system types, normally virtualization. * Some services cannot work in these systems, or we do something else. */ #define RC_SYS_JAIL "JAIL" +#define RC_SYS_OPENVZ "OPENVZ" #define RC_SYS_PREFIX "PREFIX" #define RC_SYS_UML "UML" -#define RC_SYS_VPS "VPS" +#define RC_SYS_VSERVER "VSERVER" #define RC_SYS_XEN0 "XEN0" #define RC_SYS_XENU "XENU" const char *rc_sys (void); |