chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6dac160
)
nspawn: fix build on non-selinux systems
author
Lennart Poettering
<lennart@poettering.net>
Thu, 19 Feb 2015 11:03:12 +0000
(12:03 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 19 Feb 2015 11:03:12 +0000
(12:03 +0100)
src/nspawn/nspawn.c
patch
|
blob
|
history
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index 8a151f15ea16fc764ab5e5c28e396c2d1e34bbd6..9967423dbc977d1a941f8a65204fff22cafe0b81 100644
(file)
--- a/
src/nspawn/nspawn.c
+++ b/
src/nspawn/nspawn.c
@@
-872,10
+872,7
@@
static int mount_all(const char *dest) {
int r = 0;
for (k = 0; k < ELEMENTSOF(mount_table); k++) {
int r = 0;
for (k = 0; k < ELEMENTSOF(mount_table); k++) {
- _cleanup_free_ char *where = NULL;
-#ifdef HAVE_SELINUX
- _cleanup_free_ char *options = NULL;
-#endif
+ _cleanup_free_ char *where = NULL, *options = NULL;
const char *o;
int t;
const char *o;
int t;