From 1c9534b082b2aba68b6ce7df7f8dc4efcbf3b369 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 16 Nov 2013 22:08:29 +0100
Subject: [PATCH] =?UTF-8?q?[pxeboot]=20Mise=20=C3=A0=20jour=20des=20distri?=
 =?UTF-8?q?b?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

En partivulier, certaine ubuntu n'ont plus de vmlinux mais un vmlinux.efi
du coup, il faut changer un peu la generation
---
 gestion/gen_confs/pxeboot/config  | 10 +++++-----
 gestion/gen_confs/pxeboot/pxeboot |  9 +++++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/gestion/gen_confs/pxeboot/config b/gestion/gen_confs/pxeboot/config
index e59ca1f4..be3ad2f5 100644
--- a/gestion/gen_confs/pxeboot/config
+++ b/gestion/gen_confs/pxeboot/config
@@ -32,11 +32,11 @@ DEBIAN_BACKPORT_ARCHS="i386 amd64"
 DEBIAN_BACKPORT_FTP="ftp://cdimage.debian.org/cdimage/unofficial/backports/"
 
 # Définitions spécifiques à Ubuntu
-UBUNTU_DISTS="natty oneiric precise quantal raring saucy"
+UBUNTU_DISTS="oneiric precise quantal raring saucy trusty"
 UBUNTU_ARCHS="i386 amd64"
 UBUNTU_FTP="ftp://ftp.crans.org/ubuntu/dists"
 
-UBUNTU_LIVE="11.10 12.04 12.10 13.04"
+UBUNTU_LIVE="12.04 12.10 13.04 13.10"
 # il faut modifier le nfs et mettre les images dans $ISODIR/ubuntu/
 # puis les monter et partager dans $TFTPROOT/livecd/ubuntu/$dist-$arch
 UBUNTU_LIVE_TYPE="ubuntu xubuntu kubuntu"
@@ -48,16 +48,16 @@ MANDRIVA_ARCHS="i586 x86_64"
 MANDRIVA_FTP="ftp://ftp.free.fr/mirrors/ftp.mandriva.com/MandrivaLinux/official"
 
 # Définitions spécifiques à CentOS
-CENTOS_DISTS="6.3"
+CENTOS_DISTS="6.3 6.4"
 CENTOS_ARCHS="i386 x86_64"
 CENTOS_FTP="ftp://mirror.in2p3.fr/pub/linux/CentOS"
 
 # Définitions spécifiques à Fedora
-FEDORA_DISTS="15 16 17"
+FEDORA_DISTS="18 19"
 FEDORA_ARCHS="i386 x86_64"
 FEDORA_FTP="ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/"
 
-OPENSUSE_DISTS="11.4 12.1 12.2"
+OPENSUSE_DISTS="11.4 12.1 12.2 13.1"
 OPENSUSE_ARCHS="i386 x86_64"
 OPENSUSE_FTP="ftp://ftp.free.fr/mirrors/ftp.opensuse.org/opensuse/distribution/"
 
diff --git a/gestion/gen_confs/pxeboot/pxeboot b/gestion/gen_confs/pxeboot/pxeboot
index 47e034db..e4a02c50 100755
--- a/gestion/gen_confs/pxeboot/pxeboot
+++ b/gestion/gen_confs/pxeboot/pxeboot
@@ -340,12 +340,21 @@ EOF
 for dist in $UBUNTU_LIVE; do
 for arch in $UBUNTU_LIVE_ARCHS; do
 if test -e $ISODIR/ubuntu/$type-$dist-desktop-$arch.iso; then
+if [ -f $TFTPROOT/livecd/ubuntu/$type-$dist-$arch/casper/vmlinuz ]; then
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
                       LABEL $type Livecd $dist $arch
                       KERNEL /livecd/ubuntu/$type-$dist-$arch/casper/vmlinuz
                       APPEND root=/dev/nfs boot=casper netboot=nfs nfsroot=$OWN_IP:$TFTPROOT/livecd/ubuntu/$type-$dist-$arch initrd=livecd/ubuntu/$type-$dist-$arch/casper/initrd.lz --
 
 EOF
+else
+cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
+                      LABEL $type Livecd $dist $arch
+                      KERNEL /livecd/ubuntu/$type-$dist-$arch/casper/vmlinuz.efi
+                      APPEND root=/dev/nfs boot=casper netboot=nfs nfsroot=$OWN_IP:$TFTPROOT/livecd/ubuntu/$type-$dist-$arch initrd=livecd/ubuntu/$type-$dist-$arch/casper/initrd.lz --
+
+EOF
+fi
 fi
 done
 done