From: Serge Logvinov <serge.logvinov@gmail.com>
Date: Sun, 8 Dec 2013 12:15:29 +0000 (+0400)
Subject: altlinux: Use relative paths and fix rootfs variable.
X-Git-Tag: lxc-1.0.0.beta1~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44b430e2c5a11f792e21d3774b530f410ff5af75;p=thirdparty%2Flxc.git

altlinux: Use relative paths and fix rootfs variable.

Change paths in fstab to be relative to the root and fix a wrong
rootfs_path value.

Signed-off-by: Serge Logvinov <serge.logvinov@gmail.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-altlinux.in b/templates/lxc-altlinux.in
index 559ba75e8..99d31e8e4 100644
--- a/templates/lxc-altlinux.in
+++ b/templates/lxc-altlinux.in
@@ -296,8 +296,8 @@ lxc.cgroup.devices.allow = c 10:135 rwm
 EOF
 
     cat <<EOF > $config_path/fstab
-proc            $rootfs_path/proc         proc    nodev,noexec,nosuid 0 0
-sysfs           $rootfs_path/sys          sysfs defaults  0 0
+proc            proc         proc    nodev,noexec,nosuid 0 0
+sysfs           sys          sysfs   defaults  0 0
 EOF
 
     if [ $? -ne 0 ]; then
@@ -429,7 +429,7 @@ if [ -z "$rootfs_path" ]; then
     if grep -q '^lxc.rootfs' $path/config 2>/dev/null ; then
         rootfs_path=$(awk -F= '/^lxc.rootfs =/{ print $2 }' $path/config)
     else
-        rootfs_path=$path/$name/rootfs
+        rootfs_path=$path/rootfs
     fi
 fi