Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/modules.list b/modules.list
index ab06d69..dda0ae9 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -18,6 +18,7 @@ linux-2.6:22
 linux-2.6:rhel6
 madwifi
 madwifi:0.9.4
+mkinitrd
 Mom
 Monitor
 myplc
@@ -26,6 +27,8 @@ nodemanager
 nodeupdate
 nozomi
 omf
+oml
+openvswitch
 pcucontrol
 pf2slice
 PingOfDeath

diff --git a/modules.update b/modules.update
index 12ebce3..af05d62 100755 (executable)
--- a/modules.update
+++ b/modules.update
@@ -11,7 +11,7 @@ fcdistros="centos5 f12"
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
-    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k22-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
   done 2>/dev/null ;