diff options
| -rwxr-xr-x | create_dvd.sh | 6 | ||||
| -rw-r--r-- | dvd_free-i586.xml | 8 | ||||
| -rw-r--r-- | dvd_free-x86_64.xml | 8 |
3 files changed, 13 insertions, 9 deletions
diff --git a/create_dvd.sh b/create_dvd.sh index 2ba1b8e..6f70799 100755 --- a/create_dvd.sh +++ b/create_dvd.sh @@ -2,7 +2,7 @@ arch=$1 distrib=Mageia -version=6-sta2 +version=6 homebcd=/home/bcd/build_bcd bin=$homebcd/bcd pieces=$homebcd/pieces/iso @@ -35,13 +35,17 @@ then cd $build tar -xvJf $pieces/DVD-EFI.tar.xz cd - + rm -f $build/isolinux/$arch/all-nonfree.rdz else rm -f $build/isolinux/i386.cfg perl -pi -e 's/i586/i386/' $build/isolinux/isolinux.cfg + rm -f $build/isolinux/i386/all-nonfree.rdz fi cp -f $pieces/message $build/isolinux/bootlogo +rm -rf $homebcd/build/$distrib-$version-$arch/$arch/install/images + $bin/bcd.pl dvd_free-$arch.xml iso date > $homebcd/iso/$distrib-$version-$arch/DATE.txt cd $homebcd/iso/$distrib-$version-$arch diff --git a/dvd_free-i586.xml b/dvd_free-i586.xml index 524a794..338b71e 100644 --- a/dvd_free-i586.xml +++ b/dvd_free-i586.xml @@ -146,7 +146,7 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>6-sta2</version> + <version>6</version> <!-- set fullpath if you want to use an files in a non MDV repositery --> <fullpath>/home/bcd/build_bcd/pieces/cauldron/i586/media/media_info</fullpath> <mediainfo_dir>media/media_info</mediainfo_dir> @@ -182,11 +182,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia-6-sta2-i586</volumeid> - <volumesetid>Mageia 6 sta2 - i586 DVD</volumesetid> + <volumeid>Mageia-6-i586</volumeid> + <volumesetid>Mageia 6 - i586 DVD</volumesetid> <publisherid>Mageia</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>Mageia 6 sta2</applicationid> + <applicationid>Mageia 6</applicationid> <copyrightid>Mageia</copyrightid> </header> <isohybrid> diff --git a/dvd_free-x86_64.xml b/dvd_free-x86_64.xml index 4356b13..b23ec88 100644 --- a/dvd_free-x86_64.xml +++ b/dvd_free-x86_64.xml @@ -146,7 +146,7 @@ </media> <mediainfo desc="All files relatives to media_info dir"> - <version>6-sta2</version> + <version>6</version> <!-- set fullpath if you want to use an files in a non MDV repositery --> <fullpath>/home/bcd/build_bcd/pieces/cauldron/x86_64/media/media_info</fullpath> <mediainfo_dir>media/media_info</mediainfo_dir> @@ -182,11 +182,11 @@ <synthesis>yes</synthesis> <header desc="Iso header info"> <systemid>Mageia</systemid> - <volumeid>Mageia-6-sta2-x86_64</volumeid> - <volumesetid>Mageia 6 sta2 - x86_64 DVD</volumesetid> + <volumeid>Mageia-6-x86_64</volumeid> + <volumesetid>Mageia 6 - x86_64 DVD</volumesetid> <publisherid>Mageia</publisherid> <datapreparer>Mageia BCD</datapreparer> - <applicationid>Mageia 6 sta2</applicationid> + <applicationid>Mageia 6</applicationid> <copyrightid>Mageia</copyrightid> </header> <isohybrid> |