From: Marco Yuen Date: Thu, 22 Dec 2011 16:46:45 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-reference X-Git-Tag: lxcbuild~1 X-Git-Url: http://git.onelab.eu/?p=lxc-reference.git;a=commitdiff_plain;h=abfcd26e8ba897bd3aef2a05689ae51842e4ba55;hp=21070097d76b6c4c158f7165b373e5ace618e0e7 Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-reference Conflicts: initscript/lxc-reference --- diff --git a/initscript/lxc-reference b/initscript/lxc-reference index e361e1f..bdf6058 100644 --- a/initscript/lxc-reference +++ b/initscript/lxc-reference @@ -27,7 +27,7 @@ if [ -f /vservers/lxc-reference-${VERSION}.tgz ]; then mkdir -p /vservers/.lvref btrfs subvolume create /vservers/.lvref/lxc-f14-x86_64 btrfs subvolume create /vservers/.lvref/lxc-squeeze-x86_64 - tar zxvf /vservers/lxc-reference-${VERSION}.tgz -C /vservers/ + tar zxf /vservers/lxc-reference-${VERSION}.tgz -C /vservers/ rm -rf /vservers/lxc-reference-${VERSION}.tgz fi