| 22,11 → 22,11 |
|---|
| MAGEIA_OFFICIAL_DIR=/tmp/mageia_official |
| # ISO file |
| ISO_DIR="/var/iso" |
| ISO_IN="$ISO_DIR/Mageia-$MAGEIA_VERSION-$ARCH-DVD.iso" |
| ISO_IN="$ISO_DIR/Mageia-$MAGEIA_VERSION-$ARCH.iso" |
| |
| # Drake installer |
| INSTALLER_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/alcasar" |
| EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/EFI/BOOT/grub.cfg" |
| EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/boot/grub2/grub.cfg" |
| AUTO_INSTALL_CFG="/var/iso/auto_inst.cfg.pl" |
| ADVERT_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/extra/advertising" |
| |
| 35,12 → 35,12 |
|---|
| ALCASAR_EXTRACTED_DIR=$(echo $ALCASAR_TAR | rev | cut -d '.' -f 3- | rev) |
| |
| # Mirrors |
| ISO_SUPPORT="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH-DVD/Mageia-$MAGEIA_VERSION-$ARCH-DVD.iso" |
| ISO_MD5="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH-DVD/Mageia-$MAGEIA_VERSION-$ARCH-DVD.iso.md5" |
| ISO_SUPPORT="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH/Mageia-$MAGEIA_VERSION-$ARCH.iso" |
| ISO_MD5="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH/Mageia-$MAGEIA_VERSION-$ARCH.iso.md5" |
| |
| # RPMs |
| RPM_DIR="/root/rpms" |
| BASE_RPM_LIST="acpi acpid alsa-utils aoss arp-scan basesystem bash-completion coreutils-doc cpupower curl dhcp-client dmraid dnf dnf-plugins-core dosfstools dracut drakx-net-text gpm grub2 grub2-efi grub2-mageia-theme harddrake hdparm hexedit info iwlwifi-agn-ucode kernel-desktop-latest kernel-firmware kernel-firmware-nonfree ldetect lftp lib64alsa-plugins lib64glib-networking-gnutls locales-en locales-fr lsof lvm2 mageia-theme-Default man-db mandi-ifw man-pages microcode microcode_ctl mtools ntfs-3g numlock os-prober p11-kit perl-Hal-Cdroms plymouth procmail python3 python3-dbus radeon-firmware ralink-firmware rtlwifi-firmware sharutils shorewall-ipv6 strace sysfsutils tmpwatch tree vim-minimal vnstat xdg-user-dirs-gtk" |
| BASE_RPM_LIST="acpi acpid alsa-utils aoss arp-scan basesystem bash-completion coreutils-doc cpupower curl dhcp-client dmraid dnf dnf-plugins-core dosfstools dracut drakx-net-text gpm grub2 grub2-efi grub2-mageia-theme harddrake hdparm hexedit info iwlwifi-agn-ucode kernel-desktop-latest kernel-firmware kernel-firmware-nonfree ldetect lftp lib64alsa-plugins lib64glib-networking-gnutls locales-en locales-fr lsof lvm2 mageia-theme-Default man-db mandi-ifw man-pages microcode microcode_ctl mtools ntfs-3g numlock os-prober p11-kit perl-Hal-Cdroms plymouth procmail python3 python3-dbus radeon-firmware ralink-firmware rtlwifi-firmware sharutils shorewall-ipv6 strace sysfsutils tmpwatch tree vim-minimal vnstat xdg-user-dirs-gtk sudo" |
| |
| ####################### |
| ###### Functions ###### |
| 163,6 → 163,8 |
|---|
| echo "Copying RPMS in ISO ..." |
| echo /dev/null > ${plopFilePath} |
| |
| dnf upgrade -y |
| |
| installedList="$(dnf list installed | cut -d ' ' -f1 | rev | cut -d . -f2- | rev | tail -n +2 | tr '\n' ' ')" |
| nbInstalled=$(echo $installedList | wc -w) |
| rpmList="$installedList $BASE_RPM_LIST $alcasarRpmList" |
| 215,7 → 217,7 |
|---|
| cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/media.cfg ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/media.cfg |
| |
| # Specify install configuration |
| sed -i -e 's*rdz*rdz kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g' ${MAGEIA_NEW_DIR}/isolinux/isolinux.cfg |
| #sed -i -e 's*rdz*rdz kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g' ${MAGEIA_NEW_DIR}/isolinux/isolinux.cfg |
| sed -i -e 's*noiswmd*noiswmd kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g' $EFI_GRUB_CFG |
| |
| # Generating distr |
| 235,11 → 237,12 |
|---|
| cd ${MAGEIA_NEW_DIR} && xorriso -as mkisofs -quiet -o ${CURRENT_DIR}/${newIsoName} \ |
| -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \ |
| -isohybrid-gpt-basdat \ |
| -b isolinux/isolinux.bin \ |
| -b /boot/grub2/eltorito.img \ |
| -c boot.catalog \ |
| -no-emul-boot -boot-load-size 4 \ |
| -boot-info-table -J -R -V "Mageia-$MAGEIA_VERSION Alcasar ${ARCH}" . |
| |
| |
| # Unmounting |
| echo "Umounting..." |
| umount ${MAGEIA_OFFICIAL_DIR} && rmdir ${MAGEIA_OFFICIAL_DIR} |