slitaz-boot-scripts rev 395

Tiny edits
author Paul Issott <paul@slitaz.org>
date Mon Mar 23 18:18:15 2015 +0000 (2015-03-23)
parents 0f62401c7b6c
children f3e7c1cc6aef
files etc/init.d/network.sh etc/init.d/rcS etc/network.conf etc/rcS.conf usr/bin/rcSconf usr/share/slitaz/network.conf_migration
line diff
     1.1 --- a/etc/init.d/network.sh	Mon Mar 23 02:02:39 2015 +0200
     1.2 +++ b/etc/init.d/network.sh	Mon Mar 23 18:18:15 2015 +0000
     1.3 @@ -107,7 +107,7 @@
     1.4  		else
     1.5  			if fgrep -q ssid=\"$WIFI_ESSID\" $WPA_CONF; then
     1.6  				echo "Change network settings in $WPA_CONF"
     1.7 -				# Remove given existing network (it to be appended later)
     1.8 +				# Remove given existing network (it's to be appended later)
     1.9  				mv -f $WPA_CONF $WPA_CONF.old
    1.10  				cat $WPA_CONF.old | tr '\n' '\a' | sed 's|[^#]\(network={\)|\n\1|g' | \
    1.11  				fgrep -v "ssid=\"$WIFI_ESSID\"" | tr '\a' '\n' > $WPA_CONF
     2.1 --- a/etc/init.d/rcS	Mon Mar 23 02:02:39 2015 +0200
     2.2 +++ b/etc/init.d/rcS	Mon Mar 23 18:18:15 2015 +0000
     2.3 @@ -184,7 +184,7 @@
     2.4  
     2.5  # Start X session. Dbus must be started before Xorg and other daemons. 
     2.6  # We started it here because X is run before RUN_DAEMONS. Sleep, in 
     2.7 -# some in live mode we boot too fast and X can't initialize.
     2.8 +# some live modes we boot too fast and X can't initialize.
     2.9  if [ "$SCREEN" != 'text' ] && [ "$LOGIN_MANAGER" ] &&
    2.10  	[ -x /usr/bin/tazx ] && [ -s /etc/slitaz/applications.conf ] &&
    2.11  	[ -x "/etc/init.d/$LOGIN_MANAGER" ]; then
     3.1 --- a/etc/network.conf	Mon Mar 23 02:02:39 2015 +0200
     3.2 +++ b/etc/network.conf	Mon Mar 23 18:18:15 2015 +0000
     3.3 @@ -64,8 +64,8 @@
     3.4  # Set the operating channel in the device. Empty by default.
     3.5  WIFI_CHANNEL=""
     3.6  
     3.7 -# Force the card to register to the Access Point given by the address, if it
     3.8 -#  possible. Empty by default to automatic mode.
     3.9 +# Force the card to register to the Access Point given by the address, if it's
    3.10 +# possible. Empty by default to automatic mode.
    3.11  WIFI_AP=""
    3.12  
    3.13  
     4.1 --- a/etc/rcS.conf	Mon Mar 23 02:02:39 2015 +0200
     4.2 +++ b/etc/rcS.conf	Mon Mar 23 18:18:15 2015 +0000
     4.3 @@ -23,7 +23,7 @@
     4.4  LOGIN_MANAGER="slim"
     4.5  
     4.6  # Initialization scripts to run at boot time. The local.sh script
     4.7 -# let you quickly add some local startup commands.
     4.8 +# lets you quickly add some local startup commands.
     4.9  RUN_SCRIPTS="bootopts.sh system.sh network.sh local.sh"
    4.10  
    4.11  # Daemons to start at boot time. DBUS daemon is started before the
     5.1 --- a/usr/bin/rcSconf	Mon Mar 23 02:02:39 2015 +0200
     5.2 +++ b/usr/bin/rcSconf	Mon Mar 23 18:18:15 2015 +0000
     5.3 @@ -42,7 +42,7 @@
     5.4  LOGIN_MANAGER="slim"
     5.5  
     5.6  # Initialization scripts to run at boot time. The local.sh script
     5.7 -# let you quickly add some local startup commands.
     5.8 +# lets you quickly add some local startup commands.
     5.9  RUN_SCRIPTS="bootopts.sh system.sh network.sh local.sh"
    5.10  
    5.11  # Daemons to start at boot time. DBUS daemon is started before the
     6.1 --- a/usr/share/slitaz/network.conf_migration	Mon Mar 23 02:02:39 2015 +0200
     6.2 +++ b/usr/share/slitaz/network.conf_migration	Mon Mar 23 18:18:15 2015 +0000
     6.3 @@ -73,8 +73,8 @@
     6.4  # Set the operating channel in the device. Empty by default.
     6.5  WIFI_CHANNEL="$WIFI_CHANNEL"
     6.6  
     6.7 -# Force the card to register to the Access Point given by the address, if it
     6.8 -#  possible. Empty by default to automatic mode.
     6.9 +# Force the card to register to the Access Point given by the address, if it's
    6.10 +# possible. Empty by default to automatic mode.
    6.11  WIFI_AP="$WIFI_AP"
    6.12  
    6.13