From: teruo-oshida <teruo.oshida@miraclelinux.com>
Date: Fri, 27 Mar 2015 09:04:31 +0000 (+0900)
Subject: update path of tty.conf
X-Git-Tag: lxc-2.0.0.beta1~320
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3335c60896056f3c5d260e0b96dc918db688b77f;p=thirdparty%2Flxc.git

update path of tty.conf

$container_rootfs may not be used so 'sed' will try to patch
"/etc/init/tty.conf". It must not be correct.

Signed-off-by: Teruo Oshida <teruo.oshida@miraclelinux.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index b489e0e15..265b7d0f3 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -350,7 +350,7 @@ EOF
     # 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
+    sed -i 's|mingetty|mingetty --nohangup|' $rootfs_path/etc/init/tty.conf
 
     if [ ${root_display_password} = "yes" ]
     then