slitaz-dev-tools rev 31
Tiny edits
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Sun Mar 06 16:43:54 2011 +0000 (2011-03-06) |
| parents | a4bdff6199d5 |
| children | 0003e1a1474e |
| files | libtaz/libtaz libtaz/libtaz-modules/commons libtaz/libtaz-modules/report libtaz/slitaz.conf mirror-tools/rootfs/etc/tazwok.conf.mirror mirror-tools/rootfs/home/backups/mirror/backup.sh mirror-tools/rootfs/usr/bin/mkpkgiso mirror-tools/rootfs/usr/share/mirror-host/boot/lguest-disk tazchroot/tazchroot tazchroot/tazchroot.conf |
line diff
1.1 --- a/libtaz/libtaz Sat Mar 05 19:52:30 2011 +0100 1.2 +++ b/libtaz/libtaz Sun Mar 06 16:43:54 2011 +0000 1.3 @@ -1,13 +1,13 @@ 1.4 ######################################################################## 1.5 # This is the SliTaz main library (/usr/lib/slitaz/libtaz). 1.6 -# libtaz is modular : see explanation of the function source_lib bellow. 1.7 +# libtaz is modular : see explanation of the function source_lib below. 1.8 # 1.9 # Author : Antoine Bodin <gokhlayeh@mailoo.org> 1.10 # 1.11 # Version : 0.0.1 (alpha1) 1.12 # 1.13 -# Documentation : none (will be avaible with beta version) 1.14 -# The documentation will include an explanation of all fonction, how to 1.15 +# Documentation : none (will be available with beta version) 1.16 +# The documentation will include an explanation of all functions, how to 1.17 # use them and how to improve this library. 1.18 # 1.19 # Devnotes (suppress while beta is released) : 1.20 @@ -15,22 +15,22 @@ 1.21 # Add a generic create/cleanup script for tmp files ? 1.22 # check_for (pkg on cmd line, pkg, receipt, etc.) -> tazwok,tazpkg,list 1.23 # 1.24 -# Note : as the work is progress some part are dirty code or some other 1.25 -# are note finish. I update this because we need the libdep 1.26 +# Note: as the work is in progress some parts are dirty code or others 1.27 +# are not finished. I will update this because we need the libdep. 1.28 # 1.29 ######################################################################## 1.30 # INITIALIZATION 1.31 ######################## 1.32 # Load the Slitaz main configuration file : /etc/slitaz/slitaz.conf. 1.33 -# Don't load it if application is called by one having already loaded it, 1.34 +# Don't load it if an application is called by one already, 1.35 # to avoid options overwrite. 1.36 1.37 . /etc/slitaz/slitaz.conf 1.38 1.39 -# Load the command as some module use it. 1.40 +# Load the command as some modules use it. 1.41 log_command="$0 $@" 1.42 1.43 -# Define & create temporary directory as it's used by report. 1.44 +# Define & create a temporary directory as it's used by report. 1.45 tmp=/tmp/$(basename $0)-$$ 1.46 mkdir -p $tmp 1.47 1.48 @@ -38,7 +38,7 @@ 1.49 # EXIT FUNCTIONS 1.50 ######################## 1.51 # run_on_exit commands are executed when apps exit (whatever the reason) 1.52 -# run_on_kill commands are executed only when apps is killed (or Ctrl+C) 1.53 +# run_on_kill commands are executed only when apps are killed (or Ctrl+C) 1.54 # Note : one command per line in the variable. 1.55 run_on_exit="rm -rf $tmp" 1.56 run_on_kill="" 1.57 @@ -66,23 +66,23 @@ 1.58 1.59 ######################################################################## 1.60 # This function should be used after sourcing libtaz to source modular 1.61 -# libraries. Libtaz only source main configuration file and contain only 1.62 -# this function. The modular libraries should be put in slitaz lib 1.63 +# libraries. Libtaz only sources main configuration files and contains only 1.64 +# this function. The modular libraries should be put in the slitaz lib 1.65 # directory (/usr/lib/slitaz/libtaz-modules). 1.66 # 1.67 # Usage : source_lib lib [lib2] [lib3] ... 1.68 # 1.69 -# Description of libraries including with libtaz : 1.70 +# Description of libraries included with libtaz : 1.71 # commons : functions used by most SliTaz scripts 1.72 # get_option* : function to check & parse arguments of a command line 1.73 -# report : display and log script in a configurable way 1.74 +# report : display and log scripts in a configurable way 1.75 # 1.76 -# * need a code rewiew, please don't use them for production : code can 1.77 +# * needs a code review, please don't use them for production : code can 1.78 # be hardly modified. 1.79 # 1.80 -# All theses libraries contains additionnal functions. Check them to 1.81 -# if you want to know wich ones and how to use them. 1.82 -# More information will be avaible at beta release. 1.83 +# All these libraries contains additional functions. Check them to 1.84 +# know which ones and how to use them. 1.85 +# More information will be available at beta release. 1.86 1.87 sourced_lib="" 1.88 source_lib()
2.1 --- a/libtaz/libtaz-modules/commons Sat Mar 05 19:52:30 2011 +0100 2.2 +++ b/libtaz/libtaz-modules/commons Sun Mar 06 16:43:54 2011 +0000 2.3 @@ -23,7 +23,7 @@ 2.4 fi 2.5 } 2.6 2.7 -# The classic SliTaz check_root function used in near all SliTaz tools. 2.8 +# The classic SliTaz check_root function used in nearly all SliTaz tools. 2.9 check_root() 2.10 { 2.11 [ $(id -u) = 0 ] && return 2.12 @@ -32,8 +32,7 @@ 2.13 exit 1 2.14 } 2.15 2.16 -# A classic check_dir function : 2.17 -# - create directory if needed and echo about it. 2.18 +# A classic check_dir function: - create directory if needed and echo about it. 2.19 # Return error if directory is created (to chain other commands with ||) 2.20 check_dir() 2.21 { 2.22 @@ -55,7 +54,7 @@ 2.23 fi 2.24 } 2.25 2.26 -# Display an horizontal line, can be used to have clearest script. 2.27 +# Display a horizontal line, can be used for a clearer script. 2.28 horizontal_line() 2.29 { 2.30 echo "================================================================================" 2.31 @@ -63,12 +62,12 @@ 2.32 2.33 # Store -- options in a variable. 2.34 # Test phase. 2.35 -# Need to add something to filter options and report error in case option is not 2.36 -# listed a used by the command. 2.37 +# Need to add something to filter options and report errors in case option is not 2.38 +# listed and used by the command. 2.39 get_options() 2.40 { 2.41 if echo "$log_command" | fgrep -q ' '--help; then 2.42 - echo "Avaible options for $(echo `basename "$log_command"` | cut -d ' ' -f 1,2) : $get_options_list" 2.43 + echo "Available options for $(echo `basename "$log_command"` | cut -d ' ' -f 1,2) : $get_options_list" 2.44 exit 0 2.45 fi 2.46 for get_option in $(echo "$log_command" | tr ' ' '\n' | grep ^-- | sed 's/^--//'); do
3.1 --- a/libtaz/libtaz-modules/report Sat Mar 05 19:52:30 2011 +0100 3.2 +++ b/libtaz/libtaz-modules/report Sun Mar 06 16:43:54 2011 +0000 3.3 @@ -1,7 +1,7 @@ 3.4 3.5 # Usage : use_report functions/commands 3.6 # 'use_report' execute functions/commands and redirect the output. 3.7 -# You can use 'report' function to display message, steps, blocs and 3.8 +# You can use 'report' function to display messages, steps, blocs and 3.9 # status in the terminal and organize the display of the log. 3.10 3.11 report_verbosity_opt=all 3.12 @@ -66,7 +66,7 @@ 3.13 report_pid=$$ 3.14 fi 3.15 3.16 - # Use the default logfile if there's no logfile was specified by the main script. 3.17 + # Use the default logfile if no logfile was specified by the main script. 3.18 [ ! "$log_opt" ] && [ "$report_log_all" = yes ] && \ 3.19 log_opt="$SLITAZ_LOG/`basename $0`/$(date -Iseconds).html" 3.20 export report_pid log_opt 3.21 @@ -88,7 +88,7 @@ 3.22 echo "[--------------------------/!\ DEBUG MODE ENABLED /!\--------------------------]" 3.23 fi 3.24 3.25 - # Theses variable are used to configure the display of steps in terminal. 3.26 + # Theses variable are used to configure the display of steps in a terminal. 3.27 bloc1_delimiter="================================================================================" 3.28 bloc1_display=" " 3.29 bloc2_delimiter="----------------------------------------------------------------------------" 3.30 @@ -99,7 +99,7 @@ 3.31 # Use a trap to exit cleanly if app is killed. 3.32 trap "report_exit $(basename $0) killed by user" SIGINT SIGTERM 3.33 3.34 - # Use another display function if quiet is enable. 3.35 + # Use another display function if quiet is enabled. 3.36 [ "$report_verbosity_opt" = "none" ] && report_display() 3.37 { 3.38 while read out; do 3.39 @@ -165,7 +165,7 @@ 3.40 fi 3.41 } 3.42 3.43 -# Use this to stop a program with error. 3.44 +# Use this to stop a program with an error. 3.45 report_exit() 3.46 { 3.47 # Log&display error message. 3.48 @@ -187,12 +187,12 @@ 3.49 3.50 # Usage : report [command] [message] 3.51 # 3.52 -# type :message - simply display the message. 3.53 -# step - name the step and display status when ended. 3.54 -# end-step - display status of the step, it's done automaticaly when 3.55 -# starting a new step, closing a bloc or stop report. 3.56 -# open-bloc - open the list of steps in the operation; 3.57 -# close-bloc- close the current bloc. 3.58 +# type :message simply display the message. 3.59 +# step name the step and display status when ended. 3.60 +# end-step display status of the step, it's done automatically when 3.61 +# starting a new step, closing a bloc or stopping a report. 3.62 +# open-bloc open the list of steps in the operation. 3.63 +# close-bloc close the current bloc. 3.64 report() 3.65 { 3.66 # First : get status before it is changed by other commands. 3.67 @@ -289,7 +289,7 @@ 3.68 return $report_return_code 3.69 } 3.70 3.71 -# Open a bloc of substeps in terminal and log. 3.72 +# Open a bloc of substeps in a terminal and log. 3.73 report_open_bloc() 3.74 { 3.75 unset open_bloc 3.76 @@ -317,17 +317,17 @@ 3.77 unset step_running 3.78 } 3.79 3.80 -# This is the two new status function used by the report tool. 3.81 +# These are the two new status functions used by the report tool. 3.82 # States are : ok - no error since the start of the step 3.83 -# warning - there was error(s) since the start of the step 3.84 -# failed - the last executed command has exiting anormally 3.85 +# warning - there was an error(s) since the start of the step 3.86 +# failed - the last executed command has exited abnormally 3.87 report_step_status() 3.88 { 3.89 unset report_return_code 3.90 if [ -p $log_tmp.stdout ]; then 3.91 report_stop_listen 3.92 3.93 - #Close message bloc if opened. 3.94 + # Close message bloc if opened. 3.95 if [ -s $log_tmp -a "$report_verbosity_opt" = all ] || \ 3.96 [ -s $log_tmp.error -a "$report_verbosity_opt" != none ]; then 3.97 echo " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ " >&3 3.98 @@ -397,10 +397,10 @@ 3.99 ! [ "$prebloc" ] && echo "</div>" >> "$log_opt" 3.100 } 3.101 3.102 -# Theses variables keep the status of the blocs. 3.103 -# A bloc is reported as ok if all child steps are ok and as failed 3.104 +# These variables keep the status of the blocs. 3.105 +# A bloc is reported as ok if all child steps are ok and has failed 3.106 # if all child steps are failed (or if a fatal error occurs). 3.107 -# In other cases the bloc is reported as warning. 3.108 +# In other cases the bloc is reported as a warning. 3.109 report_set_bloc_status() 3.110 { 3.111 bloc_status=$(eval echo \$bloc${bloc_level}_status)
4.1 --- a/libtaz/slitaz.conf Sat Mar 05 19:52:30 2011 +0100 4.2 +++ b/libtaz/slitaz.conf Sun Mar 06 16:43:54 2011 +0000 4.3 @@ -1,20 +1,20 @@ 4.4 ######################################################################## 4.5 # This is the generic SliTaz configuration file used by libtaz to get 4.6 -# the defaults options and directories. 4.7 +# the default options and directories. 4.8 # 4.9 -# Theses variables can be overwritted by a lower level of configuration. 4.10 -# Order for loading variables (the latest definition is keeped) : 4.11 +# These variables can be overwritten by a lower level of configuration. 4.12 +# Order for loading variables (the latest definition is kept) : 4.13 # slitaz.conf (then) main app.conf (or) local app.conf 4.14 # (or) *.conf of the command line (then) arguments of the command line 4.15 # 4.16 # ** Alpha Comment by GoKhlaYeh: ** 4.17 # With libtaz, I plan to change the default location of some important 4.18 # directories to fit the server hierarchy. In a general view I want 4.19 -# to make the organisation on server and on released system similar. 4.20 +# to make the organisation on the server and on a released system similar. 4.21 # The goal is having tools working out-of-the-box in both cases to make 4.22 -# the contributor work more easy and efficient. 4.23 -# Theses changes will takes place with Release Candidate, when libtaz 4.24 -# implementation in all SliTaz tools will be finish, and all code fully 4.25 +# the contributors work easier and efficient. 4.26 +# These changes will takes place with a Release Candidate, when libtaz 4.27 +# implementation in all SliTaz tools will be finalised, and all code fully 4.28 # reviewed. Hope everybody agree with that ;). 4.29 # 4.30 4.31 @@ -31,7 +31,7 @@ 4.32 # Slitaz directory. 4.33 SLITAZ_DIR="/home/slitaz" 4.34 4.35 -# Local repository for current version (can contains local packages 4.36 +# Local repository for current version (can contain local packages 4.37 # repository, wok, sources, ...). 4.38 LOCAL_REPOSITORY="$SLITAZ_DIR/$SLITAZ_VERSION" 4.39 4.40 @@ -41,10 +41,10 @@ 4.41 # Packages cache directory. 4.42 CACHE_DIR="/var/cache/tazpkg" 4.43 4.44 -# Path to repository datas. 4.45 +# Path to repository data. 4.46 LOCALSTATE="/var/lib/tazpkg" 4.47 4.48 -# Path to installations datas. 4.49 +# Path to installation data. 4.50 INSTALLED="$LOCALSTATE/installed" 4.51 4.52 ######################################################################## 4.53 @@ -72,12 +72,12 @@ 4.54 ######################################################################## 4.55 # LIBTAZ OPTIONS 4.56 ######################## 4.57 -# Theses options are the default setting for all SliTaz tools which use 4.58 +# These options are the default settings for all SliTaz tools which use 4.59 # libtaz. They are : 4.60 # * tazwok 4.61 # * tazpkg 4.62 4.63 -# If this option is enabled, automaticaly install needed packages. It 4.64 +# If this option is enabled - automatically install needed packages. It 4.65 # can be depends, build_depends, or package needed to perform a specific 4.66 # task. 4.67 # Value can be : 4.68 @@ -87,5 +87,6 @@ 4.69 4.70 # If you want to log all operations (into /var/log/slitaz), 4.71 # uncomment the following line 4.72 -# Note: important operations are logged by default. 4.73 -#report_log_all=yes 4.74 \ No newline at end of file 4.75 +# Note: all important operations are logged by default. 4.76 +#report_log_all=yes 4.77 +
5.1 --- a/mirror-tools/rootfs/etc/tazwok.conf.mirror Sat Mar 05 19:52:30 2011 +0100 5.2 +++ b/mirror-tools/rootfs/etc/tazwok.conf.mirror Sun Mar 06 16:43:54 2011 +0000 5.3 @@ -5,27 +5,27 @@ 5.4 # By default on SliTaz the directory is /home/slitaz/wok. 5.5 WOK="/slitaz/home/slitaz/wok" 5.6 5.7 -# The path to the sources tarballs of the binaries packages. 5.8 +# The path to the source tarballs of the binary packages. 5.9 SOURCES_REPOSITORY="/slitaz/home/slitaz/src" 5.10 5.11 -# This path set the binaries packages repository. It's where all 5.12 -# the gen *.tazpkg will be stored when using gen-repository command. 5.13 +# This path sets the binary packages repository. It's where all 5.14 +# the gen *.tazpkg will be stored when using a gen-repository command. 5.15 PACKAGES_REPOSITORY="/var/www/slitaz/mirror/packages/cooking" 5.16 5.17 -# Default build host 5.18 +# Default build host. 5.19 BUILD_HOST=i486-pc-linux-gnu 5.20 5.21 -# Default tool prefix 5.22 +# Default tool prefix. 5.23 TOOLPREFIX="${BUILD_HOST}-" 5.24 5.25 # Default arguments for GNU configure. 5.26 CONFIGURE_ARGS="--build=$BUILD_HOST --host=$BUILD_HOST" 5.27 5.28 -# Translation files to include in packages, note that you can specifiy 5.29 -# several locale. 5.30 +# Translation files to include in packages, note that you can specify 5.31 +# several locales. 5.32 LOCALE="fr" 5.33 5.34 -# Mirrors URLs. To downloads source next from your location. 5.35 +# Mirrors URLs. To download sources near your location. 5.36 # GNU mirror : 5.37 # 5.38 GNU_MIRROR="http://ftpmirror.gnu.org"
6.1 --- a/mirror-tools/rootfs/home/backups/mirror/backup.sh Sat Mar 05 19:52:30 2011 +0100 6.2 +++ b/mirror-tools/rootfs/home/backups/mirror/backup.sh Sun Mar 06 16:43:54 2011 +0000 6.3 @@ -9,11 +9,11 @@ 6.4 { 6.5 GZIP=rgzip 6.6 which $GZIP > /dev/null || GZIP=gzip 6.7 -echo "Sync doc.slitaz.org ..." 6.8 +echo "Syncing doc.slitaz.org ..." 6.9 rsync -aH -e "$SSH" --bwlimit=50 \ 6.10 $REMOTE_USER@tank.slitaz.org:/home/slitaz/www/doc/data/. /var/www/doc/data/. 6.11 while read file dirs; do 6.12 - echo "Create $file.cpio.gz ..." 6.13 + echo "Creating $file.cpio.gz ..." 6.14 ( cd / ; find $dirs | cpio -o -H newc ) | \ 6.15 $GZIP -9 > $file.cpio.gz 2> /dev/null 6.16 done <<EOT
7.1 --- a/mirror-tools/rootfs/usr/bin/mkpkgiso Sat Mar 05 19:52:30 2011 +0100 7.2 +++ b/mirror-tools/rootfs/usr/bin/mkpkgiso Sun Mar 06 16:43:54 2011 +0000 7.3 @@ -196,7 +196,7 @@ 7.4 $f*) continue 2;; 7.5 esac 7.6 done < packages.list 7.7 - echo -n "Filter out $i ($(du -hs $(readlink $i) | awk '{ print $1 }'))..." 7.8 + echo -n "Filtering out $i ($(du -hs $(readlink $i) | awk '{ print $1 }'))..." 7.9 SIZE=$(( $SIZE + $(stat -c %s $(readlink $i)) )) 7.10 rm $i 7.11 status 7.12 @@ -319,7 +319,7 @@ 7.13 -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" 7.14 case " $OPTIONS " in 7.15 *\ --auto-install\ *) 7.16 - echo -n "Enable auto install" 7.17 + echo -n "Enabling auto install" 7.18 sed -i "s/rw root/rw config=LABEL=packages-$PKG_VER,install.sh root/" \ 7.19 $TEMP_DIR/boot/isolinux/*.cfg 7.20 status 7.21 @@ -327,7 +327,7 @@ 7.22 esac 7.23 case " $OPTIONS " in 7.24 *\ --loram-detect\ *) 7.25 - echo -n "Enable loram autodetection" 7.26 + echo -n "Enabling loram autodetection" 7.27 need $IFMEM_C32 $isoloram 7.28 which isoinfo > /dev/null || need /usr/bin/isoinfo 7.29 cp $IFMEM_C32 "$TEMP_DIR/boot/isolinux" 7.30 @@ -413,11 +413,11 @@ 7.31 echo "$(du -hs $OUTPUT | awk '{ print $1 }') used by iso image." 7.32 7.33 cd ${ROOT} 7.34 -echo -n "Create hybrid DVD/CDROM" 7.35 +echo -n "Creating hybrid DVD/CDROM" 7.36 which isohybrid > /dev/null && isohybrid $IMAGE 2> /dev/null 7.37 status 7.38 7.39 -echo -n "Calculate md5sum" 7.40 +echo -n "Calculating md5sum" 7.41 md5sum $IMAGE > $(basename $IMAGE .iso).md5 7.42 status 7.43
8.1 --- a/mirror-tools/rootfs/usr/share/mirror-host/boot/lguest-disk Sat Mar 05 19:52:30 2011 +0100 8.2 +++ b/mirror-tools/rootfs/usr/share/mirror-host/boot/lguest-disk Sun Mar 06 16:43:54 2011 +0000 8.3 @@ -39,11 +39,11 @@ 8.4 fixmbr() 8.5 { 8.6 if [ $(getlong 0x1ea $1) -ne 0 -a $(getlong 0x1fa $1) -ne 0 ]; then 8.7 - echo "Parttion 3 & 4 non empty. Abort" 8.8 + echo "Partition 3 & 4 non empty. Abort" 8.9 exit 1 8.10 fi 8.11 if [ $(getlong 0x1da $1) -eq 0 ]; then 8.12 - echo "Parttion 2 empty. Abort" 8.13 + echo "Partition 2 empty. Abort" 8.14 exit 1 8.15 fi 8.16 size=$(stat -c %s $1)
9.1 --- a/tazchroot/tazchroot Sat Mar 05 19:52:30 2011 +0100 9.2 +++ b/tazchroot/tazchroot Sun Mar 06 16:43:54 2011 +0000 9.3 @@ -1,5 +1,5 @@ 9.4 #!/bin/sh 9.5 -# Tazchroot - SliTaz chroot managing tool. 9.6 +# Tazchroot - SliTaz chroot manager tool. 9.7 # 9.8 # System wide config file for tazhack : /etc/slitaz/tazchroot.conf 9.9 # Expected system wide config (for Slitaz) : /etc/slitaz/slitaz.conf 9.10 @@ -54,7 +54,7 @@ 9.11 mount_chroot 9.12 status 9.13 echo "Command : $command" 9.14 -echo "Entering in chroot..." 9.15 +echo "Entering chroot..." 9.16 chroot $chroot_dir $command 9.17 echo -n "Leaving chroot..." 9.18 umount_chroot
10.1 --- a/tazchroot/tazchroot.conf Sat Mar 05 19:52:30 2011 +0100 10.2 +++ b/tazchroot/tazchroot.conf Sun Mar 06 16:43:54 2011 +0000 10.3 @@ -1,39 +1,39 @@ 10.4 -# Tazchroot configuration file 10.5 -# Allow you to build a chrooted cooking environnment using the last 10.6 -# version available of packages. 10.7 +# Tazchroot configuration file. 10.8 +# Allows you to build a chrooted cooking environnment using the last 10.9 +# available package version. 10.10 10.11 -# Use SliTaz version: 10.12 +# Use SliTaz version. 10.13 SLITAZ_VERSION=cooking 10.14 10.15 -# SLITAZ_DIR (it's mounted on chroot) 10.16 +# SLITAZ_DIR (it's mounted on chroot). 10.17 SLITAZ_DIR=/home/slitaz 10.18 10.19 -# Chroot path: 10.20 +# Chroot path. 10.21 chroot_dir=$SLITAZ_DIR/$SLITAZ_VERSION/sandbox 10.22 10.23 -# Online repository path: 10.24 -# Actually Pankso provide a mirror of packages being cooked on tank, 10.25 -# waiting for having them on http://mirror.slitaz.org/packages/cooking 10.26 +# Online repository path. 10.27 +# Actually Pankso provides a mirror of packages being cooked on tank, 10.28 +# waiting to have them on http://mirror.slitaz.org/packages/cooking 10.29 MIRROR=http://people.slitaz.org/~pankso/packages/ 10.30 10.31 # Default SliTaz paths. 10.32 LOCALSTATE=/var/lib/tazpkg 10.33 INSTALLED=$LOCALSTATE/installed 10.34 10.35 -# Webserver path; 10.36 -# Define where the webserver should be located. 10.37 +# Webserver path. 10.38 +# Defines where the webserver should be located. 10.39 # You have to use the same setup inside & outside the chroot. 10.40 # Here we use the default setup. 10.41 -# The host system needs php installed to make it works. 10.42 -# Uncomment to following line to use this option. 10.43 +# The host system needs php installed to make it work. 10.44 +# Uncomment the following line to use this option. 10.45 WEBSERVER="/var/www/vhosts/bb" 10.46 10.47 -# Default scripts path (theses scripts are added in the 10.48 +# Default scripts path (these scripts are added to the 10.49 # $chroot_dir/usr/bin and can be called with tazchroot script) 10.50 script_dir="/usr/lib/slitaz/chroot-scripts/tazchroot" 10.51 10.52 # List of directories to mount. 10.53 -# They are mounted to an equivalent location into chroot. 10.54 +# They are mounted to an equivalent location in the chroot. 10.55 # (one per line) 10.56 list_dir="$SLITAZ_DIR 10.57 $WEBSERVER" 10.58 @@ -41,10 +41,9 @@ 10.59 create_chroot() 10.60 { 10.61 # Warning message. 10.62 - echo -en "\\033[1;31mWarning:\\033[0m this script is going to use another packages repository than \ 10.63 -the one you generally use. Please don't install packages until chroot is created or it will \ 10.64 -screw you're main system. 10.65 -Don't continue to run this script if you're installing something. 10.66 + echo -en "\\033[1;31mWarning:\\033[0m this script is going to use another packages repository other \ 10.67 +than the one you generally use. Please don't install packages until the chroot is created or it will \ 10.68 +screw your main system. Don't continue to run this script if you're installing something. 10.69 10.70 Continue to run (type 'yes' to continue) ? " | fold -s; read answer 10.71 [ "$answer" = yes ] || exit 10.72 @@ -70,8 +69,8 @@ 10.73 fi 10.74 tazpkg recharge 10.75 10.76 - echo -e "\\033[1;31mWarning:\\033[0m You're SliTaz repository configuration is now \ 10.77 -back to normal state." | fold -s 10.78 + echo -e "\\033[1;31mWarning:\\033[0m Your SliTaz repository configuration is now \ 10.79 +back to a normal state." | fold -s 10.80 } 10.81 10.82 mount_chroot() 10.83 @@ -91,12 +90,12 @@ 10.84 [ -d /usr/share/slitaz/web-bb ] || [ -L /usr/share/slitaz/web-bb ] || 10.85 ln -s $chroot_dir/usr/share/slitaz/web-bb /usr/share/slitaz/web-bb 10.86 10.87 - # Make tazwok act as php/lighttpd were installed into the sandbox. 10.88 + # Make tazwok act as if php/lighttpd were installed into the sandbox. 10.89 mkdir -p $chroot_dir$INSTALLED/php 10.90 mkdir -p $chroot_dir$INSTALLED/lighttpd 10.91 fi 10.92 10.93 - # Mount system directories 10.94 + # Mount system directories. 10.95 mount -t proc proc $chroot_dir/proc 10.96 mount -t sysfs sysfs $chroot_dir/sys 10.97 mount -t devpts devpts $chroot_dir/dev/pts