Merge conflict

[build.git] / config.planetlab / bootstrapfs.pkgs

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index b7e21e2..80f720c 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -120,8 +120,8 @@ package: NodeUpdate
 package: codemux
 package: pl_sshd
 package: ipod
-package: vserver-@pldistro@-@fcdistro@-@arch@
-package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
+#package: vserver-@pldistro@-@fcdistro@-@arch@
+#package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
 package: pl_mom
 package: fprobe-ulog
 package: vsys