From: Marco Yuen <marcoy@cs.princeton.edu>
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

Merge branch 'master' of ssh://git.planet-lab.org/git/lxc-reference

Conflicts:
	initscript/lxc-reference
---

abfcd26e8ba897bd3aef2a05689ae51842e4ba55
diff --cc initscript/lxc-reference
index 81248ae,e361e1f..bdf6058
--- a/initscript/lxc-reference
+++ b/initscript/lxc-reference
@@@ -25,9 -25,9 +25,9 @@@ VERSION=`yum info lxc-reference | grep 
  
  if [ -f /vservers/lxc-reference-${VERSION}.tgz ]; then
      mkdir -p /vservers/.lvref
-     btrfs subvolume /vservers/.lvref/lxc-f14-x86_86
-     btrfs subvolume /vservers/.lvref/lxc-squeeze-x86_86
-     tar zxf /vservers/lxc-reference-${VERSION}.tgz -C /vservers/tmp
+     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