slitaz-boot-scripts rev 107

Fix typos
author Mike D. Smith <MikeDSmith25@gmail.com>
date Sat Jul 19 06:54:49 2008 +0000 (2008-07-19)
parents b8357bb683ae
children 7ed6dc4683ad
files README etc/init.d/README etc/init.d/bootopts.sh etc/init.d/hwconf.sh etc/init.d/i18n.sh etc/init.d/network.sh etc/init.d/rc.functions etc/init.d/rc.shutdown etc/init.d/rcS etc/rcS.conf
line diff
     1.1 --- a/README	Thu Jul 17 14:11:09 2008 +0000
     1.2 +++ b/README	Sat Jul 19 06:54:49 2008 +0000
     1.3 @@ -16,9 +16,9 @@
     1.4  -------
     1.5  
     1.6  This package provide the boot scripts for SliTaz found in /etc/init.d with
     1.7 -the main config file : /etc/rcS.conf. It provide also the default inittab and
     1.8 +the main config file : /etc/rcS.conf. It also provides the default inittab and
     1.9  the network config file used with network.sh. Please check /etc/init.d/README
    1.10 -for more infomations.
    1.11 +for more infomation.
    1.12  
    1.13  
    1.14  ===============================================================================
     2.1 --- a/etc/init.d/README	Thu Jul 17 14:11:09 2008 +0000
     2.2 +++ b/etc/init.d/README	Sat Jul 19 06:54:49 2008 +0000
     2.3 @@ -2,12 +2,12 @@
     2.4  ===============================================================================
     2.5  
     2.6  
     2.7 -SliTaz dont use runlevels, inittab starts /etc/init.d/rcS, who use the config
     2.8 -file /etc/rcS.conf to run all scripts specified with $RUN_SCRIPTS, and then
     2.9 -starts all daemons specified with $RUN_DAEMONS. The idea is to centralise the
    2.10 -main system boot initialisation in one configuration file. Init scripts can
    2.11 +SliTaz doesn't use runlevels, inittab starts /etc/init.d/rcS, which uses the
    2.12 +config file /etc/rcS.conf to run all scripts specified with $RUN_SCRIPTS, and
    2.13 +then starts all daemons specified with $RUN_DAEMONS. The idea is to centralize
    2.14 +the main system boot initialization in one configuration file. Init scripts can
    2.15  use the rc.functions file (part of the base-files) to call for the status
    2.16 -fonction. Daemons can use /etc/daemons.conf to call for default options, by
    2.17 +function. Daemons can use /etc/daemons.conf to call for default options, in
    2.18  this way users/admins dont need to edit the daemon init script, located
    2.19  in /etc/init.d directory.
    2.20  
     3.1 --- a/etc/init.d/bootopts.sh	Thu Jul 17 14:11:09 2008 +0000
     3.2 +++ b/etc/init.d/bootopts.sh	Sat Jul 19 06:54:49 2008 +0000
     3.3 @@ -52,7 +52,7 @@
     3.4  # Mount all ext3 partitions found (opt: mount).
     3.5  mount_partitions()
     3.6  {
     3.7 -	# Get the list partitions.
     3.8 +	# Get the list of partitions.
     3.9  	DEVICES_LIST=`fdisk -l | grep 83 | cut -d " " -f 1`
    3.10  	# Mount filesystems rw.
    3.11  	for device in $DEVICES_LIST
    3.12 @@ -72,7 +72,7 @@
    3.13  
    3.14  echo "Parsing kernel cmdline for SliTaz live options... "
    3.15  
    3.16 -# user=name: Default user account witout password (uid=1000).
    3.17 +# user=name: Default user account without password (uid=1000).
    3.18  #
    3.19  if ! grep -q "1000:1000" /etc/passwd; then
    3.20  	if grep -q "user=" /proc/cmdline; then
    3.21 @@ -95,7 +95,7 @@
    3.22  	# /home/$USER files from /etc/skel.
    3.23  	if [ -d /etc/skel ]; then
    3.24  		cp -a /etc/skel /home/$USER
    3.25 -		# Path for user dektop files.
    3.26 +		# Path for user desktop files.
    3.27  		for i in /home/$USER/.local/share/applications/*.desktop
    3.28  		do
    3.29  			sed -i s/"user_name"/"$USER"/g $i
    3.30 @@ -122,10 +122,10 @@
    3.31  	mount_home
    3.32  fi
    3.33  
    3.34 -# Active an eventual swap file in /home and on local hd.
    3.35 +# Activate an eventual swap file in /home and on local HD.
    3.36  #
    3.37  if [ -f "/home/swap" ]; then
    3.38 -	echo "Activing swap (/home/swap) memory..."
    3.39 +	echo "Activating swap (/home/swap) memory..."
    3.40  	swapon /home/swap
    3.41  fi
    3.42  if [ "`fdisk -l | grep swap`" ]; then
     4.1 --- a/etc/init.d/hwconf.sh	Thu Jul 17 14:11:09 2008 +0000
     4.2 +++ b/etc/init.d/hwconf.sh	Sat Jul 19 06:54:49 2008 +0000
     4.3 @@ -67,14 +67,14 @@
     4.4  		done
     4.5  		status;;
     4.6  	noconf)
     4.7 -		echo "Sound configuration is disable from cmdline...";;
     4.8 +		echo "Sound configuration was disabled from cmdline...";;
     4.9  	*)
    4.10  		if [ -x /usr/sbin/soundconf ]; then
    4.11  			echo "Using sound kernel module $DRIVER..."
    4.12  			/usr/sbin/soundconf -M $DRIVER
    4.13  		fi;;
    4.14  	esac
    4.15 -# Sound card my already be detected by PCI-detect.
    4.16 +# Sound card may already be detected by PCI-detect.
    4.17  elif [ -d /proc/asound ]; then
    4.18  	cp /proc/asound/modules /var/lib/sound-card-driver
    4.19  	/usr/bin/amixer >/dev/null || /usr/sbin/soundconf
    4.20 @@ -85,11 +85,11 @@
    4.21  	if [ -x /usr/sbin/soundconf ]; then
    4.22  		/usr/sbin/soundconf
    4.23  	else
    4.24 -		echo "Unable to found: /usr/sbin/soundconf"
    4.25 +		echo "Unable to find: /usr/sbin/soundconf"
    4.26  	fi
    4.27  fi
    4.28  
    4.29 -# Screen size config for slim/Xvesa (last config dialog befor login).
    4.30 +# Screen size config for slim/Xvesa (last config dialog before login).
    4.31  if [ ! -s /etc/X11/screen.conf -a -x /usr/bin/slim ]; then
    4.32  	# $HOME is not yet set.
    4.33  	HOME=/root
     5.1 --- a/etc/init.d/i18n.sh	Thu Jul 17 14:11:09 2008 +0000
     5.2 +++ b/etc/init.d/i18n.sh	Sat Jul 19 06:54:49 2008 +0000
     5.3 @@ -8,7 +8,7 @@
     5.4  #
     5.5  echo "Cheking if /etc/locale.conf exist... "
     5.6  if [ -s "/etc/locale.conf" ]; then
     5.7 -	echo -n "Locale configuration file exist... "
     5.8 +	echo -n "Locale configuration file exists... "
     5.9  	status
    5.10  else
    5.11  	tazlocale
    5.12 @@ -35,19 +35,19 @@
    5.13  	KEYMAP=`cat /etc/keymap.conf`
    5.14  	case "$KEYMAP" in
    5.15  		fr-latin1|be-latin1)
    5.16 -			echo -n "Setting time zone to Europe/Paris... "
    5.17 +			echo -n "Setting timezone to Europe/Paris... "
    5.18  			echo "Europe/Paris" > /etc/TZ && status
    5.19  			;;
    5.20  		fr_CH-latin1|de_CH-latin1)
    5.21 -			echo -n "Setting time zone to Europe/Zurich... "
    5.22 +			echo -n "Setting timezone to Europe/Zurich... "
    5.23  			echo "Europe/Zurich" > /etc/TZ && status
    5.24  			;;
    5.25  		cf)
    5.26 -			echo -n "Setting time zone to America/Montreal... "
    5.27 +			echo -n "Setting timezone to America/Montreal... "
    5.28  			echo "America/Montreal" > /etc/TZ && status
    5.29  			;;
    5.30  		*)
    5.31 -			echo -n "Setting default time zone to UTC... "
    5.32 +			echo -n "Setting default timezone to UTC... "
    5.33  			echo "UTC" > /etc/TZ && status
    5.34  			;;
    5.35  	esac
     6.1 --- a/etc/init.d/network.sh	Thu Jul 17 14:11:09 2008 +0000
     6.2 +++ b/etc/init.d/network.sh	Sat Jul 19 06:54:49 2008 +0000
     6.3 @@ -1,5 +1,5 @@
     6.4  #!/bin/sh
     6.5 -# /etc/init.d/network.sh - Network initialisation boot script.
     6.6 +# /etc/init.d/network.sh - Network initialization boot script.
     6.7  # Config file is: /etc/network.conf
     6.8  #
     6.9  . /etc/init.d/rc.functions
    6.10 @@ -11,7 +11,7 @@
    6.11  status
    6.12  
    6.13  # Configure loopback interface.
    6.14 -echo -n "Configure loopback... "
    6.15 +echo -n "Configuring loopback... "
    6.16  /sbin/ifconfig lo 127.0.0.1 up
    6.17  /sbin/route add 127.0.0.1 lo
    6.18  status
     7.1 --- a/etc/init.d/rc.functions	Thu Jul 17 14:11:09 2008 +0000
     7.2 +++ b/etc/init.d/rc.functions	Sat Jul 19 06:54:49 2008 +0000
     7.3 @@ -14,7 +14,7 @@
     7.4  	echo -e "\\033[0;39m ]"
     7.5  }
     7.6  
     7.7 -# An other way to sleep.
     7.8 +# Another way to sleep.
     7.9  usleep_progress()
    7.10  {
    7.11  	CHAR='='
     8.1 --- a/etc/init.d/rc.shutdown	Thu Jul 17 14:11:09 2008 +0000
     8.2 +++ b/etc/init.d/rc.shutdown	Sat Jul 19 06:54:49 2008 +0000
     8.3 @@ -1,6 +1,6 @@
     8.4  #!/bin/sh
     8.5  # /etc/init.d/rc.shutdown - This script is used by /etc/inittab to stop
     8.6 -# all demons and shutdown the system.
     8.7 +# all daemons and shutdown the system.
     8.8  #
     8.9  . /etc/init.d/rc.functions
    8.10  . /etc/rcS.conf
     9.1 --- a/etc/init.d/rcS	Thu Jul 17 14:11:09 2008 +0000
     9.2 +++ b/etc/init.d/rcS	Sat Jul 19 06:54:49 2008 +0000
     9.3 @@ -1,6 +1,6 @@
     9.4  #!/bin/sh
     9.5  # /etc/init.d/rcS - Initial boot script for SliTaz GNU/Linux. rcS is the main
     9.6 -# initialisation script used to check fs, mount, clean, run scripts and start
     9.7 +# initialization script used to check fs, mount, clean, run scripts and start
     9.8  # daemons.
     9.9  #
    9.10  # Config file is : /etc/rcS.conf
    9.11 @@ -35,8 +35,8 @@
    9.12  echo "Remounting rootfs read/write... "
    9.13  /bin/mount -o remount,rw /
    9.14  
    9.15 -# Mount all stuff from /etc/fstab.
    9.16 -echo "Mounting all staff from fstab... "
    9.17 +# Mount filesystems in /etc/fstab.
    9.18 +echo "Mounting filesystems in fstab... "
    9.19  /bin/mount -a
    9.20  
    9.21  # Start Udev to populate /dev and handle hotplug events
    9.22 @@ -53,8 +53,8 @@
    9.23  
    9.24  else #logged
    9.25  
    9.26 -# Creat /dev/cdrom if needed (symlink does not exist on LiveCD).
    9.27 -# Add also /dev/cdrom to fstab if entry dos not exist.
    9.28 +# Create /dev/cdrom if needed (symlink does not exist on LiveCD).
    9.29 +# Also add /dev/cdrom to fstab if entry does not exist.
    9.30  #
    9.31  DRIVE_NAME=`cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3`
    9.32  if grep -q " cdrom=" /proc/cmdline; then
    9.33 @@ -151,7 +151,7 @@
    9.34  fi
    9.35  
    9.36  # Start all scripts specified with $RUN_SCRIPTS.
    9.37 -echo "Executing all initialisation scripts..."
    9.38 +echo "Executing all initialization scripts..."
    9.39  for script in $RUN_SCRIPTS
    9.40  do
    9.41  	if [ -x /etc/init.d/$script ]; then
    9.42 @@ -159,7 +159,7 @@
    9.43  	fi
    9.44  done
    9.45  
    9.46 -# Re-source main config file, in Live mode daemons list ca be modified 
    9.47 +# Re-source main config file. In Live mode, daemons list can be modified 
    9.48  # by boot options.
    9.49  . /etc/rcS.conf
    9.50  
    10.1 --- a/etc/rcS.conf	Thu Jul 17 14:11:09 2008 +0000
    10.2 +++ b/etc/rcS.conf	Sat Jul 19 06:54:49 2008 +0000
    10.3 @@ -12,28 +12,28 @@
    10.4  # Clean up the system removing all tmp and pid files.
    10.5  CLEAN_UP_SYSTEM="yes"
    10.6  
    10.7 -# Filesystems to check integrity on boot time. You should check the
    10.8 +# Filesystems to check integrity of at boot time. You should check the
    10.9  # rootfs (where SliTaz is installed) and all partitions listed in
   10.10 -# /etc/fstab. Exemple : CHECK_FS="/dev/hda5 /dev/hdb1"
   10.11 +# /etc/fstab. Example : CHECK_FS="/dev/hda5 /dev/hdb1"
   10.12  CHECK_FS=""
   10.13  
   10.14 -# Kernel modules to automaticly load at boot time. You can use 'modprobe -l'
   10.15 -# to get a list of all kernel modules avalaible.
   10.16 +# Kernel modules to automatically load at boot time. You can use 'modprobe -l'
   10.17 +# to get a list of all kernel modules available.
   10.18  #
   10.19 -# Fot Intel and some Nvidia sound cards : snd_intel8x0 snd_intel8x0m snd_hda_intel
   10.20 +# For Intel and some Nvidia sound cards : snd_intel8x0 snd_intel8x0m snd_hda_intel
   10.21  #
   10.22  LOAD_MODULES="vfat nls_utf8 ohci_hcd"
   10.23  
   10.24  # Kernel modules that we never want to load.
   10.25  BLACKLIST_MODULES=""
   10.26  
   10.27 -# Initialisation scripts to run at boot time. Boot order is important,
   10.28 -# bootopts.sh (boot options) must start first, then you free to choose. Note
   10.29 -# that the local.sh script exist to let you quick add some local startup
   10.30 +# Initialization scripts to run at boot time. Boot order is important,
   10.31 +# bootopts.sh (boot options) must start first, then you are free to choose.
   10.32 +# Note that the local.sh script exists to let you quickly add some local startup
   10.33  # commands.
   10.34  RUN_SCRIPTS="bootopts.sh network.sh i18n.sh hwconf.sh local.sh"
   10.35  
   10.36 -# Daemons to start at boot time. SliTaz provide only a few daemons, firewall,
   10.37 +# Daemons to start at boot time. SliTaz only provides a few daemons: firewall,
   10.38  # Web server (lighttpd), SSH server (dropbear) and rsyncd, so boot order is
   10.39  # not realy important.
   10.40  RUN_DAEMONS="slim dbus hald firewall lighttpd"