tazinst rev 5

Tiny edits
author Paul Issott <paul@slitaz.org>
date Fri Feb 15 20:59:31 2013 +0000 (2013-02-15)
parents e7584908ff07
children e62babb3966d
files NOTES etc/tazinst.conf tazinst
line diff
     1.1 --- a/NOTES	Fri Feb 15 20:01:37 2013 +0000
     1.2 +++ b/NOTES	Fri Feb 15 20:59:31 2013 +0000
     1.3 @@ -15,7 +15,7 @@
     1.4  ======
     1.5  All tests were done by using rolling version (2012-01-17)
     1.6  
     1.7 -partitionning tests:
     1.8 +partitioning tests:
     1.9  !---------!--------!--------!--------!!--------!
    1.10  ! mode    ! format !separate! format !! RESULT !
    1.11  !         !   /    ! /home  ! /home  !!        !
    1.12 @@ -37,7 +37,7 @@
    1.13  ! upgrade !        !   X    !        !!OK 3.987! xorg nok
    1.14  !---------!--------!--------!--------!!--------!
    1.15  
    1.16 -medias tests:
    1.17 +media tests:
    1.18  !---------!!--------!
    1.19  ! media   !! RESULT !
    1.20  !---------!!--------!
    1.21 @@ -50,7 +50,7 @@
    1.22  ! web     !!OK 3.90 !
    1.23  !---------!!--------!
    1.24  
    1.25 -iso (stable flavours) tests:
    1.26 +iso (stable flavors) tests:
    1.27  !---------!!--------!
    1.28  ! iso     !! RESULT !
    1.29  !---------!!--------!
     2.1 --- a/etc/tazinst.conf	Fri Feb 15 20:01:37 2013 +0000
     2.2 +++ b/etc/tazinst.conf	Fri Feb 15 20:59:31 2013 +0000
     2.3 @@ -1,4 +1,4 @@
     2.4 -# /etc/slitaz/tazinst.conf: SliTaz installer configuration file.
     2.5 +# /etc/slitaz/tazinst.conf - SliTaz installer configuration file.
     2.6  #
     2.7  # (C) 2007-2013 SliTaz - GNU General Public License v3.
     2.8  #
     2.9 @@ -6,13 +6,13 @@
    2.10  # 1. predefined settings
    2.11  
    2.12  # predefined mode of installation
    2.13 -# MODE=
    2.14 +# MODE=""
    2.15  
    2.16  # predefined media to install from
    2.17 -# MEDIA=
    2.18 +# MEDIA=""
    2.19  
    2.20  # predefined install source
    2.21 -# SOURCE=
    2.22 +# SOURCE=""
    2.23  
    2.24  # predefined hostname
    2.25  HOSTNAME="slitaz"
    2.26 @@ -27,13 +27,13 @@
    2.27  USER_PWD="tux"
    2.28  
    2.29  # predefined bootloader
    2.30 -# BOOTLOADER=
    2.31 +# BOOTLOADER=""
    2.32  
    2.33  
    2.34  # 2. SliTaz Images
    2.35  
    2.36  # list of mirrors file on your local network
    2.37 -# MIRRORS_FILE=
    2.38 +# MIRRORS_FILE=""
    2.39  
    2.40  # set of predefined urls
    2.41  URL_ISO="
     3.1 --- a/tazinst	Fri Feb 15 20:01:37 2013 +0000
     3.2 +++ b/tazinst	Fri Feb 15 20:59:31 2013 +0000
     3.3 @@ -15,7 +15,7 @@
     3.4  # 2: Install file error
     3.5  # 3: Source error
     3.6  # 4: Target error
     3.7 -# 5: Missing ressource
     3.8 +# 5: Missing resource
     3.9  # 6: SliTaz system to upgrade not found
    3.10  # 7: Another instance is running
    3.11  # 8: Internal error
    3.12 @@ -60,7 +60,7 @@
    3.13  install:$(gettext "Fresh install on a HDD")
    3.14  upgrade:$(gettext "Upgrade an existing system")"
    3.15  
    3.16 -# medias (key:help)
    3.17 +# media (key:help)
    3.18  readonly LST_MEDIA="
    3.19  cdrom:$(gettext "LiveCD")
    3.20  usb:$(gettext "LiveUSB")
    3.21 @@ -123,7 +123,7 @@
    3.22    get         $(gettext "Get the value of a setting.")
    3.23    check       $(gettext "Check settings.")
    3.24    help        $(gettext "Print a short help on settings")
    3.25 -  list        $(gettext "List system ressources.")
    3.26 +  list        $(gettext "List system resources.")
    3.27    execute     $(gettext "Execute a SliTaz installation.")
    3.28    log         $(gettext "Display log file contents.")
    3.29    clean       $(gettext "Clean install and log files.")
    3.30 @@ -169,7 +169,7 @@
    3.31  	local install_file=$1
    3.32  	[ -z "$install_file" ] && install_file="$DEFAULT_INSTALL_FILE"
    3.33  	if [ -e "$install_file" ]; then
    3.34 -		printf "$(gettext "Warning: file exists already.")\n" 1>&2
    3.35 +		printf "$(gettext "Warning: file already exists.")\n" 1>&2
    3.36  		exit 0
    3.37  	fi
    3.38  	[ -n "$install_file" ] && touch "$install_file"
    3.39 @@ -227,13 +227,13 @@
    3.40  # Home partition:
    3.41  # On most GNU/Linux systems users personal files are stored in the directory
    3.42  # /home. /home can be on another hard disk or on a separate partition.
    3.43 -# Let HOME_UUID empty if you do not intend to use a specific partition for /home
    3.44 +# Leave HOME_UUID empty if you do not intend to use a specific partition for /home
    3.45  # or enter the UUID of the partition to be used.
    3.46  # run 'tazinst list uuid' to list your partitions.
    3.47  HOME_UUID="$HOME_UUID"
    3.48  
    3.49  # Formatting the /home partition (if /home is on a separate partition):
    3.50 -# Let HOME_FORMAT empty if you don not want to format the /home partition.
    3.51 +# Leave HOME_FORMAT empty if you do not want to format the /home partition.
    3.52  # For options, see comments on 'Formatting the root partition' above.
    3.53  HOME_FORMAT="$HOME_FORMAT"
    3.54  
    3.55 @@ -253,13 +253,13 @@
    3.56  USER_PWD="$USER_PWD"
    3.57  
    3.58  # Install bootloader:
    3.59 -# If you do not want to install a bootloader, let this field empty.
    3.60 +# If you do not want to install a bootloader, leave this field empty.
    3.61  # It's generally safe to set it up as 'auto'.
    3.62  # Run 'tazinst list bootloader' to list all options.
    3.63  BOOTLOADER="$BOOTLOADER"
    3.64  
    3.65  # Windows dual boot:
    3.66 -# If you do not want enable Dual boot, let WINBOOT empty (WINBOOT="").
    3.67 +# If you do not want enable Dual boot, leave WINBOOT empty (WINBOOT="").
    3.68  # You may let tazinst automatically find your win partition by specifying auto
    3.69  # (WINBOOT="auto"), otherwise enter the UUID of the partition to be used.
    3.70  # Run 'tazinst list winboot' to see the Windows partitions found by tazinst.
    3.71 @@ -487,7 +487,7 @@
    3.72  	fi
    3.73  }
    3.74  
    3.75 -# exit if the partition do not exists
    3.76 +# exit if the partition does not exist
    3.77  check_uuid()
    3.78  {
    3.79  	local setting="$1" value="$(get $1)" found=0 partition
    3.80 @@ -502,7 +502,7 @@
    3.81  	fi
    3.82  }
    3.83  
    3.84 -# exit if the source do not exists
    3.85 +# exit if the source does not exist
    3.86  check_source()
    3.87  {
    3.88  	local media="$(get media)" source="$(get source)"
    3.89 @@ -555,7 +555,7 @@
    3.90  	local errcode=0
    3.91  	# too long
    3.92  	if [ "${#pass}" -ge 40 ]; then
    3.93 -		printf "$(gettext "Error: To long password")\n" 1>&2
    3.94 +		printf "$(gettext "Error: password too long")\n" 1>&2
    3.95  		exit 1
    3.96  	fi
    3.97  	# bad chars
    3.98 @@ -1167,7 +1167,7 @@
    3.99  # start log
   3.100  log_open()
   3.101  {
   3.102 -	printf "=== Tazinst: start on $(date "+%x %X") ===\n" > "$LOG"
   3.103 +	printf "=== Tazinst: started on $(date "+%x %X") ===\n" > "$LOG"
   3.104  	LOGGING="true"
   3.105  }
   3.106  
   3.107 @@ -1435,7 +1435,7 @@
   3.108  {
   3.109  	log "\n$(gettext "Process completed. You can now restart (reboot)")"
   3.110  	log "$(gettext "from your SliTaz GNU/Linux system.")"
   3.111 -	printf "=== Tazinst end on $(date "+%x %X") ===\n" >> "$LOG"
   3.112 +	printf "=== Tazinst ended on $(date "+%x %X") ===\n" >> "$LOG"
   3.113  	unset LOGGING
   3.114  	# saving log
   3.115  	log "$(gettext "Copying log to /var/log/tazinst.log")"