slitaz-boot-scripts rev 190

Tiny edits
author Paul Issott <paul@slitaz.org>
date Sat Jan 09 12:56:53 2010 +0000 (2010-01-09)
parents 3c447e4af92c
children 32805a1e95fd
files etc/init.d/README etc/init.d/network.sh
line diff
     1.1 --- a/etc/init.d/README	Mon Jan 04 23:34:50 2010 +0100
     1.2 +++ b/etc/init.d/README	Sat Jan 09 12:56:53 2010 +0000
     1.3 @@ -7,7 +7,7 @@
     1.4  then starts all daemons specified with $RUN_DAEMONS. The idea is to centralize
     1.5  the main system boot initialization in one configuration file. Init scripts can
     1.6  use the rc.functions file (part of the base-files) to call for the status
     1.7 -function. Daemons can use /etc/daemons.conf to call for default options, in
     1.8 +function. Daemons can use /etc/daemons.conf to call for default options; in
     1.9  this way users/admins don't need to edit the daemon init script located
    1.10  in the /etc/init.d directory.
    1.11  
     2.1 --- a/etc/init.d/network.sh	Mon Jan 04 23:34:50 2010 +0100
     2.2 +++ b/etc/init.d/network.sh	Sat Jan 09 12:56:53 2010 +0000
     2.3 @@ -13,12 +13,12 @@
     2.4  
     2.5  Boot() {
     2.6  	# Set hostname.
     2.7 -	echo -n "Setting hostname... "
     2.8 +	echo -n "Setting hostname..."
     2.9  	/bin/hostname -F /etc/hostname
    2.10  	status
    2.11  
    2.12  	# Configure loopback interface.
    2.13 -	echo -n "Configuring loopback... "
    2.14 +	echo -n "Configuring loopback..."
    2.15  	/sbin/ifconfig lo 127.0.0.1 up
    2.16  	/sbin/route add 127.0.0.1 lo
    2.17  	status	
    2.18 @@ -26,13 +26,13 @@
    2.19  
    2.20  
    2.21  eth() {
    2.22 -#  use ethernet
    2.23 +#  Use ethernet
    2.24  	   	ifconfig $INTERFACE up	
    2.25  }
    2.26  
    2.27  wifi() {
    2.28 -		# For wifi. Users just have to enable it throught yes and usually
    2.29 -	# essid any will work and interface is autodetected.
    2.30 +	# For wifi. Users just have to enable it through yes and usually
    2.31 +	# essid any will work and the interface is autodetected.
    2.32  	if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then
    2.33  	    ifconfig $INTERFACE down
    2.34  		
    2.35 @@ -46,7 +46,7 @@
    2.36  			[ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf
    2.37  		fi
    2.38  		
    2.39 -		echo -n "configuring $WIFI_INTERFACE..."
    2.40 +		echo -n "Configuring $WIFI_INTERFACE..."
    2.41  		ifconfig $WIFI_INTERFACE up
    2.42  		if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then
    2.43  			iwconfig $WIFI_INTERFACE txpower on
    2.44 @@ -65,7 +65,7 @@
    2.45  			     IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY"
    2.46  				 iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS
    2.47  # wpa_supplicant can also deal with wep encryption but iwconfig is preferred
    2.48 -# Tip:Use unquoted strings for hexadecimal key in wep_key0
    2.49 +# Tip: Use unquoted strings for hexadecimal key in wep_key0
    2.50  #			cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 
    2.51  #			cat >> /tmp/wpa.conf <<EOF
    2.52  #ctrl_interface=/var/run/wpa_supplicant
    2.53 @@ -95,7 +95,7 @@
    2.54  	priority=5
    2.55  }
    2.56  EOF
    2.57 -				echo "starting wpa_supplicant, for WPA-PSK"
    2.58 +				echo "Starting wpa_supplicant for WPA-PSK..."
    2.59  				wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 
    2.60  				;;
    2.61  			any|ANY) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 
    2.62 @@ -113,7 +113,7 @@
    2.63  	priority=5
    2.64  }
    2.65  EOF
    2.66 -				echo "starting wpa_supplicant for any key type"
    2.67 +				echo "Starting wpa_supplicant for any key type..."
    2.68  				wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 
    2.69  				;;
    2.70  		esac
    2.71 @@ -135,7 +135,7 @@
    2.72  
    2.73  # For a dynamic IP with DHCP. 
    2.74  	if [ "$DHCP" = "yes" ]  ; then
    2.75 -		echo "Starting udhcpc client on: $INTERFACE... "		
    2.76 +		echo "Starting udhcpc client on: $INTERFACE..."		
    2.77  		if [ -d /var/run/wpa_supplicant ]; then # wpa wireless && wpa_ctrl_open interface is up
    2.78  		   wpa		  
    2.79  		else  # fallback on udhcpc: wep, eth
    2.80 @@ -148,7 +148,7 @@
    2.81  static_ip() {
    2.82  # For a static IP.
    2.83  	if [ "$STATIC" = "yes" ] ; then
    2.84 -		echo "Configuring static IP on $INTERFACE: $IP... "
    2.85 +		echo "Configuring static IP on $INTERFACE: $IP..."
    2.86  		/sbin/ifconfig $INTERFACE $IP netmask $NETMASK up
    2.87  		/sbin/route add default gateway $GATEWAY
    2.88  		# Multi-DNS server in $DNS_SERVER.
    2.89 @@ -202,7 +202,7 @@
    2.90  			echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    2.91  			echo ""
    2.92  			echo -e "	Default configuration file is \033[1m/etc/network.conf\033[0m"
    2.93 -			echo -e "	You can specify another configuration file in second argument:"
    2.94 +			echo -e "	You can specify another configuration file in the second argument:"
    2.95  			echo -e "	\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart] file.conf"
    2.96  			echo ""
    2.97