SliTaz Repositories

     1.1 --- a/tinyutils/netbox	Wed Aug 12 11:51:53 2009 +0200
     1.2 +++ b/tinyutils/netbox	Wed Aug 12 13:22:54 2009 +0200
     1.3 @@ -167,7 +167,7 @@
     1.4  
     1.5  BROWSER=''
     1.6  for i in firefox opera dillo midori netsurf links ; do
     1.7 -	while $i > /dev/null && BROWSER="$i" && break
     1.8 +	which $i > /dev/null && BROWSER="$i" && break
     1.9  done
    1.10  case "$BROWSER" in
    1.11  links) BROWSER="links -g ";;
    1.12 @@ -1177,6 +1177,7 @@
    1.13  cat <<EOT
    1.14  udhcpd      Udhcpd        tab_udhcpd
    1.15  dhcpd       Dhcpd         tab_isc_dhcpd
    1.16 +dnsmasq     DNSmasq       tab_dnsmasq
    1.17  EOT
    1.18  }
    1.19  
    1.20 @@ -1266,13 +1267,29 @@
    1.21  EOT
    1.22  }
    1.23  
    1.24 +#
    1.25 +# DNSmasq 
    1.26 +#
    1.27 +tab_dnsmasq()
    1.28 +{
    1.29 +cat <<EOT
    1.30 +    <frame DNSmasq (DNS/DHCP/TFTP)>
    1.31 +$(helpdaemon dnsmasq 100x34 DNSMASQ_OPTIONS DNSMASQ_OPTS)
    1.32 +$(configfile /etc/dnsmasq.conf DNSMASQ_CONF)
    1.33 +      <hbox>
    1.34 +	$(startstopdaemon dnsmasq)
    1.35 +      </hbox>
    1.36 +     </frame>
    1.37 +EOT
    1.38 +}
    1.39 +
    1.40  data_dns()
    1.41  {
    1.42  cat <<EOT
    1.43  dnsd        Dnsd          tab_dnsd
    1.44  named       Named         tab_named
    1.45 +dnsmasq     DNSmasq       tab_dnsmasq
    1.46  #TODO sheerdns    Sheerdns      tab_sheerdns
    1.47 -#TODO dnsmasq     DNSmasq       tab_dnsmasq_dns
    1.48  EOT
    1.49  }
    1.50  
    1.51 @@ -1425,19 +1442,23 @@
    1.52  
    1.53  data_servers()
    1.54  {
    1.55 +local $pxe
    1.56 +pxe="#"
    1.57 +[ -x /usr/sbin/dnsmasq ] && pxe="inetd"
    1.58 +[ -x /usr/bin/tftpd -a -x /usr/sbin/udhcpd ] && pxe="inetd"
    1.59 +[ -f /usr/share/boot/pxelinux.0.lzma ] || pxe="#"
    1.60  cat <<EOT
    1.61  $([ -x /usr/sbin/dropbear -o -x /usr/sbin/sshd ] && echo "true" ||
    1.62  echo "#")   SSH           tab_sshd
    1.63  inetd       Inetd         tab_inetd
    1.64  zcip        ZeroConf      tab_zcip
    1.65 -$([ -x /usr/sbin/udhcpd -o -x /usr/sbin/dhcpd ] && echo "true" ||
    1.66 +$([ -x /usr/sbin/udhcpd -o -x /usr/sbin/dhcpd -o -x /usr/sbin/dnsmasq ] && 
    1.67 +echo "true" ||
    1.68  echo "#")   DHCP          tab_dhcpd
    1.69 -#TODO dnsmasq     DNSmasq       tab_dnsmasq_dhcpd
    1.70 -$([ -f /usr/share/boot/pxelinux.0.lzma -a -x /usr/bin/tftpd -a \
    1.71 -  -x /usr/sbin/inetd -a -x /usr/sbin/udhcpd ] && echo "true" ||
    1.72 -echo "#")   PXE           tab_pxe
    1.73 -#TODO dnsmasq     DNSmasq       tab_dnsmasq_tftpd
    1.74 -$([ -x /usr/sbin/dnsd -o -x /usr/sbin/named ] && echo "true" ||
    1.75 +$pxe        PXE           tab_pxe
    1.76 +dnsmasq     tftpd         tab_dnsmasq
    1.77 +$([ -x /usr/sbin/dnsd -o -x /usr/sbin/named -o -x /usr/sbin/dnsmasq ] && 
    1.78 +echo "true" ||
    1.79  echo "#")   DNS           tab_dns
    1.80  rsync       Rsync         tab_rsync
    1.81  $([ -x /usr/sbin/lighttpd -o -x /usr/bin/httpd ] && echo "true" ||