From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 29 Apr 2013 12:50:30 +0000 (+0200)
Subject: add vg and zfsroot options to lxc.functions and use in lxc-create
X-Git-Tag: lxc-1.0.0.alpha1~1^2~250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1bb42a8fca68d9fa9391e6644aeff296479499;p=thirdparty%2Flxc.git

add vg and zfsroot options to lxc.functions and use in lxc-create

also make sure to drop spaces between = and variable in lxc.conf

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in
index 1858c119a..286ed6a00 100644
--- a/src/lxc/lxc-create.in
+++ b/src/lxc/lxc-create.in
@@ -134,7 +134,8 @@ optarg_check() {
 backingstore=_unset
 fstype=ext4
 fssize=500M
-vgname=lxc
+vgname=$lxc_vg
+zfsroot=$lxc_zfsroot
 custom_rootfs=""
 
 while [ $# -gt 0 ]; do
diff --git a/src/lxc/lxc.functions.in b/src/lxc/lxc.functions.in
index aa5717d0b..416267f74 100644
--- a/src/lxc/lxc.functions.in
+++ b/src/lxc/lxc.functions.in
@@ -34,4 +34,24 @@ get_default_lxcpath() {
 	fi
 }
 
+get_default_vg() {
+	LXC_VG=$(grep -v "^#" "$globalconf" 2>/dev/null | grep "[ \t]*lvm_vg[ \t]*=") || true
+	if [ -n "$LXC_VG" ]; then
+		echo $LXC_VG | awk -F= '{ print $2 }'
+	else
+		echo "lxc"
+	fi
+}
+
+get_default_zfsroot() {
+	LXC_ZFSROOT=$(grep -v "^#" "$globalconf" 2>/dev/null | grep "[ \t]*zfsroot[ \t]*=") || true
+	if [ -n "$LXC_ZFSROOT" ]; then
+		echo $LXC_ZFSROOT | awk -F= '{ print $2 }'
+	else
+		echo "tank/lxc"
+	fi
+}
+
 lxc_path=`get_default_lxcpath`
+lxc_vg=`get_default_vg`
+lxc_zfsroot=`get_default_zfsroot`