slitaz-tools rev 420
slitaz-installer: tiny edits
author | Paul Issott <paul@slitaz.org> |
---|---|
date | Sat Jan 09 16:01:40 2010 +0000 (2010-01-09) |
parents | 60c17a765020 |
children | afbb699cfd0f |
files | installer/slitaz-installer |
line diff
1.1 --- a/installer/slitaz-installer Thu Jan 07 00:39:20 2010 +0100 1.2 +++ b/installer/slitaz-installer Sat Jan 09 16:01:40 2010 +0000 1.3 @@ -204,14 +204,14 @@ 1.4 ask_for_home() 1.5 { 1.6 exec 3>&1 1.7 - HOME_DEV=`$DIALOG --title " Root Partition " \ 1.8 + HOME_DEV=`$DIALOG --title " Home Partition " \ 1.9 --backtitle "$BACKLIST" --clear \ 1.10 --extra-label "List" --extra-button \ 1.11 --colors --inputbox " 1.12 -On most GNU/Linux system users personnal files are stored in the directoty \ 1.13 +On most GNU/Linux systems users personal files are stored in the directory \ 1.14 /home. Home can be on a separate partition or another hard disk. 1.15 1.16 -\Z2Home partition to use (Option):\Zn" 18 70 2>&1 1>&3` 1.17 +\Z2Home partition to use (Optional):\Zn" 18 70 2>&1 1>&3` 1.18 retval=$? 1.19 exec 3>&- 1.20 check_retval 1.21 @@ -244,8 +244,8 @@ 1.22 --clear --colors --yesno " 1.23 Here you can format the /home partition: $HOME_DEV 1.24 1.25 -SliTaz use ext3 by default but another filesystem can be used if wanted, \ 1.26 -for this please adjust /etc/fstab afer installation. 1.27 +SliTaz uses ext3 by default but another filesystem can be used if wanted, \ 1.28 +for this please adjust /etc/fstab after installation. 1.29 1.30 \Z2Do you want to format (Option): $HOME_DEV\Zn" 18 70 1.31 retval=$? 1.32 @@ -303,8 +303,8 @@ 1.33 USER=`$DIALOG --title " User name " \ 1.34 --backtitle "$BACKLIST" --clear \ 1.35 --colors --nocancel --inputbox " 1.36 -The default user for the system will have his personal files stored \ 1.37 -in /home/*user* (and will automatically be added to the audio group). 1.38 +The default user for the system will have their personal files stored \ 1.39 +in /home/*user* (and will be automatically added to the audio group). 1.40 1.41 \Z2Default user name login:\Zn" 18 70 "tux" 2>&1 1>&3` 1.42 retval=$? 1.43 @@ -319,7 +319,7 @@ 1.44 USER_PASSWD=`$DIALOG --title " User password " \ 1.45 --backtitle "$BACKLIST" --clear \ 1.46 --colors --nocancel --inputbox " 1.47 -The password for default user $USER. It may also be a security risk if too \ 1.48 +The password for default user $USER. It may be a security risk if too \ 1.49 weak and should always be strong if you use a SSH connection through the web. 1.50 1.51 \Z2Please specify $USER password:\Zn" 18 70 "tux" 2>&1 1>&3` 1.52 @@ -339,7 +339,7 @@ 1.53 --backtitle "$BACKLIST" \ 1.54 --clear --colors --yesno " 1.55 Installation settings summary and last chance to cancel or restart all \ 1.56 -installator steps. 1.57 +installation steps. 1.58 1.59 Root partition: $TARGET_DEV 1.60 Home partition: $HOME_DEV 1.61 @@ -383,7 +383,7 @@ 1.62 mkfs.ext3 -L "Home" $HOME_DEV >>$LOG 2>>$LOG 1.63 else 1.64 echo "XXX" && echo 70 1.65 - echo -e "\nThe partition ($HOME_DEV) will be keeped..." 1.66 + echo -e "\nThe partition ($HOME_DEV) will be kept..." 1.67 echo "XXX" 1.68 sleep 2 1.69 fi 1.70 @@ -407,7 +407,7 @@ 1.71 { 1.72 if [ "$CLEAN" == "clean" ]; then 1.73 echo "XXX" && echo 15 1.74 - echo -e "\nCleaning the root partition ($TARGET_DEV)..." 1.75 + echo -e "\nCleaning the root partition ($TARGET_DEV)" 1.76 echo "XXX" 1.77 # Keep /home in case of reinstall. 1.78 cd $TARGET_ROOT 1.79 @@ -598,7 +598,7 @@ 1.80 clean_target 1.81 1.82 echo "XXX" && echo 20 1.83 - echo -e "\nInstalling the kernel ($KERNEL)..." 1.84 + echo -e "\nInstalling the kernel ($KERNEL)" 1.85 echo "XXX" 1.86 install_kernel 1.87 1.88 @@ -667,7 +667,7 @@ 1.89 0) 1.90 ( 1.91 echo "XXX" && echo 50 1.92 - echo -e "\nRunning grub-install on : $TARGET_DISK..." 1.93 + echo -e "\nRunning grub-install on : $TARGET_DISK" 1.94 echo "XXX" 1.95 grub-install --no-floppy \ 1.96 --root-directory=$TARGET_ROOT $TARGET_DISK 2>>$LOG 1.97 @@ -678,7 +678,7 @@ 1.98 ) | 1.99 $DIALOG --title " GRUB install " \ 1.100 --backtitle "$BACKLIST" \ 1.101 - --gauge "Installating GRUB..." 18 70 0 ;; 1.102 + --gauge "Installing GRUB..." 18 70 0 ;; 1.103 1) 1.104 echo "grub_install: NO" >>$LOG ;; 1.105 255) 1.106 @@ -691,12 +691,12 @@ 1.107 { 1.108 ( 1.109 echo "XXX" && echo 25 1.110 - echo -e "\nCopying the log files ($LOG)..." 1.111 + echo -e "\nCopying the log files ($LOG)" 1.112 echo "XXX" 1.113 cp -a $LOG $TARGET_ROOT/var/log 1.114 sleep 2 1.115 echo "XXX" && echo 50 1.116 - echo -e "\nUnmounting the target ($TARGET_DEV)..." 1.117 + echo -e "\nUnmounting the target ($TARGET_DEV)" 1.118 echo "XXX" 1.119 if mount | grep -q $TARGET_ROOT; then 1.120 umount $TARGET_ROOT 2>/dev/null 1.121 @@ -858,7 +858,7 @@ 1.122 sleep 2 1.123 1.124 echo "XXX" && echo 25 1.125 - echo -e "\nInstalling the kernel ($KERNEL)..." 1.126 + echo -e "\nInstalling the kernel ($KERNEL)" 1.127 echo "XXX" 1.128 install_kernel 1.129