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 | |
| parent | f3e90dddbfcf838b653846cce7fd2be479c68900 (diff) | |
| download | openrc-15cf41e7131cebbb74241180f36f59384c7a0477.tar.gz openrc-15cf41e7131cebbb74241180f36f59384c7a0477.tar.bz2 openrc-15cf41e7131cebbb74241180f36f59384c7a0477.tar.xz | |
Split VPS into VSERVER and OPENVZ
Diffstat (limited to 'src')
| -rw-r--r-- | src/librc/librc.c | 7 | ||||
| -rw-r--r-- | src/librc/rc.h | 3 | ||||
| -rw-r--r-- | src/rc/rc.c | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/librc/librc.c b/src/librc/librc.c index 16b0f0b..c6280d1 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 d2fde60..0b811f4 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); diff --git a/src/rc/rc.c b/src/rc/rc.c index 183c23c..e1b7ac3 100644 --- a/src/rc/rc.c +++ b/src/rc/rc.c @@ -289,8 +289,8 @@ static void sulogin (bool cont) #ifdef __linux__ char *e = getenv ("RC_SYS"); - /* VPS systems cannot do a sulogin */ - if (e && strcmp (e, "VPS") == 0) { + /* VSERVER and OPENVZ systems cannot do a sulogin */ + if (e && (strcmp (e, "VSERVER") == 0 || strcmp (e, "OPENVZ") == 0) { execl ("/sbin/halt", "/sbin/halt", "-f", (char *) NULL); eerrorx ("%s: unable to exec `/sbin/halt': %s", applet, strerror (errno)); } |