From: Claudio Alarcon-Reyes <clalarco@gmail.com>
Date: Fri, 11 Jul 2014 15:32:32 +0000 (-0400)
Subject: centos template: prevent mingetty from calling vhangup(2)
X-Git-Tag: lxc-1.1.0.alpha2~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7edae51efcb3cb3a05e7fe850905dc836d120512;p=thirdparty%2Flxc.git

centos template: prevent mingetty from calling vhangup(2)

When using unprivileged containers, tty fails because of vhangup. Adding
--nohangup to nimgetty, it fixes the issue. This is the same problem
occurred for oracle template, commit 2e83f7201c5d402478b9849f0a85c62d5b9f1589

Signed-off-by: Claudio Alarcon clalarco@gmail.com
---

diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index 21fad854f..38c589b14 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -299,7 +299,10 @@ exit 0
 EOF
         chmod 755 $rootfs_path/etc/rc.d/lxc.sysinit
         sed -i 's|si::sysinit:/etc/rc.d/rc.sysinit|si::bootwait:/etc/rc.d/lxc.sysinit|'  $rootfs_path/etc/inittab
-        sed -i 's|^1:|co:2345:respawn:/sbin/mingetty console\n1:|' $rootfs_path/etc/inittab
+        # prevent mingetty from calling vhangup(2) since it fails with userns.
+        # Same issue as oracle template: prevent mingetty from calling vhangup(2)
+        # commit 2e83f7201c5d402478b9849f0a85c62d5b9f1589.
+        sed -i 's|^1:|co:2345:respawn:/sbin/mingetty --nohangup console\n1:|' $rootfs_path/etc/inittab
         sed -i 's|^\([56]:\)|#\1|' $rootfs_path/etc/inittab
     fi
 
@@ -339,6 +342,11 @@ EOF
     echo "# For libvirt/Virtual Machine Monitor" >>${rootfs_path}/etc/securetty
     echo "pts/0"        >>${rootfs_path}/etc/securetty
 
+    # prevent mingetty from calling vhangup(2) since it fails with userns.
+    # Same issue as oracle template: prevent mingetty from calling vhangup(2)
+    # commit 2e83f7201c5d402478b9849f0a85c62d5b9f1589.
+    sed -i 's|mingetty|mingetty --nohangup|' $container_rootfs/etc/init/tty.conf
+
     if [ ${root_display_password} = "yes" ]
     then
         echo "Setting root password to '$root_password'"