From: Mohamed Larabi <mohamed.larabi@inria.fr>
Date: Fri, 26 Apr 2013 17:30:40 +0000 (+0200)
Subject: Fix the test to determine whether the distro is SysVinit or systemd based
X-Git-Tag: 5.2.2~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0a969a34d0ca6afcbb5930e3d28eae4f3e1abd36;p=build.git

Fix the test to determine whether the distro is SysVinit or systemd based
---

diff --git a/vbuild-init-lxc.sh b/vbuild-init-lxc.sh
index 22f68222..329bae5b 100755
--- a/vbuild-init-lxc.sh
+++ b/vbuild-init-lxc.sh
@@ -563,8 +563,7 @@ function setup_lxc() {
         exit 1
     fi
 
-    type /bin/systemd >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
+    if [ ! -d ${rootfs_path}/etc/systemd ]; then
         configure_fedora_init
     else
         configure_fedora_systemd
@@ -590,7 +589,7 @@ function setup_lxc() {
   <name>$lxc</name>
   <memory>524288</memory>
   <os>
-    <type>exe</type>
+    <type arch='$arch2'>exe</type>
     <init>/sbin/init</init>
   </os>
   <features>
@@ -917,7 +916,7 @@ function main () {
 
     if [ "$personality" == "linux32" ]; then
         arch=i386
-        arch2=x86
+        arch2=i686
     elif [ "$personality" == "linux64" ]; then
         arch=x86_64
         arch2=x86_64