SliTaz Repositories

     1.1 --- a/tinyutils/netbox	Sun Feb 15 00:06:44 2009 +0100
     1.2 +++ b/tinyutils/netbox	Wed Feb 18 16:42:49 2009 +0100
     1.3 @@ -297,9 +297,6 @@
     1.4  export IFCONFIG='
     1.5  <window title="Network status" icon-name="network-wire">
     1.6  <vbox>
     1.7 -	<text wrap="false">
     1.8 -		<input>date</input>
     1.9 -	</text>
    1.10  	<notebook labels="Network interfaces'
    1.11  		[ -x /usr/sbin/iwlist ] && IFCONFIG="$IFCONFIG|Wireless interfaces|Wireless networks"
    1.12  		tmp='|Routing|Servers">
    1.13 @@ -372,7 +369,7 @@
    1.14  	</hbox>'
    1.15  
    1.16  # Notebook tabs.
    1.17 -tmp='<notebook labels="DHCP|Static IP|PPPoE|PPP|Wifi|System wide|VPN|Servers'
    1.18 +tmp='<notebook labels="DHCP|Static IP|PPPoE|PPP|Wireless (Wifi)|System wide|VPN|Servers'
    1.19  NET_BOX="$NET_BOX$tmp"
    1.20  [ -x /sbin/iptables ] && NET_BOX="$NET_BOX|Firewall"
    1.21  [ -x /usr/bin/knock ] && NET_BOX="$NET_BOX|Knock"
    1.22 @@ -653,7 +650,7 @@
    1.23  
    1.24  # Wireless tab
    1.25  NET_BOX="$NET_BOX$tmp"
    1.26 -tmp='<frame Wireless>
    1.27 +tmp='<frame Wifi manual configuration>
    1.28      <notebook labels="Interface|Extra parameters'
    1.29  [ -d /lib/modules/`uname -r`/kernel/drivers/net/wireless ] && tmp="$tmp|Kernel Modules"
    1.30  tmp2='">
    1.31 @@ -777,26 +774,7 @@
    1.32        </hbox>
    1.33  "
    1.34  tmp2="$tmp2$tmp3"
    1.35 -tmp3="$(installbox ndiswrapper)"
    1.36 -[ -x /usr/sbin/ndiswrapper ] && tmp3='
    1.37 -      <hbox>
    1.38 -        <text use-markup="true">
    1.39 -          <label>"<b>Ndiswrapper drivers :</b>"</label>
    1.40 -        </text>
    1.41 -        <entry>
    1.42 -          <input>. /etc/network.conf; echo "$NDISWRAPPER_DRIVERS"</input>
    1.43 -          <variable>NDISWRAPPER_DRIVERS</variable>
    1.44 -        </entry>
    1.45 -        <button>
    1.46 -          <label>Restart</label>
    1.47 -          <input file icon="reload"></input>
    1.48 -	  <action>rmmod ndiswrapper</action>
    1.49 -	  <action>for i in $NDISWRAPPER_DRIVERS; do ndiswrapper -i $i; done</action>
    1.50 -	  <action>modprobe ndiswrapper</action>
    1.51 -        </button>
    1.52 -      </hbox>
    1.53 -'
    1.54 -[ -d /lib/modules/`uname -r`/kernel/drivers/net/wireless ] && tmp="$tmp$tmp2$tmp3
    1.55 +[ -d /lib/modules/`uname -r`/kernel/drivers/net/wireless ] && tmp="$tmp$tmp2
    1.56       </vbox>"
    1.57  tmp2='</notebook>
    1.58        <hbox>
    1.59 @@ -833,8 +811,9 @@
    1.60  [ -x /usr/sbin/iwconfig ] || NET_BOX="$NET_BOX
    1.61      <frame Wireless>
    1.62  $(installbox wireless_tools)
    1.63 -    </frame>
    1.64 -"
    1.65 +    </frame>"
    1.66 +
    1.67 +# System Wide configuration.
    1.68  tmp='<frame Configuration files>
    1.69        <hbox>
    1.70          <text use-markup="true">