default kmsg symlinking to on, and document lxc.kmsg

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in
index b7840253321d00bbf25a262c83e7c62a83637b9c..ce8f79a27973718002ba4a9321337b4558f41f1f 100644 (file)
--- a/doc/lxc.conf.sgml.in
+++ b/doc/lxc.conf.sgml.in
@@ -553,6 +553,25 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
       </variablelist>
     </refsect2>
 
+    <refsect2>
+      <title>Enable kmsg symlink</title>
+      <para>
+      Enable creating /dev/kmsg as symlink to /dev/console.  This defaults to 1.
+      </para>
+      <variablelist>
+    <varlistentry>
+      <term>
+        <option>lxc.kmsg</option>
+      </term>
+      <listitem>
+        <para>
+          Set this to 0 to disable /dev/kmsg symlinking.
+        </para>
+      </listitem>
+    </varlistentry>
+      </variablelist>
+    </refsect2>
+
     <refsect2>
       <title>Mount points</title>
       <para>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index e30c720bab45f06a0ab9cf4d7603d3aa6c25ad4b..85e1c61e4206d38b6e88e4ff2a7e17ed7c6181b8 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2068,6 +2068,7 @@ struct lxc_conf *lxc_conf_init(void)
        new->console.name[0] = '\0';
        new->maincmd_fd = -1;
        new->rootfs.mount = default_rootfs_mount;
+       new->kmsg = 1;
        lxc_list_init(&new->cgroup);
        lxc_list_init(&new->network);
        lxc_list_init(&new->mount_list);