[Astlinux-commits] SF.net SVN: astlinux:[5708] branches/1.0/package/webinterface/altweb/common

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

Revision: 5708
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5708&view=rev
Author:   abelbeck
Date:     2012-10-11 17:50:14 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
web interface, Status tab, add check for /etc/dnsmasq.static to determine if DHCP is enabled

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/common/status.inc
    branches/1.0/package/webinterface/altweb/common/version.php

Modified: branches/1.0/package/webinterface/altweb/common/status.inc
===================================================================
--- branches/1.0/package/webinterface/altweb/common/status.inc	2012-10-11 15:45:15 UTC (rev 5707)
+++ branches/1.0/package/webinterface/altweb/common/status.inc	2012-10-11 17:50:14 UTC (rev 5708)
@@ -297,7 +297,7 @@
 //
 function isDHCPactive() {
 
-  shell('grep -q "^dhcp-leasefile=" /etc/dnsmasq.conf 2>/dev/null', $status);
+  shell('grep -q "^dhcp-leasefile=" /etc/dnsmasq.conf 2>/dev/null || grep -q "^dhcp-leasefile=" /etc/dnsmasq.static 2>/dev/null', $status);
 
   return($status == 0);
 }

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2012-10-11 15:45:15 UTC (rev 5707)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2012-10-11 17:50:14 UTC (rev 5708)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.16';
+$GUI_VERSION = '1.8.17';
 
 ?>

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