| 1 |
commit: a0cf8f91246ff4487b36d6432dab787e5b10957d |
| 2 |
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Dec 2 15:19:45 2015 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 2 16:20:39 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a0cf8f91 |
| 7 |
|
| 8 |
Add detection for rkt containers |
| 9 |
|
| 10 |
man/openrc-run.8 | 2 ++ |
| 11 |
src/librc/librc.c | 4 ++++ |
| 12 |
src/librc/rc.h.in | 1 + |
| 13 |
3 files changed, 7 insertions(+) |
| 14 |
|
| 15 |
diff --git a/man/openrc-run.8 b/man/openrc-run.8 |
| 16 |
index 9e0e776..6aab067 100644 |
| 17 |
--- a/man/openrc-run.8 |
| 18 |
+++ b/man/openrc-run.8 |
| 19 |
@@ -215,6 +215,8 @@ Same as -jail, but for Linux Resource Containers (LXC). |
| 20 |
Same as -jail, but for OpenVZ systems. |
| 21 |
.It Dv -prefix |
| 22 |
Same as -jail, but for Prefix systems. |
| 23 |
+.It Dv -rkt |
| 24 |
+Same as -jail, but for RKT systems. |
| 25 |
.It Dv -uml |
| 26 |
Same as -jail, but for UML systems. |
| 27 |
.It Dv -vserver |
| 28 |
|
| 29 |
diff --git a/src/librc/librc.c b/src/librc/librc.c |
| 30 |
index cad8033..c041647 100644 |
| 31 |
--- a/src/librc/librc.c |
| 32 |
+++ b/src/librc/librc.c |
| 33 |
@@ -267,6 +267,8 @@ rc_sys(void) |
| 34 |
return RC_SYS_OPENVZ; |
| 35 |
if (strcmp(systype, RC_SYS_LXC) == 0) |
| 36 |
return RC_SYS_LXC; |
| 37 |
+ if (strcmp(systype, RC_SYS_RKT) == 0) |
| 38 |
+ return RC_SYS_RKT; |
| 39 |
if (strcmp(systype, RC_SYS_SYSTEMD_NSPAWN) == 0) |
| 40 |
return RC_SYS_SYSTEMD_NSPAWN; |
| 41 |
if (strcmp(systype, RC_SYS_DOCKER) == 0) |
| 42 |
@@ -288,6 +290,8 @@ rc_sys(void) |
| 43 |
return RC_SYS_OPENVZ; /* old test */ |
| 44 |
else if (file_regex("/proc/1/environ", "container=lxc")) |
| 45 |
return RC_SYS_LXC; |
| 46 |
+ else if (file_regex("/proc/1/environ", "container=rkt")) |
| 47 |
+ return RC_SYS_RKT; |
| 48 |
else if (file_regex("/proc/1/environ", "container=systemd-nspawn")) |
| 49 |
return RC_SYS_SYSTEMD_NSPAWN; |
| 50 |
else if (file_regex("/proc/1/environ", "container=docker")) |
| 51 |
|
| 52 |
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in |
| 53 |
index 360c26a..30c0f8d 100644 |
| 54 |
--- a/src/librc/rc.h.in |
| 55 |
+++ b/src/librc/rc.h.in |
| 56 |
@@ -334,6 +334,7 @@ bool rc_service_daemons_crashed(const char *); |
| 57 |
#define RC_SYS_OPENVZ "OPENVZ" |
| 58 |
#define RC_SYS_LXC "LXC" |
| 59 |
#define RC_SYS_PREFIX "PREFIX" |
| 60 |
+#define RC_SYS_RKT "RKT" |
| 61 |
#define RC_SYS_SYSTEMD_NSPAWN "SYSTEMD-NSPAWN" |
| 62 |
#define RC_SYS_UML "UML" |
| 63 |
#define RC_SYS_VSERVER "VSERVER" |
Archives