From: Edvinas Klovas Date: Sat, 10 May 2014 14:47:52 +0000 (+0200) Subject: archlinux template: fix lxc.root for btrfs backend X-Git-Tag: lxc-1.1.0.alpha1~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44464003ee219f4f74f43cef550a504c27bb16a7;p=thirdparty%2Flxc.git archlinux template: fix lxc.root for btrfs backend when using btrfs backend lxc-create first creates rootfs in /usr/lib/lxc/rootfs directory before moving it to /var/lib/lxc or other directory supplied by the command line. Archlinux template relied in $rootfs_path which made containers created with btrfs backend have lxc.rootfs set to /usr/lib/lxc/rootfs. By using $path instead of $rootfs_path we make sure that lxc.rootfs is always correct. Signed-off-by: Edvinas Klovas Acked-by: Serge E. Hallyn --- diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in index d9fe42dce..ec14a9a7b 100755 --- a/templates/lxc-archlinux.in +++ b/templates/lxc-archlinux.in @@ -154,7 +154,7 @@ lxc.cgroup.devices.allow = c 5:2 rwm lxc.cgroup.devices.allow = c 136:* rwm EOF - grep -q "^lxc.rootfs" ${config_path}/config 2>/dev/null || echo "lxc.rootfs = ${rootfs_path}" >> ${config_path}/config + grep -q "^lxc.rootfs" ${config_path}/config 2>/dev/null || echo "lxc.rootfs = ${path}/rootfs" >> ${config_path}/config cat > "${config_path}/fstab" << EOF sysfs sys sysfs defaults 0 0