slitaz-boot-scripts diff etc/init.d/network.sh @ rev 472

init: mount 'SliTaz persistent /home' partition
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jan 10 14:11:26 2022 +0000 (2022-01-10)
parents 8d6928ce9c2c
children f434a7554919
line diff
     1.1 --- a/etc/init.d/network.sh	Sat Mar 30 02:41:37 2019 -0400
     1.2 +++ b/etc/init.d/network.sh	Mon Jan 10 14:11:26 2022 +0000
     1.3 @@ -81,7 +81,7 @@
     1.4  		su -l -c "$0 netapplet" - "$user"
     1.5  	done
     1.6  	# restart if LXPanel running
     1.7 -	if [ -n "$DISPLAY" -a -n "$(which lxpanelctl)" ]; then
     1.8 +	if [ -n "$DISPLAY" ] && [ -n "$(which lxpanelctl)" ]; then
     1.9  		lxpanelctl restart
    1.10  	fi
    1.11  }
    1.12 @@ -131,7 +131,7 @@
    1.13  
    1.14  remove_network() {
    1.15  	mv -f $WPA_CONF $WPA_CONF.old
    1.16 -	cat $WPA_CONF.old | tr '\n' '\a' | sed 's|[^#]\(network={\)|\n\1|g' | \
    1.17 +	tr '\n' '\a' < $WPA_CONF.old | sed 's|[^#]\(network={\)|\n\1|g' | \
    1.18  		fgrep -v "ssid=\"$1\"" | tr '\a' '\n' > $WPA_CONF
    1.19  }
    1.20  
    1.21 @@ -254,7 +254,7 @@
    1.22  					[ -n "$WIFI_ANONYMOUS_IDENTITY" ] && echo -e "\tanonymous_identity=\"$WIFI_ANONYMOUS_IDENTITY\""
    1.23  					[ -n "$WIFI_KEY" ] && echo -e "\tpassword=\"$WIFI-KEY\""
    1.24  					[ -n "$WIFI_PHASE2" ] && echo -e "\tphase2=\"auth=$WIFI_PHASE2\""
    1.25 -					echo }
    1.26 +					echo '}'
    1.27  				} >> $WPA_CONF
    1.28  				start_wpa_supplicant '802.1x EAP' ;;
    1.29