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

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

Revision: 7578
          http://sourceforge.net/p/astlinux/code/7578
Author:   abelbeck
Date:     2016-03-10 14:31:12 +0000 (Thu, 10 Mar 2016)
Log Message:
-----------
web interface, automatically don't use kernel-reboot with 'genx86_64-vm' builds, use reboot instead

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

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2016-03-10 14:04:50 UTC (rev 7577)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2016-03-10 14:31:12 UTC (rev 7578)
@@ -180,11 +180,11 @@
   }
 
   $cmd = '/sbin/kernel-reboot';
-  if (! is_executable($cmd) || (getPREFdef($global_prefs, 'system_reboot_classic_full') === 'yes')) {
+  if (! is_executable($cmd) || (getPREFdef($global_prefs, 'system_reboot_classic_full') === 'yes') || $arch === 'genx86_64-vm') {
     $cmd = '/sbin/reboot';
     $count_down_secs += 30;                                     
   }
-  
+
   shell($cmd.' -d4 >/dev/null 2>/dev/null &', $status);
   if ($status == 0) {                                           
     if ($setup) {

Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php	2016-03-10 14:04:50 UTC (rev 7577)
+++ branches/1.0/package/webinterface/altweb/common/version.php	2016-03-10 14:31:12 UTC (rev 7578)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.8.36';
+$GUI_VERSION = '1.8.37';
 
 ?>

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