[Astlinux-commits] SF.net SVN: astlinux:[7329] branches/1.0

[<abe...@us...>]

Revision: 7329
          http://sourceforge.net/p/astlinux/code/7329
Author:   abelbeck
Date:     2015-11-18 16:05:40 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
dnsmasq, add DHCP_LEASETIME rc.cronf variable, defaults to 24 hours as before

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init	2015-11-15 16:16:12 UTC (rev 7328)
+++ branches/1.0/package/dnsmasq/dnsmasq.init	2015-11-18 16:05:40 UTC (rev 7329)
@@ -86,7 +86,7 @@
 
 trueDNSMASQnet()
 {
-  # args: tag, IP, ip.dstart, ip.dend
+  # args: tag, IP, ip.dstart, ip.dend, leasetime
   local servername="$2" gateway="$2"
 
   if [ "$1" = "lan" ]; then
@@ -96,7 +96,7 @@
   fi
 
   echo "
-dhcp-range=$1,$3,$4,24h
+dhcp-range=$1,$3,$4,$5
 dhcp-option=$1,option:router,$gateway
 dhcp-option=$1,option:dns-server,$gateway
 dhcp-option=$1,option:tftp-server,\"$servername\"
@@ -118,8 +118,8 @@
 
 addIPV6net()
 {
-  # args: IF, tag
-  local interface="$1" tag="$2" dhcpv6="" prefix="" iname IFS
+  # args: IF, tag, leasetime
+  local interface="$1" tag="$2" leasetime="$3" dhcpv6="" prefix="" iname IFS
 
   if [ "$IPV6" != "yes" ]; then
     return 2
@@ -161,11 +161,11 @@
 
   if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
     echo "
-dhcp-range=$tag,::1,constructor:$interface,ra-only,24h"
+dhcp-range=$tag,::1,constructor:$interface,ra-only,$leasetime"
     return 0
   elif [ -n "$prefix" ]; then
     echo "
-dhcp-range=$tag,$prefix,ra-only,64,24h"
+dhcp-range=$tag,$prefix,ra-only,64,$leasetime"
     return 0
   fi
 
@@ -175,9 +175,10 @@
 addDNSMASQnet()
 {
   # args: IF, IP, NM, tag
-  local ipbase dstart dend ipstart ipend NETWORK
+  local ipbase dstart dend ipstart ipend leasetime NETWORK
 
   if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
+    leasetime="${DHCP_LEASETIME:-24}h"
     if isDHCPinterface $1; then
       eval $(ipcalc -n "$2" "$3")
       ipbase=$(_isdottedquad $NETWORK)
@@ -191,11 +192,11 @@
       fi
       ipstart=$(($ipbase + $dstart))
       ipend=$(($ipbase + $dend))
-      trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend)
+      trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend) $leasetime
 
-      addIPV6net $1 $4
+      addIPV6net $1 $4 $leasetime
     else
-      if ! addIPV6net $1 $4; then
+      if ! addIPV6net $1 $4 $leasetime; then
         falseDNSMASQnet $1
       fi
     fi

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2015-11-15 16:16:12 UTC (rev 7328)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2015-11-18 16:05:40 UTC (rev 7329)
@@ -126,6 +126,10 @@
 ## 192.168.0.100 - 192.168.0.220
 #DHCPRANGE="100:220"
 
+## DHCP Lease Time
+## Specify the DHCP server lease time in hours, defaults to 24 hours.
+#DHCP_LEASETIME="24"
+
 ## VLANS
 ## Configure vlans here. These will be created on boot BEFORE INTIF, etc are
 ## brought up. You can then use these values for INTIF, EXTIF, etc.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.