[lxc-devel] [lxc/master] templates: fix getty service startup

[FooDeas on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 616 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161208/044bbe34/attachment.bin>
-------------- next part --------------
From e95d7a59ca20b84237b3c1a1e892afb85b33c827 Mon Sep 17 00:00:00 2001
From: FooDeas <foodeas at aeberlein.de>
Date: Thu, 8 Dec 2016 14:03:10 +0100
Subject: [PATCH] templates: fix getty service startup

Commit bf39edb39ecaea25801d716aebef798885277992 broke the handling of the getty service file with an '@' character in filename. So the startup condition was not fixed.

Because the parameter was quoted with the causal commit, the escaping has to be removed.

Signed-off-by: Andreas Eberlein foodeas at aeberlein.de
---
 templates/lxc-debian.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index a44aebb..892607c 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -231,11 +231,11 @@ configure_debian_systemd()
     num_tty=$4
 
     # this only works if we have getty at .service to manipulate
-    if [ -f "${rootfs}/lib/systemd/system/getty\@.service" ]; then
+    if [ -f "${rootfs}/lib/systemd/system/getty at .service" ]; then
        sed -e 's/^ConditionPathExists=/# ConditionPathExists=/' \
            -e 's/After=dev-%i.device/After=/' \
-           < "${rootfs}/lib/systemd/system/getty\@.service" \
-           > "${rootfs}/etc/systemd/system/getty\@.service"
+           < "${rootfs}/lib/systemd/system/getty at .service" \
+           > "${rootfs}/etc/systemd/system/getty at .service"
     fi
 
     # just in case systemd is not installed