From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Thu, 1 May 2014 04:46:49 +0000 (-0400)
Subject: use correct lxc-init path in sshd template
X-Git-Tag: lxc-1.1.0.alpha1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a2fdf50ad3e771032476b1d0d65aa1cb44ee999;p=thirdparty%2Flxc.git

use correct lxc-init path in sshd template

lxc-init got moved into SBINDIR/init.lxc recently.
This broke sshd template because path wasn't updated there.
This patch should fix this issue.

Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-sshd.in b/templates/lxc-sshd.in
index 7e3d3d8b7..569f12efb 100644
--- a/templates/lxc-sshd.in
+++ b/templates/lxc-sshd.in
@@ -218,7 +218,7 @@ fi
 if [ $0 = "/sbin/init" ]; then
 
     PATH="$PATH:/bin:/sbin:/usr/sbin"
-    check_for_cmd @LXCINITDIR@/lxc/lxc-init
+    check_for_cmd @SBINDIR@/init.lxc
     check_for_cmd sshd
     sshd_path=$cmd_path
 
@@ -237,7 +237,7 @@ EOF
         ifconfig eth0 |grep inet
     fi
 
-    exec @LXCINITDIR@/lxc/lxc-init -- $sshd_path
+    exec @SBINDIR@/init.lxc -- $sshd_path
     exit 1
 fi