diff --git a/mirror_mageia b/mirror_mageia index 2d54180..0435703 100644 --- a/mirror_mageia +++ b/mirror_mageia @@ -8,7 +8,7 @@ DESTMAIL="contact@lalis.fr" FROMMAIL="root@lalis.fr" TASKRPM="task-lalis" MIRRORPATH="/mirror/mageia" -MEDIAINFO_PATH="$MIRRORPATH/config_lalis" +MEDIAINFO_PATH="$MIRRORPATH/config_lalis/media_info" MSG=/tmp/mirror_mageia.mail SERVEUR="rsync://fr2.rpmfind.net/linux/mageia" #SERVEUR="http://ftp.free.fr/mirrors/mageia.org" @@ -32,7 +32,7 @@ iferror( ) #$RESULT, $TXT, $LINENO { if [ "$1" -eq 0 ];then echo -e "$2: réussi" - echo -e "$2: réussi" >>$MSG + #echo -e "$2: réussi" >>$MSG else echo -e "\e[36mligne $3 - $2\e[0m: échoué" echo -e "ligne $3 - $2: échoué" >>$MSG diff --git a/mirror_mageia_hd b/mirror_mageia_hd index f5c7bc3..0d7ea2b 100755 --- a/mirror_mageia_hd +++ b/mirror_mageia_hd @@ -4,6 +4,7 @@ version="6" dossier="" boot="" param=" --delete-excluded --exclude SRPMS/ --exclude *_testing/ --exclude */debug/ --exclude aarch64/ --exclude armv5tl/ --exclude armv7hl/ " +param_iso="" for DIRECTORY in /run/media/$USER/* do @@ -47,9 +48,19 @@ else fi if [ -n $dossier ] && [ -n $boot ];then + + # synchronisation du miroir echo "rsync -avP $param $serveur/mageia/distrib/$version/ $dossier/$version/" rsync -aP $param $serveur/mageia/distrib/$version $dossier/ + # synchronisation des iso + rsync -aP --exclude "*GNOME*" --exclude "*rescue*" $serveur/mageia/iso/"$version".1 `dirname $dossier`/iso/ + if [ -d $serveur/mageia.iso/"$vesion".1 ]; then + param_iso=" --delete-excluded --exclude '*Live*' " + fi + rsync -aP $param_iso --exclude "*GNOME*" --exclude "*rescue*" $serveur/mageia/iso/$version `dirname $dossier`/iso/ + + # copie du kernel et de initrd dans partition de boot cd $dossier/$version echo "rsync -aP i586/isolinux/i386/vmlinuz $boot/vmlinuz_"$version"_i586" rsync -aP i586/isolinux/i386/vmlinuz "$boot"/vmlinuz_"$version"_i586 @@ -58,16 +69,18 @@ if [ -n $dossier ] && [ -n $boot ];then rsync -aP i586/isolinux/i386/all.rdz "$boot"/all_"$version"_i586.rdz rsync -aP x86_64/isolinux/x86_64/all.rdz "$boot"/all_"$version"_x86_64.rdz -# if [ -d "/mirror/mageia/distrib/cauldron" ];then -# serveur='/mirror' -# else -# serveur="rsync://fr2.rpmfind.net/linux" -# fi -# rsync -aP $param $serveur/mageia/distrib/cauldron/ $dossier/cauldron/ -# cd $dossier/cauldron -# rsync -aP i586/isolinux/i386/vmlinuz $boot/vmlinuz_cauldron_i586 + + if [ -d "/mirror/mageia/distrib/cauldron" ];then + serveur='/mirror' + else + serveur="rsync://fr2.rpmfind.net/linux" + fi + rsync -aP $param $serveur/mageia/distrib/cauldron/i586 $dossier/cauldron/ + + cd $dossier/cauldron + rsync -aP i586/isolinux/i386/vmlinuz $boot/vmlinuz_cauldron_i586 # rsync -aP x86_64/isolinux/x86_64/vmlinuz $boot/vmlinuz_cauldron_x86_64 -# rsync -aP i586/isolinux/i386/all.rdz $boot/all_cauldron_i586.rdz + rsync -aP i586/isolinux/i386/all.rdz $boot/all_cauldron_i586.rdz # rsync -aP x86_64/isolinux/x86_64/all.rdz $boot/all_cauldron_x86_64.rdz fi