chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Link: port to new ethtool ETHTOOL_xLINKSETTINGS
[elogind.git]
/
src
/
basic
/
virt.c
diff --git
a/src/basic/virt.c
b/src/basic/virt.c
index 06fe509f772ab4042b7cb5e122fabdfa2182908f..35beebe7fa4116f5dedfd2b2a0e50fd0cc97486c 100644
(file)
--- a/
src/basic/virt.c
+++ b/
src/basic/virt.c
@@
-486,7
+486,6
@@
int detect_virtualization(void) {
return r;
}
return r;
}
-#endif // 0
static int userns_has_mapping(const char *name) {
_cleanup_fclose_ FILE *f = NULL;
static int userns_has_mapping(const char *name) {
_cleanup_fclose_ FILE *f = NULL;
@@
-557,6
+556,7
@@
int running_in_userns(void) {
log_debug("/proc/self/setgroups contains \"%s\", %s user namespace", line, r ? "in" : "not in");
return r;
}
log_debug("/proc/self/setgroups contains \"%s\", %s user namespace", line, r ? "in" : "not in");
return r;
}
+#endif // 0
int running_in_chroot(void) {
int ret;
int running_in_chroot(void) {
int ret;