[Astlinux-commits] SF.net SVN: astlinux:[5251] branches/0.7

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

Revision: 5251
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5251&view=rev
Author:   abelbeck
Date:     2011-11-04 18:46:30 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
merge commits from the 1.0 branch for Michael: 5236(subset), 5248, 5249, 5250

Modified Paths:
--------------
    branches/0.7/package/webinterface/altweb/admin/edit.php
    branches/0.7/package/webinterface/altweb/admin/system.php
    branches/0.7/package/webinterface/altweb/common/version.php
    branches/0.7/target/generic/target_skeleton/etc/init.d/local
    branches/0.7/target/generic/target_skeleton/usr/sbin/restore-basic-conf

Added Paths:
-----------
    branches/0.7/target/generic/target_skeleton/etc/runlevels/default/K01local

Modified: branches/0.7/package/webinterface/altweb/admin/edit.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/edit.php	2011-11-04 18:16:58 UTC (rev 5250)
+++ branches/0.7/package/webinterface/altweb/admin/edit.php	2011-11-04 18:46:30 UTC (rev 5251)
@@ -372,8 +372,12 @@
   }
   if (is_writable($file = '/mnt/kd/dnsmasq.static')) {
     $sel = ($file === $openfile) ? ' selected="selected"' : '';
-    putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Static DNSmasq Leases</option>');
+    putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Additional DNSmasq Config</option>');
   }
+  if (is_writable($file = '/mnt/kd/dnsmasq.leases')) {
+    $sel = ($file === $openfile) ? ' selected="selected"' : '';
+    putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Active DNSmasq Leases</option>');
+  }
   if (is_writable($file = '/mnt/kd/blocked-hosts')) {
     $sel = ($file === $openfile) ? ' selected="selected"' : '';
     putHtml('<option value="'.$file.'"'.$sel.'>'.basename($file).' - Firewall Blocked Hosts</option>');
@@ -392,11 +396,12 @@
   }
   foreach (glob('/mnt/kd/rc.*') as $globfile) {
     if ($globfile === '/mnt/kd/rc.local' ||
+        $globfile === '/mnt/kd/rc.local.stop' ||
         $globfile === '/mnt/kd/rc.elocal' ||
         $globfile === '/mnt/kd/rc.ledcontrol') {
       if (is_writable($globfile)) {
         $sel = ($globfile === $openfile) ? ' selected="selected"' : '';
-        putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - Startup Shell Script</option>');
+        putHtml('<option value="'.$globfile.'"'.$sel.'>'.basename($globfile).' - Startup/Stop Shell Script</option>');
       }
     }
   }

Modified: branches/0.7/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/system.php	2011-11-04 18:16:58 UTC (rev 5250)
+++ branches/0.7/package/webinterface/altweb/admin/system.php	2011-11-04 18:46:30 UTC (rev 5251)
@@ -173,7 +173,8 @@
       $srcfile = '$(ls -1 /mnt/kd/ | sed -n -e "s/^rc.conf.d$/&/p" -e "s/^ssh_keys$/&/p"';
       $srcfile .= ' -e "s/^.*[.]conf$/&/p" -e "s/^webgui-prefs.txt$/&/p" -e "s/^ast.*/&/p"';
       $srcfile .= ' -e "s/^blocked-hosts$/&/p" -e "s/^dnsmasq.static$/&/p" -e "s/^hosts$/&/p" -e "s/^ethers$/&/p"';
-      $srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p" -e "s/^crontabs$/&/p"';
+      $srcfile .= ' -e "s/^rc.local$/&/p" -e "s/^rc.local.stop$/&/p" -e "s/^rc.elocal$/&/p" -e "s/^rc.ledcontrol$/&/p"';
+      $srcfile .= ' -e "s/^crontabs$/&/p"';
       $srcfile .= ' -e "s/^openvpn$/&/p" -e "s/^ipsec$/&/p" -e "s/^dahdi$/&/p" -e "s/^ssl$/&/p" -e "s/^apcupsd$/&/p")';
       $srcfile .= $firewall;
     } elseif ($backup_type === 'cdr') {

Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php	2011-11-04 18:16:58 UTC (rev 5250)
+++ branches/0.7/package/webinterface/altweb/common/version.php	2011-11-04 18:46:30 UTC (rev 5251)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.7.30';
+$GUI_VERSION = '1.7.31';
 
 ?>

Modified: branches/0.7/target/generic/target_skeleton/etc/init.d/local
===================================================================
--- branches/0.7/target/generic/target_skeleton/etc/init.d/local	2011-11-04 18:16:58 UTC (rev 5250)
+++ branches/0.7/target/generic/target_skeleton/etc/init.d/local	2011-11-04 18:46:30 UTC (rev 5251)
@@ -18,7 +18,10 @@
 }
 
 stop () {
-  :
+
+  if [ -x /mnt/kd/rc.local.stop ]; then
+    /mnt/kd/rc.local.stop
+  fi
 }
 
 case $1 in

Added: branches/0.7/target/generic/target_skeleton/etc/runlevels/default/K01local
===================================================================
--- branches/0.7/target/generic/target_skeleton/etc/runlevels/default/K01local	                        (rev 0)
+++ branches/0.7/target/generic/target_skeleton/etc/runlevels/default/K01local	2011-11-04 18:46:30 UTC (rev 5251)
@@ -0,0 +1 @@
+link ../../init.d/local
\ No newline at end of file


Property changes on: branches/0.7/target/generic/target_skeleton/etc/runlevels/default/K01local
___________________________________________________________________
Added: svn:special
   + *

Modified: branches/0.7/target/generic/target_skeleton/usr/sbin/restore-basic-conf
===================================================================
--- branches/0.7/target/generic/target_skeleton/usr/sbin/restore-basic-conf	2011-11-04 18:16:58 UTC (rev 5250)
+++ branches/0.7/target/generic/target_skeleton/usr/sbin/restore-basic-conf	2011-11-04 18:46:30 UTC (rev 5251)
@@ -76,7 +76,7 @@
 # Restore basic configuration files
 #
 if ! restore_files astdb webgui-prefs.txt blocked-hosts dnsmasq.static \
-                   ast-crash rc.local rc.elocal rc.ledcontrol hosts ethers; then
+                   ast-crash rc.local rc.local.stop rc.elocal rc.ledcontrol hosts ethers; then
   exit 2
 fi
 

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