merged 4.2 + new packaging for nodeconfig/yum

diff --git a/build-native.sh b/build-native.sh
index 33f96b5..653f4f4 100755 (executable)
--- a/build-native.sh
+++ b/build-native.sh
@@ -62,13 +62,6 @@ echo "* myplc: Installing configuration file"
 install -D -m 444 default_config.xml ${tmpdir}/etc/planetlab/default_config.xml
 install -D -m 444 plc_config.dtd ${tmpdir}/etc/planetlab/plc_config.dtd
 
-# Initialize node RPMs directory. The PlanetLab-Bootstrap.tar.bz2
-# tarball already contains all of the node RPMs pre-installed. Only
-# updates or optional packages should be placed in this directory.
-nodefamily=${pldistro}-${pl_DISTRO_ARCH}
-install -D -m 644 $pl_DISTRO_YUMGROUPS \
-    ${tmpdir}/var/www/html/install-rpms/$nodefamily/yumgroups.xml
-# temporary - so that node update still work until yum.conf.php gets fixed
-( cd ${tmpdir}/var/www/html/install-rpms ; ln -s $nodefamily planetlab)
+# yumgroups.xml and yum repo : let noderepo handle that
 
 exit 0

diff --git a/build.sh b/build.sh
index 9564240..8e5d9b4 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -130,14 +130,7 @@ pl_fixtmp_permissions data
 # Remove generated bootmanager script
 rm -f data/var/www/html/boot/bootmanager.sh
 
-# Initialize node RPMs directory. The PlanetLab-Bootstrap.tar.bz2
-# tarball already contains all of the node RPMs pre-installed. Only
-# updates or optional packages should be placed in this directory.
-nodefamily=${pldistro}-${pl_DISTRO_ARCH}
-install -D -m 644 $pl_DISTRO_YUMGROUPS \
-    data/var/www/html/install-rpms/$nodefamily/yumgroups.xml
-# temporary - so that node update still work until yum.conf.php gets fixed
-( cd data/var/www/html/install-rpms ; ln -s $nodefamily planetlab)
+# yumgroups.xml and yum repo : let noderepo handle that
 
 # Make image out of directory
 echo "* myplc: Building loopback image"

diff --git a/db-config b/db-config
index aa76bb0..dcf56d1 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -357,16 +357,27 @@ def main():
 
         # YUM configuration
         {'enabled': True,
-         'source': 'PlanetLabConf/yum.conf.php?gpgcheck=1',
+         'source': 'yum/myplc.repo.php?gpgcheck=1',
+         'dest': '/etc/yum.myplc.d/myplc.repo',
+         'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
+         'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
+         'ignore_cmd_errors': False,
+         'always_update': False},
+        {'enabled': True,
+         'source': 'yum/yum.conf',
          'dest': '/etc/yum.conf',
-         'file_permissions': '644',
-         'file_owner': 'root',
-         'file_group': 'root',
-         'preinstall_cmd': '',
-         'postinstall_cmd': '',
-         'error_cmd': '',
+         'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
+         'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
+         'ignore_cmd_errors': False,
+         'always_update': False},
+        {'enabled': True,
+         'source': 'yum/stock.repo',
+         'dest': '/etc/yum.myplc.d/stock.repo',
+         'file_permissions': '644', 'file_owner': 'root', 'file_group': 'root',
+         'preinstall_cmd': '', 'postinstall_cmd': '', 'error_cmd': '',
          'ignore_cmd_errors': False,
          'always_update': False},
+
         {'enabled': True,
          'source': 'PlanetLabConf/delete-rpm-list-production',
          'dest': '/etc/planetlab/delete-rpm-list',