# HG changeset patch # User Paul Issott # Date 1263041813 0 # Node ID aeec02b61fde65f3635bb25ecd5ef3334bec3e03 # Parent 3c447e4af92c9777b96051a0eed76eb25e3ab603 Tiny edits diff -r 3c447e4af92c -r aeec02b61fde etc/init.d/README --- a/etc/init.d/README Mon Jan 04 23:34:50 2010 +0100 +++ b/etc/init.d/README Sat Jan 09 12:56:53 2010 +0000 @@ -7,7 +7,7 @@ then starts all daemons specified with $RUN_DAEMONS. The idea is to centralize the main system boot initialization in one configuration file. Init scripts can use the rc.functions file (part of the base-files) to call for the status -function. Daemons can use /etc/daemons.conf to call for default options, in +function. Daemons can use /etc/daemons.conf to call for default options; in this way users/admins don't need to edit the daemon init script located in the /etc/init.d directory. diff -r 3c447e4af92c -r aeec02b61fde etc/init.d/network.sh --- a/etc/init.d/network.sh Mon Jan 04 23:34:50 2010 +0100 +++ b/etc/init.d/network.sh Sat Jan 09 12:56:53 2010 +0000 @@ -13,12 +13,12 @@ Boot() { # Set hostname. - echo -n "Setting hostname... " + echo -n "Setting hostname..." /bin/hostname -F /etc/hostname status # Configure loopback interface. - echo -n "Configuring loopback... " + echo -n "Configuring loopback..." /sbin/ifconfig lo 127.0.0.1 up /sbin/route add 127.0.0.1 lo status @@ -26,13 +26,13 @@ eth() { -# use ethernet +# Use ethernet ifconfig $INTERFACE up } wifi() { - # For wifi. Users just have to enable it throught yes and usually - # essid any will work and interface is autodetected. + # For wifi. Users just have to enable it through yes and usually + # essid any will work and the interface is autodetected. if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then ifconfig $INTERFACE down @@ -46,7 +46,7 @@ [ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf fi - echo -n "configuring $WIFI_INTERFACE..." + echo -n "Configuring $WIFI_INTERFACE..." ifconfig $WIFI_INTERFACE up if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then iwconfig $WIFI_INTERFACE txpower on @@ -65,7 +65,7 @@ IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY" iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS # wpa_supplicant can also deal with wep encryption but iwconfig is preferred -# Tip:Use unquoted strings for hexadecimal key in wep_key0 +# Tip: Use unquoted strings for hexadecimal key in wep_key0 # cat /etc/wpa_supplicant.conf > /tmp/wpa.conf # cat >> /tmp/wpa.conf < /tmp/wpa.conf @@ -113,7 +113,7 @@ priority=5 } EOF - echo "starting wpa_supplicant for any key type" + echo "Starting wpa_supplicant for any key type..." wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE ;; esac @@ -135,7 +135,7 @@ # For a dynamic IP with DHCP. if [ "$DHCP" = "yes" ] ; then - echo "Starting udhcpc client on: $INTERFACE... " + echo "Starting udhcpc client on: $INTERFACE..." if [ -d /var/run/wpa_supplicant ]; then # wpa wireless && wpa_ctrl_open interface is up wpa else # fallback on udhcpc: wep, eth @@ -148,7 +148,7 @@ static_ip() { # For a static IP. if [ "$STATIC" = "yes" ] ; then - echo "Configuring static IP on $INTERFACE: $IP... " + echo "Configuring static IP on $INTERFACE: $IP..." /sbin/ifconfig $INTERFACE $IP netmask $NETMASK up /sbin/route add default gateway $GATEWAY # Multi-DNS server in $DNS_SERVER. @@ -202,7 +202,7 @@ echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" echo "" echo -e " Default configuration file is \033[1m/etc/network.conf\033[0m" - echo -e " You can specify another configuration file in second argument:" + echo -e " You can specify another configuration file in the second argument:" echo -e " \033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart] file.conf" echo ""