| 26,6 → 26,7 |
| |
| # Drake installer |
| INSTALLER_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/alcasar" |
| EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/EFI/BOOT/grub.cfg" |
| AUTO_INSTALL_CFG="/var/iso/auto_inst.cfg.pl" |
| ADVERT_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/extra/advertising" |
| |
| 39,7 → 40,7 |
| |
| # 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-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" |
| |
| ####################### |
| ###### Functions ###### |
| 98,9 → 99,10 |
| |
| # Installing tools to create the iso |
| printBold "Installing necessary tools" |
| dnf install 'dnf-command(download)' -y >/dev/null || errorExit "could not install necessary packages" |
| dnf config-manager --set-enabled mageia-x86_64-nonfree updates-x86_64-nonfree >/dev/null || errorExit "could not install necessary packages" |
| dnf install -y lftp wget cdrkit-genisoimage rpmtools >/dev/null || errorExit "could not install necessary packages" |
| dnf install 'dnf-command(download)' -y || errorExit "could not install necessary packages" |
| #dnf install 'dnf-command(config-manager)' -y || errorExit "could not install necessary packages" |
| dnf config-manager --set-enabled mageia-x86_64-nonfree updates-x86_64-nonfree || errorExit "could not install necessary packages" |
| dnf install -y lftp wget cdrkit-genisoimage xorriso rpmtools syslinux || errorExit "could not install necessary packages" |
| |
| |
| # Directories initialization |
| 122,7 → 124,7 |
| # Mounting the image |
| printBold "Mounting the image" |
| [[ ! -d "$MAGEIA_OFFICIAL_DIR" ]] && mkdir -p "$MAGEIA_OFFICIAL_DIR" |
| mount -o ro,loop "$ISO_IN" "$MAGEIA_OFFICIAL_DIR" || errorExit "failed mounting $ISO_IN" |
| mount -o ro,loop "$ISO_IN" "$MAGEIA_OFFICIAL_DIR" || (sleep 5 ; mount -o ro,loop "$ISO_IN" "$MAGEIA_OFFICIAL_DIR" || errorExit "failed mounting $ISO_IN. Running the script again might solve the issue.") |
| |
| # Checking ARCHitecture |
| [[ -d ${MAGEIA_OFFICIAL_DIR}/x86_64 ]] && ARCH=x86_64 || ARCH=i586 |
| 214,6 → 216,7 |
| |
| # 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*noiswmd*noiswmd kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g' $EFI_GRUB_CFG |
| |
| # Generating distr |
| echo "Generating mirror tree..." |
| 223,7 → 226,15 |
| echo "Creating the isofile..." |
| alcasarVersion=$(echo $ALCASAR_TAR | cut -d '-' -f2 | rev | cut -d '.' -f 3- | rev ) |
| newIsoName=Mageia-$MAGEIA_VERSION-${ARCH}-Alcasar${alcasarVersion}.iso |
| cd ${MAGEIA_NEW_DIR} && genisoimage -quiet -o ${CURRENT_DIR}/${newIsoName} \ |
| #cd ${MAGEIA_NEW_DIR} && genisoimage -quiet -o ${CURRENT_DIR}/${newIsoName} \ |
| # -b isolinux/isolinux.bin \ |
| # -c boot.catalog \ |
| # -no-emul-boot -boot-load-size 4 \ |
| # -boot-info-table -J -R -V "Mageia-$MAGEIA_VERSION Alcasar ${ARCH}" . |
| |
| 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 \ |
| -c boot.catalog \ |
| -no-emul-boot -boot-load-size 4 \ |