Subversion Repositories ALCASAR

Rev

Rev 2750 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 2750 Rev 2860
Line 20... Line 20...
20
ARCH=`cat /etc/release|cut -c 33-38`
20
ARCH=`cat /etc/release|cut -c 33-38`
21
MAGEIA_NEW_DIR=/tmp/mageia_new
21
MAGEIA_NEW_DIR=/tmp/mageia_new
22
MAGEIA_OFFICIAL_DIR=/tmp/mageia_official
22
MAGEIA_OFFICIAL_DIR=/tmp/mageia_official
23
# ISO file
23
# ISO file
24
ISO_DIR="/var/iso"
24
ISO_DIR="/var/iso"
25
ISO_IN="$ISO_DIR/Mageia-$MAGEIA_VERSION-$ARCH-DVD.iso"
25
ISO_IN="$ISO_DIR/Mageia-$MAGEIA_VERSION-$ARCH.iso"
26
 
26
 
27
# Drake installer
27
# Drake installer
28
INSTALLER_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/alcasar"
28
INSTALLER_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/alcasar"
29
EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/EFI/BOOT/grub.cfg"
29
EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/boot/grub2/grub.cfg"
30
AUTO_INSTALL_CFG="/var/iso/auto_inst.cfg.pl"
30
AUTO_INSTALL_CFG="/var/iso/auto_inst.cfg.pl"
31
ADVERT_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/extra/advertising"
31
ADVERT_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/extra/advertising"
32
 
32
 
33
# Alcasar
33
# Alcasar
34
ALCASAR_TAR="$1"
34
ALCASAR_TAR="$1"
35
ALCASAR_EXTRACTED_DIR=$(echo $ALCASAR_TAR | rev | cut -d '.' -f 3- | rev)
35
ALCASAR_EXTRACTED_DIR=$(echo $ALCASAR_TAR | rev | cut -d '.' -f 3- | rev)
36
 
36
 
37
# Mirrors
37
# Mirrors
38
ISO_SUPPORT="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH-DVD/Mageia-$MAGEIA_VERSION-$ARCH-DVD.iso"
38
ISO_SUPPORT="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH/Mageia-$MAGEIA_VERSION-$ARCH.iso"
39
ISO_MD5="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH-DVD/Mageia-$MAGEIA_VERSION-$ARCH-DVD.iso.md5"
39
ISO_MD5="http://ftp.free.fr/mirrors/mageia.org/iso/$MAGEIA_VERSION/Mageia-$MAGEIA_VERSION-$ARCH/Mageia-$MAGEIA_VERSION-$ARCH.iso.md5"
40
 
40
 
41
# RPMs
41
# RPMs
42
RPM_DIR="/root/rpms"
42
RPM_DIR="/root/rpms"
43
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"
43
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"
44
 
44
 
45
#######################
45
#######################
46
###### Functions ######
46
###### Functions ######
47
################################################################################
47
################################################################################
48
# Print the given error message and exit 1
48
# Print the given error message and exit 1
Line 161... Line 161...
161
 
161
 
162
# Copying the RPM in core and nonfree and clearing the plop.idx file
162
# Copying the RPM in core and nonfree and clearing the plop.idx file
163
echo "Copying RPMS in ISO ..."
163
echo "Copying RPMS in ISO ..."
164
echo /dev/null > ${plopFilePath}
164
echo /dev/null > ${plopFilePath}
165
 
165
 
-
 
166
dnf upgrade -y
-
 
167
 
166
installedList="$(dnf list installed | cut -d ' ' -f1 | rev | cut -d . -f2- | rev | tail -n +2 | tr '\n' ' ')"
168
installedList="$(dnf list installed | cut -d ' ' -f1 | rev | cut -d . -f2- | rev | tail -n +2 | tr '\n' ' ')"
167
nbInstalled=$(echo $installedList | wc -w)
169
nbInstalled=$(echo $installedList | wc -w)
168
rpmList="$installedList $BASE_RPM_LIST $alcasarRpmList"
170
rpmList="$installedList $BASE_RPM_LIST $alcasarRpmList"
169
total=`echo $rpmList | wc -w`
171
total=`echo $rpmList | wc -w`
170
 
172
 
Line 213... Line 215...
213
mkdir ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info
215
mkdir ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info
214
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/compssUsers.pl ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/compssUsers.pl
216
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/compssUsers.pl ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/compssUsers.pl
215
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/media.cfg ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/media.cfg
217
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/media.cfg ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/media.cfg
216
 
218
 
217
# Specify install configuration
219
# Specify install configuration
218
sed -i -e 's*rdz*rdz kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  ${MAGEIA_NEW_DIR}/isolinux/isolinux.cfg
220
#sed -i -e 's*rdz*rdz kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  ${MAGEIA_NEW_DIR}/isolinux/isolinux.cfg
219
sed -i -e 's*noiswmd*noiswmd kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  $EFI_GRUB_CFG 
221
sed -i -e 's*noiswmd*noiswmd kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  $EFI_GRUB_CFG 
220
 
222
 
221
# Generating distr
223
# Generating distr
222
echo "Generating mirror tree..."
224
echo "Generating mirror tree..."
223
gendistrib -s ${MAGEIA_NEW_DIR}/${ARCH}
225
gendistrib -s ${MAGEIA_NEW_DIR}/${ARCH}
Line 233... Line 235...
233
#    -boot-info-table -J -R -V "Mageia-$MAGEIA_VERSION Alcasar ${ARCH}" .
235
#    -boot-info-table -J -R -V "Mageia-$MAGEIA_VERSION Alcasar ${ARCH}" .
234
 
236
 
235
cd ${MAGEIA_NEW_DIR} && xorriso -as mkisofs -quiet -o ${CURRENT_DIR}/${newIsoName} \
237
cd ${MAGEIA_NEW_DIR} && xorriso -as mkisofs -quiet -o ${CURRENT_DIR}/${newIsoName} \
236
    -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
238
    -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
237
    -isohybrid-gpt-basdat \
239
    -isohybrid-gpt-basdat \
238
    -b isolinux/isolinux.bin \
240
    -b /boot/grub2/eltorito.img \
239
    -c boot.catalog \
241
    -c boot.catalog \
240
    -no-emul-boot -boot-load-size 4 \
242
    -no-emul-boot -boot-load-size 4 \
241
    -boot-info-table -J -R -V "Mageia-$MAGEIA_VERSION Alcasar ${ARCH}" .
243
    -boot-info-table -J -R -V "Mageia-$MAGEIA_VERSION Alcasar ${ARCH}" .
242
 
244
 
-
 
245
 
243
# Unmounting
246
# Unmounting
244
echo "Umounting..."
247
echo "Umounting..."
245
umount ${MAGEIA_OFFICIAL_DIR} && rmdir ${MAGEIA_OFFICIAL_DIR}
248
umount ${MAGEIA_OFFICIAL_DIR} && rmdir ${MAGEIA_OFFICIAL_DIR}
246
 
249
 
247
# Removing temporary dir
250
# Removing temporary dir