slitaz-tools rev 198
installer: dont umount cdrom an ISO can be mounted
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Sat May 17 20:58:11 2008 +0200 (2008-05-17) |
| parents | 30a71ce39bda |
| children | 39e31613e665 |
| files | installer/slitaz-installer tinyutils/tazlocale |
line diff
1.1 --- a/installer/slitaz-installer Fri May 16 13:28:33 2008 +0200 1.2 +++ b/installer/slitaz-installer Sat May 17 20:58:11 2008 +0200 1.3 @@ -2,7 +2,7 @@ 1.4 # slitaz-installer - SliTaz GNU/Linux installer. 1.5 # 1.6 # So this is SliTaz installer using dialog boxes. All the comments are in 1.7 -# English but displayed messages are in French. The scrip starts with a 1.8 +# English but displayed messages are in French. The scrip starts with a 1.9 # few main variables, then all the functions and then a sequece of functions. 1.10 # 1.11 # (C) 2007-2008 SliTaz - GNU General Public License v3. 1.12 @@ -103,11 +103,10 @@ 1.13 mount_cdrom() 1.14 { 1.15 ERROR_MSG="" 1.16 - umount /media/cdrom 2>/dev/null 1.17 ( 1.18 echo "XXX" && echo 30 1.19 echo -e "\nCreating mount point (/media/cdrom)..." 1.20 - echo "XXX" 1.21 + echo "XXX" 1.22 mkdir -p /media/cdrom 1.23 sleep 1 1.24 echo "XXX" && echo 60 1.25 @@ -190,7 +189,7 @@ 1.26 255) 1.27 echo -e "ESC pressed.\n" && exit 0 ;; 1.28 esac 1.29 - 1.30 + 1.31 } 1.32 1.33 # Mount and mkfs with progress. 1.34 @@ -205,11 +204,11 @@ 1.35 umount $TARGET_ROOT 2>$LOG 1.36 fi 1.37 sleep 2 1.38 - 1.39 + 1.40 if [ "$MKFS_TARGET_DEV" == "ext3" ]; then 1.41 echo "XXX" && echo 60 1.42 echo -e "\nExecuting mkfs.ext3 on $TARGET_DEV" 1.43 - echo "XXX" 1.44 + echo "XXX" 1.45 mkfs.ext3 $TARGET_DEV >>$LOG 2>>$LOG 1.46 else 1.47 echo "XXX" && echo 60 1.48 @@ -217,13 +216,13 @@ 1.49 echo "XXX" 1.50 sleep 2 1.51 fi 1.52 - 1.53 + 1.54 echo "XXX" && echo 90 1.55 echo -e "\nCreating mount point: $TARGET_ROOT" 1.56 - echo "XXX" 1.57 + echo "XXX" 1.58 mkdir -p $TARGET_ROOT 1.59 sleep 2 1.60 - 1.61 + 1.62 ) | 1.63 $DIALOG --title " Préparation de la cible " \ 1.64 --backtitle "$BACKLIST" \ 1.65 @@ -352,7 +351,7 @@ 1.66 mv home.bak home 1.67 sleep 2 1.68 fi 1.69 - # Add root device to CHECK_FS in rcS.conf to check filesystem 1.70 + # Add root device to CHECK_FS in rcS.conf to check filesystem 1.71 # on each boot. 1.72 echo "XXX" && echo 80 1.73 echo -e "\nAjout de $TARGET_DEV à CHECK_FS du fichier /etc/rcS.conf..." 1.74 @@ -413,55 +412,55 @@ 1.75 install_files() 1.76 { 1.77 ( 1.78 - 1.79 + 1.80 echo "XXX" && echo 10 1.81 echo -e "\nNettoyage de la partition racine si nécessaire..." 1.82 echo "XXX" 1.83 clean_target 1.84 - 1.85 + 1.86 echo "XXX" && echo 20 1.87 echo -e "\nInstallation du noyau ($KERNEL)..." 1.88 echo "XXX" 1.89 install_kernel 1.90 - 1.91 + 1.92 echo "XXX" && echo 30 1.93 echo -e "\nCopie des bootloaders syslinux/isolinux..." 1.94 echo "XXX" 1.95 copy_bootloaders 1.96 - 1.97 + 1.98 echo "XXX" && echo 40 1.99 echo -e "\nCopie du système compressé (rootfs.gz)..." 1.100 echo "XXX" 1.101 cp /media/cdrom/boot/rootfs.gz $TARGET_ROOT 1.102 sleep 2 1.103 - 1.104 + 1.105 echo "XXX" && echo 50 1.106 echo -e "\nExtraction du système racine..." 1.107 echo "XXX" 1.108 extract_rootfs 1.109 - 1.110 + 1.111 echo "XXX" && echo 60 1.112 echo -e "\nCopie des fichiers utilisateurs par défaut (/etc/skel)..." 1.113 echo "XXX" 1.114 gen_etc_skel 1.115 sleep 2 1.116 - 1.117 + 1.118 echo "XXX" && echo 70 1.119 echo -e "\nPreconfiguration du système..." 1.120 echo "XXX" 1.121 pre_config_system 1.122 - 1.123 + 1.124 echo "XXX" && echo 90 1.125 echo -e "\nCréation du fichier de configuration de GRUB (menu.lst)..." 1.126 echo "XXX" 1.127 grub_config 1.128 - 1.129 + 1.130 echo "XXX" && echo 100 1.131 echo -e "\nFin de l'installation des fichiers..." 1.132 echo "XXX" 1.133 echo "install_files: OK" >>$LOG 1.134 sleep 4 1.135 - 1.136 + 1.137 ) | 1.138 $DIALOG --title " Installation des fichiers " \ 1.139 --backtitle "$BACKLIST" \ 1.140 @@ -481,7 +480,7 @@ 1.141 ( 1.142 echo "XXX" && echo 50 1.143 echo -e "\nExécution de grub-install sur : $TARGET_DISK..." 1.144 - echo "XXX" 1.145 + echo "XXX" 1.146 grub-install --no-floppy \ 1.147 --root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG 1.148 echo "XXX" && echo 100 1.149 @@ -510,7 +509,7 @@ 1.150 sleep 2 1.151 echo "XXX" && echo 50 1.152 echo -e "\nDémontage de la cible ($TARGET_DEV)..." 1.153 - echo "XXX" 1.154 + echo "XXX" 1.155 if mount | grep -q $TARGET_ROOT; then 1.156 umount $TARGET_ROOT 2>/dev/null 1.157 fi 1.158 @@ -598,7 +597,7 @@ 1.159 echo "partition to upgrade: $UPGRADE_DEV" >>$LOG 1.160 } 1.161 1.162 -# Prepare the part to upgrade, backup, install, restore configs 1.163 +# Prepare the part to upgrade, backup, install, restore configs 1.164 # and reinstall pkgs. 1.165 upgrade_process() 1.166 { 1.167 @@ -615,7 +614,7 @@ 1.168 mount $UPGRADE_DEV $TARGET_ROOT >>$LOG 2>>$LOG 1.169 cd $TARGET_ROOT 1.170 TARGET_DEV=$UPGRADE_DEV 1.171 - 1.172 + 1.173 echo "XXX" && echo 10 1.174 echo -e "\nRecherch de /etc/slitaz-release" 1.175 echo "XXX" 1.176 @@ -630,7 +629,7 @@ 1.177 error_message 1.178 exit 0 1.179 fi && sleep 2 1.180 - 1.181 + 1.182 echo "XXX" && echo 20 1.183 echo -e "\nSauvegarde de /etc, /home et de la liste des paquets..." 1.184 echo "XXX" 1.185 @@ -669,28 +668,28 @@ 1.186 mklost+found 2>>$LOG 1.187 fi 1.188 sleep 2 1.189 - 1.190 + 1.191 echo "XXX" && echo 25 1.192 echo -e "\nInstallation du noyau ($KERNEL)..." 1.193 echo "XXX" 1.194 install_kernel 1.195 - 1.196 + 1.197 echo "XXX" && echo 30 1.198 echo -e "\nCopie des bootloaders syslinux/isolinux..." 1.199 echo "XXX" 1.200 copy_bootloaders 1.201 - 1.202 + 1.203 echo "XXX" && echo 35 1.204 echo -e "\nCopie du système compressé (rootfs.gz)..." 1.205 echo "XXX" 1.206 cp /media/cdrom/boot/rootfs.gz $TARGET_ROOT 1.207 sleep 2 1.208 - 1.209 + 1.210 echo "XXX" && echo 40 1.211 echo -e "\nExtraction du système racine..." 1.212 echo "XXX" 1.213 extract_rootfs 1.214 - 1.215 + 1.216 # Restore backups. 1.217 echo "XXX" && echo 42 1.218 echo -e "\nRestauration des fichiers de configuration..." 1.219 @@ -704,13 +703,13 @@ 1.220 mv $TARGET_ROOT/www.bak $TARGET_ROOT/var/www 1.221 fi 1.222 echo "backups restored: `date`" >> $LOG 1.223 - 1.224 + 1.225 # /var/lib/slitaz-installer 1.226 mkdir $TARGET_ROOT/var/lib/slitaz-installer 1.227 mv $TARGET_ROOT/etc.tar.gz $TARGET_ROOT/var/lib/slitaz-installer 1.228 mv $TARGET_ROOT/home/packages-selection.list $TARGET_ROOT/var/lib/slitaz-installer 1.229 cd $TARGET_ROOT/var/lib/slitaz-installer 1.230 - 1.231 + 1.232 # LiveCD packages list. 1.233 echo "XXX" && echo 46 1.234 echo -e "\nCréation des listes de paquets..." 1.235 @@ -732,7 +731,7 @@ 1.236 error_message 1.237 fi 1.238 sleep 2 1.239 - 1.240 + 1.241 # Check if the pkg is on the mirror 1.242 echo "XXX" && echo 48 1.243 echo -e "\nVérification de la disponibilité des paquets..." 1.244 @@ -747,13 +746,13 @@ 1.245 echo "$pkg" >> packages-to-install.list 1.246 fi 1.247 done 1.248 - 1.249 + 1.250 # Calculate the pourcent for one package and install. 1.251 echo "XXX" && echo 50 1.252 echo -e "\nInstallation des éventuels paquets..." 1.253 echo "XXX" 1.254 sleep 2 1.255 - if [ "$packages" == "0" ]; then 1.256 + if [ "$packages" == "0" ]; then 1.257 echo "packages to install: 0" >> $LOG 1.258 else 1.259 onepkg=$((48/$packages))
2.1 --- a/tinyutils/tazlocale Fri May 16 13:28:33 2008 +0200 2.2 +++ b/tinyutils/tazlocale Sat May 17 20:58:11 2008 +0200 2.3 @@ -46,7 +46,7 @@ 2.4 value=`$DIALOG --clear \ 2.5 --title " SliTaz locale configuration " \ 2.6 --menu \ 2.7 -"Select your language - Séléctionnez votre langue" 15 70 5 \ 2.8 +"\nSelect your language - Séléctionnez votre langue" 15 70 5 \ 2.9 "en" "English" \ 2.10 $(get_locale_name) \ 2.11 2>&1 1>&3`