DTux/dtux__config_lalis
Archived
1
0
Fork 0
Code

Bugs mineurs corrigés

Browse Source 
Signed-off-by: Daniel Tartavel <contact@librepc.com>
This commit is contained in:
Daniel Tartavel 2019-02-03 18:18:44 +01:00
parent 2e24e32af1
commit c413ec0bda
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirror_mageia
View File

@ -8,7 +8,7 @@ DESTMAIL="contact@lalis.fr"
FROMMAIL="root@lalis.fr" FROMMAIL="root@lalis.fr"
TASKRPM="task-lalis" TASKRPM="task-lalis"
MIRRORPATH="/mirror/mageia" MIRRORPATH="/mirror/mageia"
MEDIAINFO_PATH="$MIRRORPATH/config_lalis" MEDIAINFO_PATH="$MIRRORPATH/config_lalis/media_info"
MSG=/tmp/mirror_mageia.mail MSG=/tmp/mirror_mageia.mail
SERVEUR="rsync://fr2.rpmfind.net/linux/mageia" SERVEUR="rsync://fr2.rpmfind.net/linux/mageia"
#SERVEUR="http://ftp.free.fr/mirrors/mageia.org" #SERVEUR="http://ftp.free.fr/mirrors/mageia.org"
@ -32,7 +32,7 @@ iferror( ) #$RESULT, $TXT, $LINENO
{ {
if [ "$1" -eq 0 ];then if [ "$1" -eq 0 ];then
echo -e "$2: réussi" echo -e "$2: réussi"
echo -e "$2: réussi" >>$MSG #echo -e "$2: réussi" >>$MSG
else else
echo -e "\e[36mligne $3 - $2\e[0m: échoué" echo -e "\e[36mligne $3 - $2\e[0m: échoué"
echo -e "ligne $3 - $2: échoué" >>$MSG echo -e "ligne $3 - $2: échoué" >>$MSG

31
mirror_mageia_hd
View File

@ -4,6 +4,7 @@ version="6"
dossier="" dossier=""
boot="" boot=""
param=" --delete-excluded --exclude SRPMS/ --exclude *_testing/ --exclude */debug/ --exclude aarch64/ --exclude armv5tl/ --exclude armv7hl/ " param=" --delete-excluded --exclude SRPMS/ --exclude *_testing/ --exclude */debug/ --exclude aarch64/ --exclude armv5tl/ --exclude armv7hl/ "
param_iso=""
for DIRECTORY in /run/media/$USER/* for DIRECTORY in /run/media/$USER/*
do do
@ -47,9 +48,19 @@ else
fi fi
if [ -n $dossier ] && [ -n $boot ];then if [ -n $dossier ] && [ -n $boot ];then
# synchronisation du miroir
echo "rsync -avP $param $serveur/mageia/distrib/$version/ $dossier/$version/" echo "rsync -avP $param $serveur/mageia/distrib/$version/ $dossier/$version/"
rsync -aP $param $serveur/mageia/distrib/$version $dossier/ 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 cd $dossier/$version
echo "rsync -aP i586/isolinux/i386/vmlinuz $boot/vmlinuz_"$version"_i586" echo "rsync -aP i586/isolinux/i386/vmlinuz $boot/vmlinuz_"$version"_i586"
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 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 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 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 # rsync -aP x86_64/isolinux/x86_64/all.rdz $boot/all_cauldron_x86_64.rdz
fi fi