slitaz-boot-scripts rev 181
Tiny edits
author | Paul Issott <paul@slitaz.org> |
---|---|
date | Sat Oct 24 12:29:17 2009 +0000 (2009-10-24) |
parents | 75125fb17674 |
children | ddd1db038d3b |
files | COPYING README bootlog 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/rcS etc/network.conf etc/rcS.conf |
line diff
1.1 --- a/COPYING Sun Oct 04 15:32:39 2009 +0200 1.2 +++ b/COPYING Sat Oct 24 12:29:17 2009 +0000 1.3 @@ -26,12 +26,12 @@ 1.4 English 1.5 ------- 1.6 1.7 -slitaz-boot-scripts is free software; you can redistribute it and/or modify 1.8 +Slitaz-boot-scripts is free software; you can redistribute it and/or modify 1.9 it under the terms of the GNU General Public License as published by 1.10 the Free Software Foundation; either version 3 of the License, or 1.11 (at your option) any later version. 1.12 1.13 -slitaz-boot-scripts is distributed in the hope that it will be useful, but 1.14 +Slitaz-boot-scripts is distributed in the hope that it will be useful, but 1.15 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 1.17 more details.
2.1 --- a/README Sun Oct 04 15:32:39 2009 +0200 2.2 +++ b/README Sat Oct 24 12:29:17 2009 +0000 2.3 @@ -15,8 +15,8 @@ 2.4 English 2.5 ------- 2.6 2.7 -This package provide the boot scripts for SliTaz found in /etc/init.d with 2.8 -the main config file : /etc/rcS.conf. It also provides the default inittab and 2.9 +This package provides the boot scripts for SliTaz found in /etc/init.d with 2.10 +the main config file /etc/rcS.conf. It also provides the default inittab and 2.11 the network config file used with network.sh. Please check /etc/init.d/README 2.12 for more infomation. 2.13
3.1 --- a/bootlog Sun Oct 04 15:32:39 2009 +0200 3.2 +++ b/bootlog Sat Oct 24 12:29:17 2009 +0000 3.3 @@ -1,4 +1,4 @@ 3.4 #!/bin/sh 3.5 -# tazbootlog: Display SliTaz boot log message. 3.6 +# tazbootlog: Display SliTaz boot log messages. 3.7 # 3.8 cat /var/log/dmesg.log /var/log/boot.log | sed "s/.\[3g.*\]R//"
4.1 --- a/etc/init.d/README Sun Oct 04 15:32:39 2009 +0200 4.2 +++ b/etc/init.d/README Sat Oct 24 12:29:17 2009 +0000 4.3 @@ -2,14 +2,14 @@ 4.4 =============================================================================== 4.5 4.6 4.7 -SliTaz doesn't use runlevels, inittab starts /etc/init.d/rcS, which uses the 4.8 +SliTaz doesn't use runlevels; inittab starts /etc/init.d/rcS, which uses the 4.9 config file /etc/rcS.conf to run all scripts specified with $RUN_SCRIPTS, and 4.10 then starts all daemons specified with $RUN_DAEMONS. The idea is to centralize 4.11 the main system boot initialization in one configuration file. Init scripts can 4.12 use the rc.functions file (part of the base-files) to call for the status 4.13 function. Daemons can use /etc/daemons.conf to call for default options, in 4.14 -this way users/admins dont need to edit the daemon init script, located 4.15 -in /etc/init.d directory. 4.16 +this way users/admins don't need to edit the daemon init script located 4.17 +in the /etc/init.d directory. 4.18 4.19 4.20 ===============================================================================
5.1 --- a/etc/init.d/bootopts.sh Sun Oct 04 15:32:39 2009 +0200 5.2 +++ b/etc/init.d/bootopts.sh Sat Oct 24 12:29:17 2009 +0000 5.3 @@ -14,9 +14,9 @@ 5.4 } 5.5 5.6 # Default user account without password (uid=1000). In live mode the option 5.7 -# user=name can be used, but user must be add before home= to have home dir. 5.8 -# This option is not handled by a loop and case like other and without 5.9 -# effect on a installed system. 5.10 +# user=name can be used, but user must be added before home= to have home dir. 5.11 +# This option is not handled by a loop and case like others and has no 5.12 +# effect on an installed system. 5.13 if ! grep -q "100[0-9]:100[0-9]" /etc/passwd; then 5.14 if grep -q "user=" /proc/cmdline; then 5.15 USER=`cat /proc/cmdline | sed 's/.*user=\([^ ]*\).*/\1/'` 5.16 @@ -46,7 +46,7 @@ 5.17 else 5.18 mkdir -p /home/$USER 5.19 fi 5.20 - # set permissions. 5.21 + # Set permissions. 5.22 chown -R $USER.$USER /home/$USER 5.23 # Slim default user. 5.24 if [ -f /etc/slim.conf ]; then 5.25 @@ -82,7 +82,7 @@ 5.26 status ;; 5.27 home=*) 5.28 # Check for a specified home partition (home=*) and check for 5.29 - # user home dir. Note: home=usb is a shoter and easier way to 5.30 + # user home dir. Note: home=usb is a shorter and easier way to 5.31 # have home=/dev/sda1. 5.32 DEVICE=${opt#home=} 5.33 [ "$DEVICE" = "usb" ] && DEVICE=sda1 5.34 @@ -94,7 +94,7 @@ 5.35 USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1` 5.36 DEVID=$DEVICE 5.37 if [ -x /sbin/blkid ]; then 5.38 - # Can be label, uuid or devname. DEVID give us first: /dev/name. 5.39 + # Can be a label, uuid or devname. DEVID gives us first: /dev/name. 5.40 DEVID=`/sbin/blkid | grep $DEVICE | cut -d: -f1` 5.41 DEVID=${DEVID##*/} 5.42 fi 5.43 @@ -125,7 +125,7 @@ 5.44 rm -rf /tmp/$USER-files 5.45 fi 5.46 # Install all packages in /home/boot/packages. In live CD and 5.47 - # USB mode the option home= mount the device on /home, so we 5.48 + # USB mode the option home= mounts the device on /home, so we 5.49 # already have a boot directory with the Kernel and rootfs. 5.50 if [ -d "/home/boot/packages" ]; then 5.51 for pkg in /home/boot/packages/*.tazpkg 5.52 @@ -158,7 +158,7 @@ 5.53 fi 5.54 done ;; 5.55 mount-packages) 5.56 - # Mount and install packages-XXX.iso (usefull without Internet 5.57 + # Mount and install packages-XXX.iso (useful without Internet 5.58 # connection). 5.59 PKGSIGN="LABEL=\"packages-$(cat /etc/slitaz-release)\" TYPE=\"iso9660\"" 5.60 PKGDEV=$(blkid | grep "$PKGSIGN" | cut -d: -f1) 5.61 @@ -172,7 +172,7 @@ 5.62 fi ;; 5.63 wm=*) 5.64 # Check for a Window Manager (for a flavor, default WM can be changed 5.65 - # with boot option or with an addfile in /etc/X11/wm.default. 5.66 + # with boot options or with an addfile in /etc/X11/wm.default. 5.67 WM=${opt#wm=} 5.68 mkdir -p /etc/X11 5.69 case $WM in
6.1 --- a/etc/init.d/hwconf.sh Sun Oct 04 15:32:39 2009 +0200 6.2 +++ b/etc/init.d/hwconf.sh Sat Oct 24 12:29:17 2009 +0000 6.3 @@ -1,7 +1,7 @@ 6.4 #!/bin/sh 6.5 # /etc/init.d/hwconf.sh - SliTaz hardware configuration. 6.6 # 6.7 -# This script configure the sound card and screen. Tazhw is used earlier 6.8 +# This script configures the sound card and screen. Tazhw is used earlier 6.9 # at boot time to autoconfigure PCI and USB devices. 6.10 # 6.11 . /etc/init.d/rc.functions
7.1 --- a/etc/init.d/i18n.sh Sun Oct 04 15:32:39 2009 +0200 7.2 +++ b/etc/init.d/i18n.sh Sat Oct 24 12:29:17 2009 +0000 7.3 @@ -1,12 +1,12 @@ 7.4 #!/bin/sh 7.5 -# /etc/init.d/i18n.sh - Internationalization initialisation. 7.6 +# /etc/init.d/i18n.sh - Internationalization initialization. 7.7 # 7.8 -# This script configure SliTaz default keymap, locale, timezone. 7.9 +# This script configures SliTaz default keymap, locale, timezone. 7.10 # 7.11 . /etc/init.d/rc.functions 7.12 7.13 # Locale config. 7.14 -echo "Cheking if /etc/locale.conf exist... " 7.15 +echo "Checking if /etc/locale.conf exists... " 7.16 if [ -s "/etc/locale.conf" ]; then 7.17 echo -n "Locale configuration file exists... " 7.18 status
8.1 --- a/etc/init.d/network.sh Sun Oct 04 15:32:39 2009 +0200 8.2 +++ b/etc/init.d/network.sh Sat Oct 24 12:29:17 2009 +0000 8.3 @@ -40,7 +40,7 @@ 8.4 } 8.5 8.6 Start() { 8.7 - # For wifi. Users just have to enable it throught yes and usually 8.8 + # For wifi. Users just have to enable it through yes and usually 8.9 # essid any will work and interface is autodetected. 8.10 if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then 8.11 if [ ! -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then 8.12 @@ -67,7 +67,7 @@ 8.13 priority=5 8.14 } 8.15 EOF 8.16 - echo "starting wpa_supplicant, for WPA-PSK" 8.17 + echo "Starting wpa_supplicant for WPA-PSK" 8.18 wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 8.19 ;; 8.20 any|ANY) cat > /tmp/wpa.conf <<EOF 8.21 @@ -82,13 +82,13 @@ 8.22 priority=5 8.23 } 8.24 EOF 8.25 - echo "starting wpa_supplicant for any key type" 8.26 + echo "Starting wpa_supplicant for any key type" 8.27 wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 8.28 ;; 8.29 esac 8.30 rm -f /tmp/wpa.conf 8.31 [ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL" 8.32 - echo -n "configuring $WIFI_INTERFACE..." 8.33 + echo -n "Configuring $WIFI_INTERFACE..." 8.34 ifconfig $WIFI_INTERFACE up 8.35 if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then 8.36 iwconfig $WIFI_INTERFACE txpower on 8.37 @@ -119,7 +119,7 @@ 8.38 } 8.39 8.40 8.41 -# looking for arguments: 8.42 +# Looking for arguments: 8.43 if [ -z "$1" ]; then 8.44 Boot 8.45 Start
9.1 --- a/etc/init.d/rcS Sun Oct 04 15:32:39 2009 +0200 9.2 +++ b/etc/init.d/rcS Sat Oct 24 12:29:17 2009 +0000 9.3 @@ -97,9 +97,9 @@ 9.4 status 9.5 9.6 # Fast boot into X for HD install or custom Live system. We need 9.7 -# keymap settings since Xvesa dump the console mapping and a correct 9.8 +# keymap settings since Xvesa dumps the console mapping and a correct 9.9 # slim configuration for screen resolution. DBUS and HAL must also start 9.10 -# befor X session (manual login or autologin) to have devices in PCmanFM. 9.11 +# before X session (manual login or autologin) to have devices in PCmanFM. 9.12 if [ "$FAST_BOOT_X" = "yes" ]; then 9.13 /etc/init.d/i18n.sh 9.14 /etc/init.d/dbus start 9.15 @@ -196,11 +196,11 @@ 9.16 done 9.17 fi 9.18 9.19 -# Be quiet on configuration to avoid message overwriting ncurses dialog 9.20 +# Be quiet on configuration to avoid messages overwriting ncurses dialog 9.21 echo "0 0 0 0" > /proc/sys/kernel/printk 9.22 9.23 # Detect PCI and USB devices with Tazhw from slitaz-tools. We load 9.24 -# kernel module only at first boot or in LiveCD mode. 9.25 +# kernel modules only at first boot or in LiveCD mode. 9.26 if [ ! -s /var/lib/detected-modules ]; then 9.27 /sbin/tazhw init 9.28 fi
10.1 --- a/etc/network.conf Sun Oct 04 15:32:39 2009 +0200 10.2 +++ b/etc/network.conf Sat Oct 24 12:29:17 2009 +0000 10.3 @@ -13,14 +13,14 @@ 10.4 # Enable/disable static IP at boot time. 10.5 STATIC="no" 10.6 10.7 -# Set IP address, and netmask for a static IP. 10.8 +# Set IP address and netmask for a static IP. 10.9 IP="192.168.0.6" 10.10 NETMASK="255.255.255.0" 10.11 10.12 # Set route gateway for a static IP. 10.13 GATEWAY="192.168.0.1" 10.14 10.15 -# Set DNS server. for a static IP. 10.16 +# Set DNS server for a static IP. 10.17 DNS_SERVER="192.168.0.1" 10.18 10.19 # Wifi connection.
11.1 --- a/etc/rcS.conf Sun Oct 04 15:32:39 2009 +0200 11.2 +++ b/etc/rcS.conf Sat Oct 24 12:29:17 2009 +0000 11.3 @@ -2,7 +2,7 @@ 11.4 # Config file used by /etc/init.d/rcS 11.5 # 11.6 11.7 -# Use udev to populate /dev and handles hotplug events. 11.8 +# Use udev to populate /dev and handle hotplug events. 11.9 UDEV="yes" 11.10 11.11 # Clean up the system removing all tmp and pid files. 11.12 @@ -31,7 +31,7 @@ 11.13 11.14 # Initialization scripts to run at boot time. Boot order is important, 11.15 # bootopts.sh (boot options) must start first, hwconf after network (tazx 11.16 -# need an active connexion to install Xorg) then you are free to choose. 11.17 +# needs an active connection to install Xorg), then you are free to choose. 11.18 # Note that the local.sh script exists to let you quickly add some local startup 11.19 # commands. 11.20 RUN_SCRIPTS="bootopts.sh network.sh i18n.sh hwconf.sh local.sh"