forget about network-scripts, go for NetworkManager

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 058a53c..ff7234e 100644 (file)
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -3,86 +3,86 @@ groupname: PlanetLabDevel
 groupdesc: Building PlanetLab
 #
 # general utilities
-package: sendmail sendmail-cf mailx 
+package: sendmail sendmail-cf mailx
 package: make git
-package: glibc glibc-common 
+package: glibc glibc-common
 package: bzip2 gzip
 package: cpio tar
-package: coreutils 
-package: rpm rpm-build rpm-devel 
-package: redhat-rpm-config 
-package: curl curl-devel 
-package: subversion cvs 
-package: less 
+package: coreutils
+package: rpm rpm-build rpm-devel
+package: redhat-rpm-config
+package: curl curl-devel
+package: subversion cvs
+package: less
 package: openssh
 package: emacs-nox
-# undetermined 
-package: expect 
-package: gd 
-package: httpd mod_ssl 
-package: openssl 
+# undetermined
+package: expect
+package: gd
+package: httpd mod_ssl
+package: openssl
 package: openssl-devel
 package: zlib
 package: zlib-devel
 package: bison flex
-package: libtool 
-package<=f21: metadata 
-package: mysql mysql-devel mysql-server 
-package: python python-devel 
-package: doxygen  
+package: libtool
+package<=f21: metadata
+package: mysql mysql-devel mysql-server
+package: python python-devel
+package: doxygen
 package: cronie
-package: xmlsec1 xmlsec1-openssl 
+package: xmlsec1 xmlsec1-openssl
 package: expat-devel
-package: db4-devel 
-package: ncurses-devel 
-package: readline-devel 
-package: dnsmasq 
+package: db4-devel
+package: ncurses-devel
+package: readline-devel
+package: dnsmasq
 # for spec2make / rpmlib
 package=f8: popt-devel
 # kernel
-package: gnupg 
-package: diffutils 
-package: patchutils 
-package: vconfig 
-package: iptables 
-package: wget 
-package: beecrypt-devel 
+package: gnupg
+package: diffutils
+package: patchutils
+package: vconfig
+package: iptables
+package: wget
+package: beecrypt-devel
 package: tetex-latex
-package: gcc-c++ 
+package: gcc-c++
 package: binutils-devel
 package>=f27: elfutils-libelf-devel
 # required for perf
 package: xmlto asciidoc newt-devel
 package: perl-ExtUtils-Embed
 # iptables
-package: linuxdoc-tools 
-package: sudo 
-package: yum createrepo 
+package: linuxdoc-tools
+package: sudo
+package: yum createrepo
 ## mysql
-#package: gperf 
-#package: time 
+#package: gperf
+#package: time
 # bootmanager
-package: sharutils 
+package: sharutils
 # bootcd
-package: nasm 
-package: mkisofs 
-package: dosfstools 
+package: nasm
+package: mkisofs
+package: dosfstools
 package: mtools
 package: syslinux
 # myplc
-package: rsync 
+package: rsync
 package: ghostscript
 # myplc-docs
 package: ed
-package: docbook-utils-pdf 
+package: docbook-utils-pdf
 # plcapi
-package: postgresql postgresql-devel postgresql-python postgresql-server 
+package: postgresql postgresql-devel postgresql-python postgresql-server
 # if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64)
 # in an undetermined order, and php-config --extension-dir might return the wrong place
-package: php php-devel.@arch@ php-gd php-pgsql 
+package: php php-devel.@arch@ php-gd php-pgsql
 # now this seems to have been fixed in f12
 package>=f12: php-devel
-package<=f18: PyXML 
+package<=f18: PyXML
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
@@ -91,7 +91,7 @@ package: python-simplejson
 # for vsys - same as for php-devel above
 package: ocaml.@arch@
 # use local inotify-tools on centos
-package>=f8:inotify-tools-devel 
+package>=f8:inotify-tools-devel
 ### ##########
 ### ## for util-vserver-pl
 ### # use local libnl on centos
@@ -115,7 +115,7 @@ package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
 package<=f25: python-uuid
 package: pyOpenSSL m2crypto
 package: libxml2-python libxslt-python
-package: python-ZSI 
+package: python-ZSI
 package: python-psycopg2
 package: python-setuptools
 package: python-dateutil
@@ -134,4 +134,4 @@ package: libtasn1-devel
 package: nmap-ncat
 package: pkgconfig
 # f29
-package>=f29: network-scripts
+package>=f29: NetworkManager

diff --git a/config.planetlab/runtime.pkgs b/config.planetlab/runtime.pkgs
index 6b70d24..22a3d73 100644 (file)
--- a/config.planetlab/runtime.pkgs
+++ b/config.planetlab/runtime.pkgs
@@ -4,9 +4,9 @@ groupdesc: Test Vserver for MyPlc Native
 package: openssh-clients curl
 package: emacs-nox
 package: bind-utils
-package: file 
+package: file
 
 # while runing the tests, try to work around a glitch with yum by running yum=complete-transaction
 package: yum-utils
 package: psmisc
-package>=f29: network-scripts
+package>=f29: NetworkManager