#include "util.h"
#include "virt.h"
+#include "fileio.h"
/* Returns a short identifier for the various VM implementations */
int detect_vm(const char **id) {
unsigned i;
const char *j, *k;
bool hypervisor;
+ _cleanup_free_ char *hvtype = NULL;
+ int r;
+
+ /* Try high-level hypervisor sysfs file first:
+ *
+ * https://bugs.freedesktop.org/show_bug.cgi?id=61491 */
+ r = read_one_line_file("/sys/hypervisor/type", &hvtype);
+ if (r >= 0) {
+ if (streq(hvtype, "xen")) {
+ if (id)
+ *id = "xen";
+
+ return 1;
+ }
+ } else if (r != -ENOENT)
+ return r;
/* http://lwn.net/Articles/301888/ */
zero(sig);
}
for (i = 0; i < ELEMENTSOF(dmi_vendors); i++) {
- char *s;
- int r;
+ _cleanup_free_ char *s = NULL;
const char *found = NULL;
- if ((r = read_one_line_file(dmi_vendors[i], &s)) < 0) {
+ r = read_one_line_file(dmi_vendors[i], &s);
+ if (r < 0) {
if (r != -ENOENT)
return r;
NULSTR_FOREACH_PAIR(j, k, dmi_vendor_table)
if (startswith(s, j))
found = k;
- free(s);
if (found) {
if (id)
}
}
- if (hypervisor) {
+ if (hypervisor || hvtype) {
if (id)
*id = "other";
}
int detect_container(const char **id) {
- FILE *f;
+ char *e = NULL;
+ int r;
/* Unfortunately many of these operations require root access
* in one way or another */
- if (geteuid() != 0)
- return -EPERM;
-
- if (running_in_chroot() > 0) {
+ r = running_in_chroot();
+ if (r < 0)
+ return r;
+ if (r > 0) {
if (id)
*id = "chroot";
return 1;
}
- f = fopen("/proc/1/environ", "re");
- if (f) {
- bool done = false;
-
- do {
- char line[LINE_MAX];
- unsigned i;
+ r = getenv_for_pid(1, "container", &e);
+ if (r <= 0)
+ return r;
- for (i = 0; i < sizeof(line)-1; i++) {
- int c;
-
- c = getc(f);
- if (_unlikely_(c == EOF)) {
- done = true;
- break;
- } else if (c == 0)
- break;
-
- line[i] = c;
- }
- line[i] = 0;
-
- if (streq(line, "container=lxc")) {
- fclose(f);
-
- if (id)
- *id = "lxc";
- return 1;
-
- } else if (streq(line, "container=lxc-libvirt")) {
- fclose(f);
-
- if (id)
- *id = "lxc-libvirt";
- return 1;
-
- } else if (streq(line, "container=systemd-nspawn")) {
- fclose(f);
-
- if (id)
- *id = "systemd-nspawn";
- return 1;
-
- } else if (startswith(line, "container=")) {
- fclose(f);
-
- if (id)
- *id = "other";
- return 1;
- }
-
- } while (!done);
-
- fclose(f);
+ /* We only recognize a selected few here, since we want to
+ * enforce a redacted namespace */
+ if (streq(e, "lxc")) {
+ if (id)
+ *id = "lxc";
+ } else if (streq(e, "lxc-libvirt")) {
+ if (id)
+ *id = "lxc-libvirt";
+ } else if (streq(e, "systemd-nspawn")) {
+ if (id)
+ *id = "systemd-nspawn";
+ } else {
+ if (id)
+ *id = "other";
}
- return 0;
+ free(e);
+
+ return r;
}
/* Returns a short identifier for the various VM/container implementations */