From: Marco Yuen <marcoy@gmail.com>
Date: Tue, 6 Dec 2011 20:42:45 +0000 (-0500)
Subject: Add btrfs-progs to bootcd and bootstrapfs.
X-Git-Tag: lxcbuild
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=df44d543f1dfd36db968ac2188ec29fbfdd03956;p=build.git

Add btrfs-progs to bootcd and bootstrapfs.
---

diff --git a/config.planetlab/bootcd.pkgs b/config.planetlab/bootcd.pkgs
index f8206023..c9d2e418 100644
--- a/config.planetlab/bootcd.pkgs
+++ b/config.planetlab/bootcd.pkgs
@@ -3,6 +3,7 @@ groupdesc: PlanetLab BootCD
 # packages to exclude from stock repositories
 kexclude: @KEXCLUDE@
 # define packages
+package: btrfs-progs
 package: filesystem
 package: udev
 package: dhclient
diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index d38ba95d..259320ee 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -7,6 +7,7 @@ groupdesc: PlanetLab Node Root
 kexclude: @KEXCLUDE@
 # fedora-release or centos-release are pulled from deps
 # define packages
+package: btrfs-progs
 package: kernel
 package: udev
 package: basesystem
diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index 79d54fe3..37dd00c4 100644
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -15,7 +15,7 @@ rm -rf ${vdir}/etc/yum.conf ${vdir}/etc/yum.repos.d
 chroot ${vdir} /sbin/chkconfig firstboot off || :
 # NOTE: we're enabling util-vserver to allow it to help shutdown all slices
 # before rebooting.  This has been problematic in the past
-chroot ${vdir} /sbin/chkconfig util-vserver on || :
+chroot ${vdir} /sbin/chkconfig util-vserver off || :
 # enabling network as it ends up turned off on systems that come with NetworkManager, starting with fedora9
 chroot ${vdir} /sbin/chkconfig network on || :
 # and turn off NetworkManager if present, as it quite obviously messes with network