tazpanel diff boot.cgi @ rev 637

network.cgi: fix wait_up()
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Nov 09 10:08:06 2021 +0000 (2021-11-09)
parents cd2735c8e31b
children ddf3a6575b62
line diff
     1.1 --- a/boot.cgi	Sun Sep 27 16:27:37 2020 +0000
     1.2 +++ b/boot.cgi	Tue Nov 09 10:08:06 2021 +0000
     1.3 @@ -157,7 +157,7 @@
     1.4  			# Name
     1.5  			echo "<td>$name</td>"
     1.6  			# First check if daemon is started at boottime
     1.7 -			[ echo "RUN_DAEMONS" | fgrep $name ] && boot="on boot"
     1.8 +			echo "RUN_DAEMONS" | fgrep -q $name && boot="on boot"
     1.9  			# Standard SliTaz busybox daemons and firewall
    1.10  			echo -n "<td>"
    1.11  			grep -qi "^${name}_OPTIONS=" /etc/daemons.conf && cfg="options|$cfg"
    1.12 @@ -350,7 +350,7 @@
    1.13  	entry='-1'
    1.14  	echo "$menu" | while read line
    1.15  	do
    1.16 -		if [ -n "$(echo $line | grep '#</header>')" ]; then
    1.17 +		if echo $line | grep -q '#</header>'; then
    1.18  			entry=$(($entry + 1))
    1.19  		fi
    1.20  		echo $line | sed "s|#</header>|$entry</header>|"
    1.21 @@ -387,7 +387,7 @@
    1.22  
    1.23  		[ "$iso" ] || msg err "$(_ 'Invalid ISO image.')"
    1.24  
    1.25 -		if [ "$iso" -a "$action" -a "$action" != "nop" ]; then
    1.26 +		if [ "$iso" ] && [ "$action" ] && [ "$action" != "nop" ]; then
    1.27  			case "$action" in
    1.28  				install*) dev=$(POST instdev) ;;
    1.29  				*) dev=$(POST usbkeydev) ;;
    1.30 @@ -487,7 +487,7 @@
    1.31  	<button name="syslog"  data-icon="@logs@">$(_ 'System logs')</button>
    1.32  	<button name="daemons" data-icon="@daemons@" data-root>$(_ 'Manage daemons')</button>
    1.33  EOT
    1.34 -		[ "$REMOTE_USER" = "root" -a -x /usr/bin/taziso ] && cat <<EOT
    1.35 +		[ "$REMOTE_USER" = "root" ] && [ -x /usr/bin/taziso ] && cat <<EOT
    1.36  	<button name="iso"     data-icon="@cd@">$(_ 'ISO mine')</button>
    1.37  EOT
    1.38  		[ -w /boot/grub/menu.lst ] && cat <<EOT