proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-07 15:29:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Alexander Vladimirov 2013-03-11 13:15:18 +08:00 committed by Serge Hallyn
parent 23622a2ac8
commit 7e0e1d941d
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lxc/conf.c
View File

@ -2768,8 +2768,10 @@ int lxc_setup(const char *name, struct lxc_conf *lxc_conf)
return -1; return -1;
} }
if (setup_kmsg(&lxc_conf->rootfs, &lxc_conf->console)) // don't fail if (lxc_conf->kmsg) {
ERROR("failed to setup kmsg for '%s'", name); 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)) { if (setup_tty(&lxc_conf->rootfs, &lxc_conf->tty_info, lxc_conf->ttydir)) {
ERROR("failed to setup the ttys for '%s'", name); ERROR("failed to setup the ttys for '%s'", name);

1
src/lxc/conf.h
View File

@ -278,6 +278,7 @@ struct lxc_conf {
int maincmd_fd; int maincmd_fd;
int autodev; // if 1, mount and fill a /dev at start int autodev; // if 1, mount and fill a /dev at start
int stopsignal; // signal used to stop container 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 char *rcfile; // Copy of the top level rcfile we read
}; };

12
src/lxc/confile.c
View File

@ -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_pts(const char *, const char *, struct lxc_conf *);
static int config_tty(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_ttydir(const char *, const char *, struct lxc_conf *);
static int config_kmsg(const char *, const char *, struct lxc_conf *);
#if HAVE_APPARMOR #if HAVE_APPARMOR
static int config_aa_profile(const char *, const char *, struct lxc_conf *); static int config_aa_profile(const char *, const char *, struct lxc_conf *);
#endif #endif
@ -97,6 +98,7 @@ static struct lxc_config_t config[] = {
{ "lxc.pts", config_pts }, { "lxc.pts", config_pts },
{ "lxc.tty", config_tty }, { "lxc.tty", config_tty },
{ "lxc.devttydir", config_ttydir }, { "lxc.devttydir", config_ttydir },
{ "lxc.kmsg", config_kmsg },
#if HAVE_APPARMOR #if HAVE_APPARMOR
{ "lxc.aa_profile", config_aa_profile }, { "lxc.aa_profile", config_aa_profile },
#endif #endif
@ -933,6 +935,16 @@ static int config_ttydir(const char *key, const char *value,
return 0; 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 #if HAVE_APPARMOR
static int config_aa_profile(const char *key, const char *value, static int config_aa_profile(const char *key, const char *value,
struct lxc_conf *lxc_conf) struct lxc_conf *lxc_conf)