diff --git a/gestion/gen_confs/pxeboot/config b/gestion/gen_confs/pxeboot/config index be3ad2f5..fba40258 100644 --- a/gestion/gen_confs/pxeboot/config +++ b/gestion/gen_confs/pxeboot/config @@ -12,10 +12,9 @@ SKELETON="$TFTPROOT-base" TMPDIR="/var/tmp/build-netboot" ISODIR="/var/lib/tftpboot-g" WGETOPT="-4" -[[ $1 == "" ]] && echo "Il faut spécifier l'IP" && exit 1 +[[ $1 == "" ]] && echo "Il faut spécifier l'IP du serveur en paramètre" && exit 1 OWN_IP="$1" /etc/init.d/nfs-kernel-server stop -umount /var/lib/tftpboot/livecd/ubuntu/* || true; # Définitions spécifiques au Sys Rescue CD SYSRCCD_ARCHS="" @@ -37,8 +36,10 @@ UBUNTU_ARCHS="i386 amd64" UBUNTU_FTP="ftp://ftp.crans.org/ubuntu/dists" 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 +# il faut modifier le nfs (ajouter la sortie de export_ubuntu_live +# à /etc/exports) et mettre les images dans $ISODIR/ubuntu/ puis +# les monter dans $TFTPROOT/livecd/ubuntu/$dist-$arch avec +# mount_ubuntu_live UBUNTU_LIVE_TYPE="ubuntu xubuntu kubuntu" UBUNTU_LIVE_ARCHS="i386 amd64" @@ -57,6 +58,7 @@ FEDORA_DISTS="18 19" FEDORA_ARCHS="i386 x86_64" FEDORA_FTP="ftp://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/" +# Définitions spécifiques à OpenSuse 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/export_ubuntu_live b/gestion/gen_confs/pxeboot/export_ubuntu_live new file mode 100755 index 00000000..74aec833 --- /dev/null +++ b/gestion/gen_confs/pxeboot/export_ubuntu_live @@ -0,0 +1,16 @@ +#!/bin/bash +. /usr/scripts/gestion/gen_confs/pxeboot/config +# /var/lib/tftpboot/livecd/ubuntu/ubuntu-12.04-i386 138.231.136.0/21(async,no_subtree_check,no_root_squash,ro) +for type in $UBUNTU_LIVE_TYPE; do + echo "########## Netboot $type ##########" + 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 "$TFTPROOT/livecd/ubuntu/$type-$dist-$arch 138.231.136.0/21(async,no_subtree_check,no_root_squash,ro)" + fi + done + done + echo +done + +/etc/init.d/nfs-kernel-server start diff --git a/gestion/gen_confs/pxeboot/mount_ubuntu_live b/gestion/gen_confs/pxeboot/mount_ubuntu_live index 20666fa3..971e52fb 100755 --- a/gestion/gen_confs/pxeboot/mount_ubuntu_live +++ b/gestion/gen_confs/pxeboot/mount_ubuntu_live @@ -1,12 +1,12 @@ #!/bin/bash . /usr/scripts/gestion/gen_confs/pxeboot/config - +umount $TFTPROOT/livecd/ubuntu/* || true; 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 mkdir -p $TFTPROOT/livecd/ubuntu/$type-$dist-$arch - mount -o loop $ISODIR/ubuntu/$type-$dist-desktop-$arch.iso $TFTPROOT/livecd/ubuntu/$type-$dist-$arch + mount -o loop,ro $ISODIR/ubuntu/$type-$dist-desktop-$arch.iso $TFTPROOT/livecd/ubuntu/$type-$dist-$arch fi done done diff --git a/gestion/gen_confs/pxeboot/pxeboot b/gestion/gen_confs/pxeboot/pxeboot index e4a02c50..70d52ef5 100755 --- a/gestion/gen_confs/pxeboot/pxeboot +++ b/gestion/gen_confs/pxeboot/pxeboot @@ -310,6 +310,7 @@ for dist in $UBUNTU_DISTS; do done done +umount $TFTPROOT/livecd/ubuntu/* || true; for type in $UBUNTU_LIVE_TYPE; do for dist in $UBUNTU_LIVE; do for arch in $UBUNTU_LIVE_ARCHS; do