Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Make /dev/kmsg symlinking optional, add lxc.kmsg option

Had this changeset hanging around for some time, maybe this would be useful
until some better solution come up.

Signed-off-by: Alexander Vladimirov <alexander.idkfa.vladimirov@gmail.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information...
commit 7e0e1d941d4b0fbca53fd9aba3aafa9745119b53 1 parent 23622a2
@idkfa idkfa authored hallyn committed
Showing with 17 additions and 2 deletions.
  1. +4 −2 src/lxc/conf.c
  2. +1 −0  src/lxc/conf.h
  3. +12 −0 src/lxc/confile.c
View
6 src/lxc/conf.c
@@ -2768,8 +2768,10 @@ int lxc_setup(const char *name, struct lxc_conf *lxc_conf)
return -1;
}
- if (setup_kmsg(&lxc_conf->rootfs, &lxc_conf->console)) // don't fail
- ERROR("failed to setup kmsg for '%s'", name);
+ if (lxc_conf->kmsg) {
+ if (setup_kmsg(&lxc_conf->rootfs, &lxc_conf->console)) // don't fail
+ ERROR("failed to setup kmsg for '%s'", name);
+ }
if (setup_tty(&lxc_conf->rootfs, &lxc_conf->tty_info, lxc_conf->ttydir)) {
ERROR("failed to setup the ttys for '%s'", name);
View
1  src/lxc/conf.h
@@ -278,6 +278,7 @@ struct lxc_conf {
int maincmd_fd;
int autodev; // if 1, mount and fill a /dev at start
int stopsignal; // signal used to stop container
+ int kmsg; // if 1, create /dev/kmsg symlink
char *rcfile; // Copy of the top level rcfile we read
};
View
12 src/lxc/confile.c
@@ -56,6 +56,7 @@ static int config_personality(const char *, const char *, struct lxc_conf *);
static int config_pts(const char *, const char *, struct lxc_conf *);
static int config_tty(const char *, const char *, struct lxc_conf *);
static int config_ttydir(const char *, const char *, struct lxc_conf *);
+static int config_kmsg(const char *, const char *, struct lxc_conf *);
#if HAVE_APPARMOR
static int config_aa_profile(const char *, const char *, struct lxc_conf *);
#endif
@@ -97,6 +98,7 @@ static struct lxc_config_t config[] = {
{ "lxc.pts", config_pts },
{ "lxc.tty", config_tty },
{ "lxc.devttydir", config_ttydir },
+ { "lxc.kmsg", config_kmsg },
#if HAVE_APPARMOR
{ "lxc.aa_profile", config_aa_profile },
#endif
@@ -933,6 +935,16 @@ static int config_ttydir(const char *key, const char *value,
return 0;
}
+static int config_kmsg(const char *key, const char *value,
+ struct lxc_conf *lxc_conf)
+{
+ int v = atoi(value);
+
+ lxc_conf->kmsg = v;
+
+ return 0;
+}
+
#if HAVE_APPARMOR
static int config_aa_profile(const char *key, const char *value,
struct lxc_conf *lxc_conf)
Please sign in to comment.
Something went wrong with that request. Please try again.