From 81c86b738f24d65f8a99427b33587f1d1e76ea82 Mon Sep 17 00:00:00 2001
From: Marco Yuen <marcoy@cs.princeton.edu>
Date: Fri, 16 Dec 2011 11:32:34 -0500
Subject: [PATCH] Remove vserver dependency from bootstrapfs

---
 config.planetlab/bootstrapfs.pkgs | 16 +++++++++-------
 config.planetlab/bootstrapfs.post |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 9cd5f311..e93dfa86 100644
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -106,13 +106,13 @@ package>=f10: cronie
 #
 package: madwifi
 package: wireless-tools
-package: util-vserver
-package: util-vserver-build
-package: util-vserver-lib
-package: util-vserver-core
-package: util-vserver-sysv
-package: util-vserver-legacy
-package: util-vserver-pl
+#package: util-vserver
+#package: util-vserver-build
+#package: util-vserver-lib
+#package: util-vserver-core
+#package: util-vserver-sysv
+#package: util-vserver-legacy
+#package: util-vserver-pl
 #package: util-python
 package: NodeManager
 package: NodeUpdate
@@ -131,3 +131,5 @@ package: pyplnet
 package: libvirt
 package: libvirt-python
 package: lxc-reference
+package: ebtables
+package: python-inotify
diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index 37dd00c4..2e13ef88 100644
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -15,17 +15,17 @@ 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 off || :
+# 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
 chroot ${vdir} /sbin/chkconfig NetworkManager off || :
 
 # turn OFF vservers-default ; this is to automatically restart vservers, let nm do that
-chroot ${vdir} /sbin/chkconfig vservers-default off || :
+# chroot ${vdir} /sbin/chkconfig vservers-default off || :
 # turn ON vprocunhide ; is required with kernels that have CONFIG_VSERVER_PROC_SECURE enabled
 # which is the case for our k32 kernel
-chroot ${vdir} /sbin/chkconfig vprocunhide on || :
+# chroot ${vdir} /sbin/chkconfig vprocunhide on || :
 
 # turn OFF selinux if set
 # this may happen accidentally if you mention too much stuff in bootstrapfs.pkgs
-- 
2.43.0