Subversion Repositories ALCASAR

Rev

Rev 2944 | Rev 2946 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 2944 Rev 2945
1
#!/bin/bash
1
#!/bin/bash
2
#
2
#
3
# Build Mageiar (Mageia + ALCASAR) ISO file
3
# Build Mageiar (Mageia + ALCASAR) ISO file
4
# Authors: Hamza ESSAYEGH (Querdos) - Rexy - Laurent Roux - Aurelien Dubois - Pierre Rivault
4
# Authors: Hamza ESSAYEGH (Querdos) - Rexy - Laurent Roux - Aurelien Dubois - Pierre Rivault
5
#
5
#
6
####################################
6
####################################
7
###### Variables & functions  ######
7
###### Variables & functions  ######
8
################################################################################
8
################################################################################
9
 
9
 
10
CURRENT_DIR="$(readlink -f "$(dirname $0)")"
10
CURRENT_DIR="$(readlink -f "$(dirname $0)")"
11
LOG_FILE="$CURRENT_DIR/build-image.log"
11
LOG_FILE="$CURRENT_DIR/build-image.log"
12
RESSOURCES="$CURRENT_DIR/ressources"
12
RESSOURCES="$CURRENT_DIR/ressources"
13
 
13
 
14
# Print the given error message and exit 1
14
# Print the given error message and exit 1
15
function errorExit()
15
function errorExit()
16
{
16
{
17
    tput bold
17
    tput bold
18
    echo -e "ERROR : $1 \nAborting\n" >&2
18
    echo -e "ERROR : $1 \nAborting\n" >&2
19
    echo "$1" > "$LOG_FILE"
19
    echo "$1" > "$LOG_FILE"
20
    tput sgr0
20
    tput sgr0
21
    exit 1
21
    exit 1
22
}
22
}
23
#-------------------------------------------------------------------------------
23
#-------------------------------------------------------------------------------
24
# Print progress bar. $1 is a multiple of five
24
# Print progress bar. $1 is a multiple of five
25
function printProgress()
25
function printProgress()
26
{
26
{
27
    local a
27
    local a
28
    let "a = $1 / 5"
28
    let "a = $1 / 5"
29
    let "b = 25 - $a"
29
    let "b = 25 - $a"
30
    progressStr=$(printf "%${a}s")
30
    progressStr=$(printf "%${a}s")
31
    progressStrBlanks=$(printf "%${b}s")
31
    progressStrBlanks=$(printf "%${b}s")
32
    echo -en "Downloading...$1% [${progressStr// /#}${progressStrBlanks// / }]\r"
32
    echo -en "Downloading...$1% [${progressStr// /#}${progressStrBlanks// / }]\r"
33
}
33
}
34
#-------------------------------------------------------------------------------
34
#-------------------------------------------------------------------------------
35
function printBold()
35
function printBold()
36
{
36
{
37
    tput bold 2>/dev/null
37
    tput bold 2>/dev/null
38
    echo $1
38
    echo $1
39
    tput sgr0 2>/dev/null
39
    tput sgr0 2>/dev/null
40
}
40
}
41
 
41
 
42
ISO_IN=`ls $RESSOURCES | grep '^Mageia.*iso'`
42
ISO_IN=`ls $RESSOURCES | grep '^Mageia.*iso'`
43
MAGEIA_VERSION=`echo $ISO_IN|cut -d"-" -f2`
43
MAGEIA_VERSION=`echo $ISO_IN|cut -d"-" -f2`
44
ARCH=`echo $ISO_IN |cut -d"-" -f3|cut -d"." -f1`
44
ARCH=`echo $ISO_IN |cut -d"-" -f3|cut -d"." -f1`
45
ALCASAR_TARBALL=`ls $RESSOURCES| grep '^alcasar.*gz'`
45
ALCASAR_TARBALL=`ls $RESSOURCES| grep '^alcasar.*gz'`
46
ALCASAR_EXTRACTED_DIR=$(echo $ALCASAR_TARBALL | rev | cut -d '.' -f 3- | rev)
46
ALCASAR_EXTRACTED_DIR=$(echo $ALCASAR_TARBALL | rev | cut -d '.' -f 3- | rev)
47
ALCASAR_VERSION=`echo $ALCASAR_EXTRACTED_DIR | cut -d"-" -f2`
47
ALCASAR_VERSION=`echo $ALCASAR_EXTRACTED_DIR | cut -d"-" -f2`
48
TMP_DIR=/var/tmp
48
TMP_DIR=/var/tmp
49
MAGEIA_NEW_DIR=$TMP_DIR/mageia_new
49
MAGEIA_NEW_DIR=$TMP_DIR/mageia_new
50
MAGEIA_OFFICIAL_DIR=$TMP_DIR/mageia_official
50
MAGEIA_OFFICIAL_DIR=$TMP_DIR/mageia_official
51
MAGEIA_OFFICIAL_DIR_EFI=$TMP_DIR/mageia_official_efi
-
 
52
coreDir=${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/core
51
coreDir=${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/core
53
nonFreeDir=${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/nonfree
52
nonFreeDir=${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/nonfree
-
 
53
mediaDirNew=${MAGEIA_NEW_DIR}/${ARCH}/media
54
coreDirNew=${MAGEIA_NEW_DIR}/${ARCH}/media/core/
54
coreDirNew=${MAGEIA_NEW_DIR}/${ARCH}/media/core/
55
nonFreeDirNew=${MAGEIA_NEW_DIR}/${ARCH}/media/nonfree
55
nonFreeDirNew=${MAGEIA_NEW_DIR}/${ARCH}/media/nonfree
-
 
56
urpmi_cache=/var/cache/urpmi/rpms
56
 
57
 
57
# Drake installer
58
# Drake installer
58
INSTALLER_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/alcasar"
59
INSTALLER_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/alcasar"
59
EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/boot/grub2/grub.cfg"
60
EFI_GRUB_CFG="${MAGEIA_NEW_DIR}/boot/grub2/grub.cfg"
60
ADVERT_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/extra/advertising"
61
ADVERT_DIR="${MAGEIA_NEW_DIR}/${ARCH}/install/extra/advertising"
61
AUTO_INSTALL_CFG=$TMP_DIR/auto_inst.cfg.pl
62
AUTO_INSTALL_CFG=$TMP_DIR/auto_inst.cfg.pl
62
 
63
 
63
# RPMs needed during an install stage
64
# RPMs needed during an install stage
64
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 ldetect lftp lib64alsa-plugins lib64glib-networking-gnutls locales-en locales-fr lsof lvm2 mageia-theme-Default man-db 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 socat mandi mandi-ifw"
65
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 ldetect lftp lib64alsa-plugins lib64glib-networking-gnutls locales-en locales-fr lsof lvm2 mageia-theme-Default man-db 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 socat mandi mandi-ifw"
-
 
66
ISO_RPM_LIST="cdrkit-genisoimage xorriso rpmtools syslinux"
65
 
67
 
66
#######################
68
#######################
67
######    Main    ######
69
######    Main    ######
68
################################################################################
70
################################################################################
69
 
71
 
70
# Some checks
72
# Some checks
71
[[ $(whoami) != 'root' ]] && errorExit 'Please run as root'
73
[[ $(whoami) != 'root' ]] && errorExit 'Please run as root'
72
[[ $ISO_IN == "" ]] && errorExit "No Mageia iso file in $RESSOURCES"
74
[[ $ISO_IN == "" ]] && errorExit "No Mageia iso file in $RESSOURCES"
73
[[ ! -f "$RESSOURCES/auto_inst.cfg.pl_template" ]] && errorExit "No auto_inst.cfg.pl_template file in $RESSOURCES"
75
[[ ! -f "$RESSOURCES/auto_inst.cfg.pl_template" ]] && errorExit "No auto_inst.cfg.pl_template file in $RESSOURCES"
74
[[ $ALCASAR_TARBALL == "" ]] && errorExit "No ALCASAR tarball file in $RESSOURCES"
76
[[ $ALCASAR_TARBALL == "" ]] && errorExit "No ALCASAR tarball file in $RESSOURCES"
75
 
77
 
76
for directory in $MAGEIA_NEW_DIR $MAGEIA_OFFICIAL_DIR $MAGEIA_OFFICIAL_DIR_EFI
78
for directory in $MAGEIA_NEW_DIR $MAGEIA_OFFICIAL_DIR
77
do
79
do
78
	[ -d $directory ] || mkdir -p $directory
80
	[ -d $directory ] || mkdir -p $directory
79
done
81
done
80
printBold "Mageiar will be build with Mageia-$MAGEIA_VERSION-$ARCH and $ALCASAR_EXTRACTED_DIR" 
82
printBold "Mageiar will be build with Mageia-$MAGEIA_VERSION-$ARCH and $ALCASAR_EXTRACTED_DIR" 
81
 
-
 
82
# Retrieve list of installed RPM
83
# remove some rpm (if this script has been already run)
-
 
84
urpme $ISO_RPM_LIST --auto-orphans --force 2>/dev/null
-
 
85
# Retrieve list of installed RPM (without those that will be installed with the alcasar install script)
83
ALCASAR_RPM_LIST="$(dnf list installed | cut -d " " -f1 | rev | cut -d "." -f2- | rev | grep -Ev 'coova-chilli|gammu|lib64gammu8|ipt-netflow|nfdump|wkhtmltopdf' | tail -n +2 | tr '\n' ' ')"
86
ALCASAR_RPM_LIST="$(dnf list installed | cut -d " " -f1 | rev | cut -d "." -f2- | rev | grep -Ev 'coova-chilli|gammu|lib64gammu8|ipt-netflow|nfdump|wkhtmltopdf' | tail -n +2 | tr '\n' ' ')"
84
# agregate & clean rpm list
87
# agregate & clean rpm list
85
RPM_LIST=$(echo $BASE_RPM_LIST $ALCASAR_RPM_LIST | sed "s/ /\n/g" | sort | uniq | sed "s/\n/ /g")
88
RPM_LIST=$(echo $BASE_RPM_LIST $ALCASAR_RPM_LIST | sed "s/ /\n/g" | sort | uniq | sed "s/\n/ /g")
86
 
89
 
87
# Insert list into AUTO_INSTALL_CFG
90
# Insert list into AUTO_INSTALL_CFG
88
formattedList=$(echo $RPM_LIST | sed "s/[^ ]*/\'\0\'/g" | sed "s/ /,\n/g")
91
formattedList=$(echo $RPM_LIST | sed "s/[^ ]*/\'\0\'/g" | sed "s/ /,\n/g")
89
cp -f $RESSOURCES/auto_inst.cfg.pl_template $AUTO_INSTALL_CFG
92
cp -f $RESSOURCES/auto_inst.cfg.pl_template $AUTO_INSTALL_CFG
90
insertLineNumber=$(grep -n "'default_packages' => " "$AUTO_INSTALL_CFG" | cut -d ':' -f1)
93
insertLineNumber=$(grep -n "'default_packages' => " "$AUTO_INSTALL_CFG" | cut -d ':' -f1)
91
fileTop=$(head -n "+$insertLineNumber" "$AUTO_INSTALL_CFG")
94
fileTop=$(head -n "+$insertLineNumber" "$AUTO_INSTALL_CFG")
92
fileBottom=$(tail -n "+$insertLineNumber" "$AUTO_INSTALL_CFG" | tail -n +2)
95
fileBottom=$(tail -n "+$insertLineNumber" "$AUTO_INSTALL_CFG" | tail -n +2)
93
cat /dev/null > "$AUTO_INSTALL_CFG"
96
cat /dev/null > "$AUTO_INSTALL_CFG"
94
echo "$fileTop" > "$AUTO_INSTALL_CFG"
97
echo "$fileTop" > "$AUTO_INSTALL_CFG"
95
echo "$formattedList" >> "$AUTO_INSTALL_CFG"
98
echo "$formattedList" >> "$AUTO_INSTALL_CFG"
96
echo "$fileBottom" >> "$AUTO_INSTALL_CFG"
99
echo "$fileBottom" >> "$AUTO_INSTALL_CFG"
97
 
100
 
98
# Installing tools to create the iso file
101
# Installing tools to create the iso file
99
printBold "Installing ISO building tools"
102
printBold "Installing ISO building tools"
100
dnf install 'dnf-command(download)' -y || errorExit "could not install necessary packages"
103
#dnf install 'dnf-command(download)' -y || errorExit "could not install necessary packages"
101
dnf install -y lftp wget cdrkit-genisoimage xorriso rpmtools syslinux || errorExit "could not install necessary packages"
104
#dnf install -y $ISO_RPM_LIST || errorExit "could not install necessary packages"
-
 
105
urpmi $ISO_RPM_LIST --force|| errorExit "could not install necessary packages"
102
 
106
 
103
# Mounting the ISO image
107
# Mounting the ISO image
104
printBold "Mounting the image"
108
printBold "Mounting the image"
105
if [ `mount |grep $MAGEIA_OFFICIAL_DIR | wc -l` -eq 0 ]; then # if not already mounted
109
if [ `mount |grep $MAGEIA_OFFICIAL_DIR | wc -l` -eq 0 ]; then # if not already mounted
106
	mount -o ro,loop $RESSOURCES/$ISO_IN $MAGEIA_OFFICIAL_DIR || errorExit "failed mounting $ISO_IN."
110
	mount -o ro,loop $RESSOURCES/$ISO_IN $MAGEIA_OFFICIAL_DIR || errorExit "failed mounting $ISO_IN."
107
fi
111
fi
108
sleep 1 # wait for mounting process
112
sleep 1 # wait for mounting process
109
[ -d ${MAGEIA_OFFICIAL_DIR}/x86_64 ] || umount $MAGEIA_OFFICIAL_DIR || errorExit "The ISO file isn't in the target architecture ($ARCH)" 
113
[ -d ${MAGEIA_OFFICIAL_DIR}/x86_64 ] || umount $MAGEIA_OFFICIAL_DIR || errorExit "The ISO file isn't in the target architecture ($ARCH)" 
110
 
114
 
111
# Copying main files except core and nonfree directories
115
# Copying main files except core and nonfree directories
112
echo "Extracting base image..."
116
echo "Extracting base image..."
113
cd $MAGEIA_OFFICIAL_DIR && \
117
cd $MAGEIA_OFFICIAL_DIR && \
114
    tar cf - --exclude=${ARCH}/media . | (cd $MAGEIA_NEW_DIR && tar xf - ) && cd "${CURRENT_DIR}"
118
    tar cf - --exclude=${ARCH}/media . | (cd $MAGEIA_NEW_DIR && tar xf - ) && cd "${CURRENT_DIR}"
115
 
119
 
116
# Creating new directories core and nonfree and dir for alcasar stufs
120
# Creating new directories core and nonfree and dir for alcasar stufs
117
mkdir -p ${MAGEIA_NEW_DIR}/${ARCH}/{media/{core,nonfree},install/alcasar}
121
mkdir -p ${MAGEIA_NEW_DIR}/${ARCH}/{media/{core,nonfree},install/alcasar}
118
 
122
 
119
# Adding Alcasar image advert to the installer
123
# Adding Alcasar image advert to the installer
120
cp -f $RESSOURCES/install_slideshow/* "$ADVERT_DIR" || errorExit "could not copy custom slideshow to $ADVERT_DIR"
124
cp -f $RESSOURCES/install_slideshow/* "$ADVERT_DIR" || errorExit "could not copy custom slideshow to $ADVERT_DIR"
121
 
125
 
122
# Create the installed RPM list excluding those brought with alcasar archive (they aren't in repository)
126
# Create the installed RPM list excluding those brought with alcasar archive (they aren't in repository)
123
nbInstalled=$(echo $RPM_LIST | wc -w)
127
nbInstalled=$(echo $RPM_LIST | wc -w)
124
total=`echo $RPM_LIST | wc -w`
128
total=`echo $RPM_LIST | wc -w`
125
count=0
129
count=0
126
# Copying the RPM in core and clearing the plop.idx file
130
# Copying the RPM in core and clearing the plop.idx file
127
echo "Copying $total RPMS in ISO ..."
131
echo "Copying $total RPMS in ISO ..."
128
for rpm in ${RPM_LIST}; do
132
for rpm in ${RPM_LIST}; do
129
	let percent="${count} * 100 / ${total}"
133
	let percent="${count} * 100 / ${total}"
130
	dnf download --downloaddir $coreDirNew $rpm 1> /dev/null || errorExit "could not download $rpm"
134
	# dnf download --downloaddir $coreDirNew $rpm 1> /dev/null || errorExit "could not download $rpm"
-
 
135
	#urpmi --no-install --replacepkgs -q $rpm 2> /dev/null || urpmi --no-install -q --force $rpm 2> /dev/null || echo "could not download $rpm"
131
	printProgress ${percent}
136
	printProgress ${percent}
132
	count=$(expr ${count} + 1)
137
	count=$(expr ${count} + 1)
133
done
138
done
134
printBold "$count RPMs copied"
139
printBold "$count RPMs copied"
135
 
-
 
136
# Copying the Alcasar tarball & automatic install option into the ISO
140
# Copying the Alcasar tarball & automatic install option into the ISO
137
mkdir -p $INSTALLER_DIR || errorExit "could not create directory $INSTALLER_DIR"
141
mkdir -p $INSTALLER_DIR || errorExit "could not create directory $INSTALLER_DIR"
138
cp $RESSOURCES/$ALCASAR_TARBALL $INSTALLER_DIR || errorExit "could not copy $RESSOURCES/$ALCASAR_TARBALL to $INSTALLER_DIR"
142
cp $RESSOURCES/$ALCASAR_TARBALL $INSTALLER_DIR || errorExit "could not copy $RESSOURCES/$ALCASAR_TARBALL to $INSTALLER_DIR"
139
cp $AUTO_INSTALL_CFG $INSTALLER_DIR || errorExit "could not copy $AUTO_INSTALL_CFG to $INSTALLER_DIR"
143
cp $AUTO_INSTALL_CFG $INSTALLER_DIR || errorExit "could not copy $AUTO_INSTALL_CFG to $INSTALLER_DIR"
140
 
144
 
-
 
145
mv $urpmi_cache/*.rpm $coreDirNew
141
# Generating media info for core
146
# Generating media info for core
142
echo "Generating media_info for core..."
147
echo "Generating media_info for core..."
143
genhdlist2 ${coreDirNew} --allow-empty-media --quiet
148
genhdlist2 ${coreDirNew} --allow-empty-media --quiet
144
echo "Generating media_info for nonfree..."
149
echo "Generating media_info for nonfree..."
145
genhdlist2 ${nonFreeDirNew} --allow-empty-media --quiet
150
genhdlist2 ${nonFreeDirNew} --allow-empty-media --quiet
146
 
151
 
147
# Puting pubkeys in media_info
152
# Puting pubkeys in media_info
148
cp ${coreDir}/media_info/pubkey ${coreDirNew}/media_info/
153
cp ${coreDir}/media_info/pubkey ${coreDirNew}/media_info/
149
cp ${nonFreeDir}/media_info/pubkey ${nonFreeDirNew}/media_info/
154
cp ${nonFreeDir}/media_info/pubkey ${nonFreeDirNew}/media_info/
150
 
155
 
151
# Retrieving media.cfg & compssUsers.pl depending on the arch
156
# Retrieving media.cfg & compssUsers.pl depending on the arch
152
mkdir ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info
157
mkdir ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info
153
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/compssUsers.pl ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/compssUsers.pl
158
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/compssUsers.pl ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/compssUsers.pl
154
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/media.cfg ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/media.cfg
159
cp ${MAGEIA_OFFICIAL_DIR}/${ARCH}/media/media_info/media.cfg ${MAGEIA_NEW_DIR}/${ARCH}/media/media_info/media.cfg
155
 
160
 
156
# Specify install configuration
161
# Specify install configuration
157
#sed -i -e 's*rdz*rdz kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  ${MAGEIA_NEW_DIR}/isolinux/isolinux.cfg
162
#sed -i -e 's*rdz*rdz kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  ${MAGEIA_NEW_DIR}/isolinux/isolinux.cfg
158
sed -i -e 's*noiswmd*noiswmd kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  $EFI_GRUB_CFG 
163
sed -i -e 's*noiswmd*noiswmd kickstart=/tmp/media/x86_64/install/alcasar/auto_inst.cfg.pl*g'  $EFI_GRUB_CFG 
159
 
164
 
160
# Generating distr
165
# Generating distr
161
echo "Generating mirror tree..."
166
echo "Generating mirror tree..."
162
gendistrib -s ${MAGEIA_NEW_DIR}/${ARCH}
167
gendistrib -s ${MAGEIA_NEW_DIR}/${ARCH}
163
 
168
 
164
# Creating the new iso file
169
# Creating the new iso file
165
echo "Creating the isofile..."
170
echo "Creating the isofile..."
166
newIsoName=Mageia-$MAGEIA_VERSION-${ARCH}-Alcasar-$ALCASAR_VERSION.iso
171
newIsoName=Mageia-$MAGEIA_VERSION-${ARCH}-Alcasar-$ALCASAR_VERSION.iso
167
 
172
 
168
# Generating the iso file
173
# Generating the iso file
169
# Parameters for xorriso found using the following command on the original mageia iso
174
# Parameters for xorriso found using the following command on the original mageia iso
170
# xorriso -indev Mageia-7-x86_64.iso -report_el_torito as_mkisofs
175
# xorriso -indev Mageia-7-x86_64.iso -report_el_torito as_mkisofs
171
cd ${MAGEIA_NEW_DIR} && xorriso -as mkisofs \
176
cd ${MAGEIA_NEW_DIR} && xorriso -as mkisofs \
172
	-V 'Mageia-7.1-x86_64' \
177
	-V 'Mageia-7.1-x86_64' \
173
	-partition_cyl_align off \
178
	-partition_cyl_align off \
174
	-partition_offset 0 \
179
	-partition_offset 0 \
175
	--mbr-force-bootable \
180
	--mbr-force-bootable \
176
	-iso_mbr_part_type 0x00 \
181
	-iso_mbr_part_type 0x00 \
177
	-c 'boot.catalog' \
182
	-c 'boot.catalog' \
178
	-b 'boot/grub2/eltorito.img' \
183
	-b 'boot/grub2/eltorito.img' \
179
	-no-emul-boot \
184
	-no-emul-boot \
180
	-boot-load-size 4 \
185
	-boot-load-size 4 \
181
	-boot-info-table \
186
	-boot-info-table \
182
	--grub2-boot-info \
187
	--grub2-boot-info \
183
	-eltorito-alt-boot \
188
	-eltorito-alt-boot \
184
	-boot-load-size 8192 \
189
	-boot-load-size 8192 \
185
	-o ${TMP_DIR}/${newIsoName} .
190
	-o ${TMP_DIR}/${newIsoName} .
186
 
191
 
187
# Unmounting & Removing temporary dir
192
# Unmounting & Removing temporary dir
188
echo "Umounting..."
193
echo "Umounting..."
189
umount $MAGEIA_OFFICIAL_DIR
194
umount $MAGEIA_OFFICIAL_DIR
-
 
195
mv $coreDirNew/*.rpm $urpmi_cache
190
for directory in $MAGEIA_NEW_DIR $MAGEIA_OFFICIAL_DIR $MAGEIA_OFFICIAL_DIR_EFI
196
for directory in $MAGEIA_NEW_DIR $MAGEIA_OFFICIAL_DIR
191
do
197
do
192
	[ -d $directory ] && rm -rf $directory
198
	[ -d $directory ] && rm -rf $directory
193
done
199
done
194
rm -f "$AUTO_INSTALL_CFG"
200
rm -f "$AUTO_INSTALL_CFG"
195
echo "Done."
201
echo "All RPM are always in '/var/cache/urpmi/rpms'Done. Remove them if nedded."
196
 
202