Make lxc.functions return the default lxcpath if /etc/lxc/lxc.conf doesn't provide one

Currently it returns the default path only if /etc/lxc/lxc.conf missing. Since default lxc.conf doesn't contain lxcpath variable (this is at least the case in ubuntu) all tools fails if one doesn't give -P caglar@qgq:~/Project/lxc/examples$ sudo /usr/bin/lxc-create -n test lxc-create: no configuration path defined Signed-off-by: S.Çağlar Onur <caglar@10ur.org> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

Make lxc.functions return the default lxcpath if /etc/lxc/lxc.conf doesn't provide one
6b5d5b97 · S.Çağlar Onur · Stéphane Graber · 4bc8b185 · 6b5d5b97 · 6b5d5b97
Commit 6b5d5b97 authored Mar 31, 2013 by S.Çağlar Onur Committed by Stéphane Graber Apr 01, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

.gitignore .gitignore +1 -0

lxc.functions.in src/lxc/lxc.functions.in +6 -2

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@ src/lxc/lxc-create
 src/lxc/lxc-destroy
 src/lxc/lxc-execute
 src/lxc/lxc-freeze
+src/lxc/lxc.functions
 src/lxc/lxc-info
 src/lxc/lxc-init
 src/lxc/lxc-kill

--- a/src/lxc/lxc.functions.in
+++ b/src/lxc/lxc.functions.in
@@ -26,8 +26,12 @@ templatedir=@LXCTEMPLATEDIR@
 lxcinitdir=@LXCINITDIR@
 get_default_lxcpath() {
-        (grep -v "^#" "$globalconf" 2>/dev/null || echo "lxcpath=@LXCPATH@") | \
+	LXC_PATH=$(grep -v "^#" "$globalconf" 2>/dev/null | grep "[ \t]*lxcpath[ \t]*=")
-                grep "[ \t]*lxcpath[ \t]*=" | awk -F= '{ print $2 }'
+	if [ -n "$LXC_PATH" ]; then
+		echo $LXC_PATH | awk -F= '{ print $2 }'
+	else
+		echo @LXCPATH@
+	fi
 }
 lxc_path=`get_default_lxcpath`