diff --git a/gestion/gen_confs/pxeboot b/gestion/gen_confs/pxeboot
index 225166d4..8c64f682 100755
--- a/gestion/gen_confs/pxeboot
+++ b/gestion/gen_confs/pxeboot
@@ -48,7 +48,7 @@ MANDRIVA_ARCHS="i586 x86_64"
 MANDRIVA_FTP="ftp://ftp.free.fr/mirrors/ftp.mandriva.com/MandrivaLinux/official"
 
 # Définitions spécifiques à CentOS
-CENTOS_DISTS="5.8 6.3"
+CENTOS_DISTS="6.3"
 CENTOS_ARCHS="i386 x86_64"
 CENTOS_FTP="ftp://mirror.in2p3.fr/pub/linux/CentOS"
 
@@ -57,22 +57,22 @@ FEDORA_DISTS="15 16 17"
 FEDORA_ARCHS="i386 x86_64"
 FEDORA_FTP="ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/"
 
-OPENSUSE_DISTS="11.4"
+OPENSUSE_DISTS="11.4 12.1 12.2"
 OPENSUSE_ARCHS="i386 x86_64"
 OPENSUSE_FTP="ftp://ftp.free.fr/mirrors/ftp.opensuse.org/opensuse/distribution/"
 
 # Définitions spécifiques à FreeBSD
-FREEBSD_DISTS="8.2 8.3"
+FREEBSD_DISTS=""
 FREEBSD_ARCHS="i386 amd64"
 FREEBSD_FTP="ftp://ftp.fr.freebsd.org/pub/FreeBSD/"
 
 # Définition spécifiques à NetBSD
-NETBSD_DIST="5.1 6.0"
-NETBSD_ARCHS="i386 amd64"
-NETBSD_FTP="ftp://iso.fr.netbsd.org/pub/NetBSD"
+#~ NETBSD_DIST="5.1 6.0"
+#~ NETBSD_ARCHS="i386 amd64"
+#~ NETBSD_FTP="ftp://iso.fr.netbsd.org/pub/NetBSD"
 
 # Définitions spécifiques à OpenBSD
-OPENBSD_DIST="5.1 5.2"
+OPENBSD_DIST=""
 OPENBSD_ARCHS="i386 amd64"
 OPENBSD_FTP="ftp://ftp.crans.org/pub/OpenBSD"
 
@@ -85,7 +85,7 @@ for type in $UBUNTU_LIVE_TYPE; do
 	for dist in $UBUNTU_LIVE; do
 	    for arch in $UBUNTU_LIVE_ARCHS; do
 	        if ! test -e $ISODIR/ubuntu/$type-$dist-desktop-$arch.iso 
-	        then echo "$ISODIR/ubuntu/$type-$dist-desktop-$arch.iso n'existe pas" && sleep 5;
+	        then echo "$ISODIR/ubuntu/$type-$dist-desktop-$arch.iso n'existe pas" && sleep 3;
 	        fi
 	    done
 	done
@@ -99,6 +99,8 @@ mkdir -vp $TMPDIR
 ##############################################
 #cp $SKELETON/pxelinux.0 $TFTPROOT/
 cp -ra $SKELETON $TFTPROOT
+#On redémarre de tftp
+/etc/init.d/tftpd-hpa restart
 ##############################################
 
 
@@ -181,12 +183,12 @@ for dist in $DEBIAN_DISTS; do
         mkdir -p $TFTPROOT/debian-$dist/$arch
         cp $TMPDIR/netboot-debian-$dist-$arch/debian-installer/$arch/initrd.gz $TFTPROOT/debian-$dist/$arch
         cp $TMPDIR/netboot-debian-$dist-$arch/debian-installer/$arch/linux $TFTPROOT/debian-$dist/$arch
-        wget -c $DEBIAN_FTP/$dist/main/installer-$arch/current/images/netboot/gtk/netboot.tar.gz -O $TMPDIR/netboot-debian-gtk-$dist-$arch.tar.gz
-        mkdir -p $TMPDIR/netboot-debian-gtk-$dist-$arch/
-        tar zxf $TMPDIR/netboot-debian-gtk-$dist-$arch.tar.gz -C $TMPDIR/netboot-debian-gtk-$dist-$arch/
-        mkdir -p $TFTPROOT/debian-gtk-$dist/$arch
-        cp $TMPDIR/netboot-debian-gtk-$dist-$arch/debian-installer/$arch/initrd.gz $TFTPROOT/debian-gtk-$dist/$arch
-        cp $TMPDIR/netboot-debian-gtk-$dist-$arch/debian-installer/$arch/linux $TFTPROOT/debian-gtk-$dist/$arch
+        #~ wget -c $DEBIAN_FTP/$dist/main/installer-$arch/current/images/netboot/gtk/netboot.tar.gz -O $TMPDIR/netboot-debian-gtk-$dist-$arch.tar.gz
+        #~ mkdir -p $TMPDIR/netboot-debian-gtk-$dist-$arch/
+        #~ tar zxf $TMPDIR/netboot-debian-gtk-$dist-$arch.tar.gz -C $TMPDIR/netboot-debian-gtk-$dist-$arch/
+        #~ mkdir -p $TFTPROOT/debian-gtk-$dist/$arch
+        #~ cp $TMPDIR/netboot-debian-gtk-$dist-$arch/debian-installer/$arch/initrd.gz $TFTPROOT/debian-gtk-$dist/$arch
+        #~ cp $TMPDIR/netboot-debian-gtk-$dist-$arch/debian-installer/$arch/linux $TFTPROOT/debian-gtk-$dist/$arch
         wget -c $DEBIAN_FTP/$dist/main/installer-kfreebsd-$arch/current/images/netboot/netboot.tar.gz -O $TMPDIR/netboot-debian-kfreebsd-$dist-$arch.tar.gz
         mkdir -p $TMPDIR/netboot-debian-$dist-kfreebsd-$arch/
         tar zxf $TMPDIR/netboot-debian-kfreebsd-$dist-$arch.tar.gz -C $TMPDIR/netboot-debian-$dist-kfreebsd-$arch/
@@ -244,40 +246,40 @@ cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
       menu end
 
 EOF
-cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
-      menu begin debian-gtk-$dist
-              menu title Debian GTK $dist
-              label mainmenu
-                      menu label ^Back..
-                      menu exit
-EOF
-for arch in $DEBIAN_ARCHS; do
-cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
-              menu begin debian-gtk-$dist-$arch
-                      menu title Debian GTK $dist $arch
-                      label mainmenu
-                              menu label ^Back..
-                              menu exit
-                      DEFAULT install
-                      LABEL install
-                              kernel debian-gtk-$dist/$arch/linux
-                              append vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz --
-                      LABEL expert
-                              kernel debian-gtk-$dist/$arch/linux
-                              append priority=low vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz --
-                      LABEL rescue
-                              kernel debian-gtk-$dist/$arch/linux
-                              append vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz rescue/enable=true --
-                      LABEL auto
-                              kernel debian-gtk-$dist/$arch/linux
-                              append auto=true priority=critical vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz --
-              menu end
-EOF
-done
-cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
-      menu end
+#~ cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
+      #~ menu begin debian-gtk-$dist
+              #~ menu title Debian GTK $dist
+              #~ label mainmenu
+                      #~ menu label ^Back..
+                      #~ menu exit
+#~ EOF
+#~ for arch in $DEBIAN_ARCHS; do
+#~ cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
+              #~ menu begin debian-gtk-$dist-$arch
+                      #~ menu title Debian GTK $dist $arch
+                      #~ label mainmenu
+                              #~ menu label ^Back..
+                              #~ menu exit
+                      #~ DEFAULT install
+                      #~ LABEL install
+                              #~ kernel debian-gtk-$dist/$arch/linux
+                              #~ append vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz --
+                      #~ LABEL expert
+                              #~ kernel debian-gtk-$dist/$arch/linux
+                              #~ append priority=low vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz --
+                      #~ LABEL rescue
+                              #~ kernel debian-gtk-$dist/$arch/linux
+                              #~ append vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz rescue/enable=true --
+                      #~ LABEL auto
+                              #~ kernel debian-gtk-$dist/$arch/linux
+                              #~ append auto=true priority=critical vga=normal initrd=debian-gtk-$dist/$arch/initrd.gz --
+              #~ menu end
+#~ EOF
+#~ done
+#~ cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
+      #~ menu end
 
-EOF
+#~ EOF
 done
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
@@ -383,6 +385,7 @@ for type in $UBUNTU_LIVE_TYPE; do
     	done
     done
 done
+/etc/init.d/nfs-kernel-server start
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu begin ubuntu-livecd
@@ -491,6 +494,7 @@ EOF
 #        Mandriva         #
 ###########################
 
+if [[ $MANDRIVA_DISTS != "" ]]; then
 for dist in $MANDRIVA_DISTS; do
     for arch in $MANDRIVA_ARCHS; do
         mkdir -p $TFTPROOT/mandriva-$dist/$arch/
@@ -545,6 +549,8 @@ done
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu end
 EOF
+
+fi
 ###########################
 #      fin Mandriva       #
 ###########################
@@ -555,11 +561,12 @@ EOF
 
 for dist in $CENTOS_DISTS; do
     for arch in $CENTOS_ARCHS; do
-        mkdir -p $TFTPROOT/centos-$dist/$arch/
-        wget -c $CENTOS_FTP/$dist/os/$arch/images/pxeboot/initrd.img -O $TFTPROOT/centos-$dist/$arch/initrd.img
-        wget -c $CENTOS_FTP/$dist/os/$arch/images/pxeboot/vmlinuz -O $TFTPROOT/centos-$dist/$arch/vmlinuz
+        mkdir -p $TMPDIR/centos-$dist/$arch/
+        wget -c $CENTOS_FTP/$dist/os/$arch/images/pxeboot/initrd.img -O $TMPDIR/centos-$dist/$arch/initrd.img
+        wget -c $CENTOS_FTP/$dist/os/$arch/images/pxeboot/vmlinuz -O $TMPDIR/centos-$dist/$arch/vmlinuz
     done
 done
+cp -r  $TMPDIR/centos-* $TFTPROOT/
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu begin centos
@@ -619,13 +626,14 @@ EOF
 
 for dist in $FEDORA_DISTS; do
     for arch in $FEDORA_ARCHS; do
-        mkdir -p $TFTPROOT/fedora-$dist/$arch/
-                wget -c $FEDORA_FTP/releases/$dist/Fedora/$arch/os/images/pxeboot/initrd.img -O $TFTPROOT/fedora-$dist/$arch/initrd.img ||\
-        wget -c $FEDORA_FTP/development/$dist/$arch/os/images/pxeboot/initrd.img -O $TFTPROOT/fedora-$dist/$arch/initrd.img
-                wget -c $FEDORA_FTP/releases/$dist/Fedora/$arch/os/images/pxeboot/vmlinuz -O $TFTPROOT/fedora-$dist/$arch/vmlinuz ||\
-        wget -c $FEDORA_FTP/development/$dist/$arch/os/images/pxeboot/vmlinuz -O $TFTPROOT/fedora-$dist/$arch/vmlinuz
+        mkdir -p $TMPDIR/fedora-$dist/$arch/
+                wget -c $FEDORA_FTP/releases/$dist/Fedora/$arch/os/images/pxeboot/initrd.img -O $TMPDIR/fedora-$dist/$arch/initrd.img ||\
+        wget -c $FEDORA_FTP/development/$dist/$arch/os/images/pxeboot/initrd.img -O $TMPDIR/fedora-$dist/$arch/initrd.img
+                wget -c $FEDORA_FTP/releases/$dist/Fedora/$arch/os/images/pxeboot/vmlinuz -O $TMPDIR/fedora-$dist/$arch/vmlinuz ||\
+        wget -c $FEDORA_FTP/development/$dist/$arch/os/images/pxeboot/vmlinuz -O $TMPDIR/fedora-$dist/$arch/vmlinuz
     done
 done
+cp -r $TMPDIR/fedora-* $TFTPROOT/
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu begin fedora
@@ -655,13 +663,13 @@ EOF
                        label install
                                menu label ^Install
                                kernel fedora-$dist/$arch/vmlinuz
-                               append ksdevice=eth0 console=tty0 initrd=fedora-$dist/$arch/initrd.img ks=http://$OWN_IP/pxe/ks.fedora-$dist-$arch.cfg ramdisk_size=8192
+                               append initrd=fedora-$dist/$arch/initrd.img repo=$FEDORA_FTP/releases/$dist/Fedora/$arch/os/
         menu end
 EOF
-        cat > $KSROOT/ks.fedora-$dist-$arch.cfg << EOF
-install
-url --url $FEDORA_FTP/releases/$dist/Fedora/$arch/os/
-EOF
+        #~ cat > $KSROOT/ks.fedora-$dist-$arch.cfg << EOF
+#~ install
+#~ url --url $FEDORA_FTP/releases/$dist/Fedora/$arch/os/
+#~ EOF
     done
 
     cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
@@ -680,10 +688,11 @@ EOF
 #        openSUSE         #
 ###########################
 for dist in $OPENSUSE_DISTS; do
-    mkdir -p $TFTPROOT/opensuse-$dist/$arch/
-    wget $OPENSUSE_FTP/$dist/repo/oss/boot/$arch/loader/linux -O $TFTPROOT/opensuse-$dist/$arch/linux
-    wget $OPENSUSE_FTP/$dist/repo/oss/boot/$arch/loader/initrd -O $TFTPROOT/opensuse-$dist/$arch/initrd
+    mkdir -p $TMPDIR/opensuse-$dist/$arch/
+    wget $OPENSUSE_FTP/$dist/repo/oss/boot/$arch/loader/linux -O $TMPDIR/opensuse-$dist/$arch/linux
+    wget $OPENSUSE_FTP/$dist/repo/oss/boot/$arch/loader/initrd -O $TMPDIR/opensuse-$dist/$arch/initrd
 done
+cp -r $TMPDIR/opensuse-* $TFTPROOT/
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu begin opensuse
@@ -733,12 +742,14 @@ EOF
 ###########################
 #        FreeBSD          #
 ###########################
+if [[ $FREEBSD_DISTS != "" ]]; then
 for dist in $FREEBSD_DISTS; do
     for arch in $FREEBSD_ARCHS; do
-        mkdir -p $TFTPROOT/freebsd-$dist/$arch/
-                wget -c $FREEBSD_FTP/releases/$arch/ISO-IMAGES/$dist/FreeBSD-$dist-RELEASE-$arch-bootonly.iso -O $TFTPROOT/freebsd-$dist/$arch/bootonly.iso
+        mkdir -p $TMPDIR/freebsd-$dist/$arch/
+                wget -c $FREEBSD_FTP/releases/$arch/ISO-IMAGES/$dist/FreeBSD-$dist-RELEASE-$arch-bootonly.iso -O $TMPDIR/freebsd-$dist/$arch/bootonly.iso
     done
 done
+cp -r $TMPDIR/freebsd-* $TFTPROOT/
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu begin freebsd
@@ -782,7 +793,7 @@ done
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu end
 EOF
-
+fi
 ###########################
 #      Fin FreeBSD        #
 ###########################
@@ -792,22 +803,22 @@ EOF
 ###########################
 # Le fichier de boot est le même pour les deux architectures
 # On prend toujours le plus récent
-mkdir -p $TFTPROOT/netbsd/
-dist=4.0.1
-wget -c $NETBSD_FTP/NetBSD-$dist/amd64/installation/misc/pxeboot_ia32.bin -O $TFTPROOT/netbsd/pxeboot_ia32.bin
+#~ mkdir -p $TFTPROOT/netbsd/
+#~ dist=4.0.1
+#~ wget -c $NETBSD_FTP/NetBSD-$dist/amd64/installation/misc/pxeboot_ia32.bin -O $TFTPROOT/netbsd/pxeboot_ia32.bin
 
 # Hack moche : la version 5.0.1 ne supporte pas le netboot (le kernel freeze)
 #for dist in $NETBSD_DISTS; do
-    for arch in $NETBSD_ARCHS; do
-        wget -c $NETBSD_FTP/NetBSD-$dist/$arch/binary/kernel/netbsd-INSTALL.gz -O $TFTPROOT/netbsd/netbsd-$dist-$arch.gz
-    done
+    #~ for arch in $NETBSD_ARCHS; do
+        #~ wget -c $NETBSD_FTP/NetBSD-$dist/$arch/binary/kernel/netbsd-INSTALL.gz -O $TFTPROOT/netbsd/netbsd-$dist-$arch.gz
+    #~ done
 #done
 
-cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
-label NetBSD
-    kernel netbsd/pxeboot_ia32.bin
+#~ cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
+#~ label NetBSD
+    #~ kernel netbsd/pxeboot_ia32.bin
 
-EOF
+#~ EOF
 ###########################
 #        Fin NetBSD       #
 ###########################
@@ -815,14 +826,16 @@ EOF
 ###########################
 #        OpenBSD          #
 ###########################
-mkdir -p $TFTPROOT/openbsd
+if [[ $OPENBSD_DIST != "" ]]; then
+mkdir -p $TMPDIR/openbsd
 for dist in $OPENBSD_DIST; do
     for arch in $OPENBSD_ARCHS; do
         # On ne garde que le dernier fichier de boot
-        wget -c $OPENBSD_FTP/$dist/$arch/pxeboot -O $TFTPROOT/openbsd/openbsd.$arch.0
-        wget -c $OPENBSD_FTP/$dist/$arch/bsd.rd -O $TFTPROOT/openbsd/bsd.rd-$dist.$arch
+        wget -c $OPENBSD_FTP/$dist/$arch/pxeboot -O $TMPDIR/openbsd/openbsd.$arch.0
+        wget -c $OPENBSD_FTP/$dist/$arch/bsd.rd -O $TMPDIR/openbsd/bsd.rd-$dist.$arch
     done
 done
+cp -r $TMPDIR/openbsd/ $TFTPROOT/
 
 cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu begin openbsd
@@ -840,11 +853,11 @@ cat >> $TFTPROOT/boot-screens/menu.cfg << EOF
 menu end
 EOF
 done
+fi
 ###########################
 #        Fin OpenBSD      #
 ###########################
 
-#On redémarre de tftp
-/etc/init.d/tftpd-hpa restart
-/etc/init.d/nfs-kernel-server start
+
+
 echo "Fini"