Version 6.2.4 2016.11.05

Patched URLs to refer to github:webgui '6.2' branch.

plugins/dynamix.docker.manager/include/DockerClient.php

@@ -751,7 +751,7 @@ class DockerClient {
 
 
 	public function stopContainer($id) {
-		$this->getDockerJSON("/containers/${id}/stop", "POST", $code);
+		$this->getDockerJSON("/containers/${id}/stop?t=10", "POST", $code);
 		$this->allContainersCache = null; // flush cache
 		$codes = [
 			"204" => true, // No error
@@ -764,7 +764,7 @@ class DockerClient {
 
 
 	public function restartContainer($id) {
-		$this->getDockerJSON("/containers/${id}/restart", "POST", $code);
+		$this->getDockerJSON("/containers/${id}/restart?t=10", "POST", $code);
 		$this->allContainersCache = null; // flush cache
 		$codes = [
 			"204" => true, // No error

plugins/dynamix.vm.manager/VMSettings.page

@@ -185,26 +185,22 @@ foreach ($arrSyslinuxCfg as &$strSyslinuxCfg) {
 				$iso_dir = str_replace('//', '/', $iso_dir.'/');
 			}
 
-			$strManual = '';
+			$strMatch = '';
 			if (!empty($domain_cfg['MEDIADIR']) &&
 				!empty($domain_cfg['VIRTIOISO']) &&
 				dirname($domain_cfg['VIRTIOISO']) != '.' &&
-				strpos($iso_dir, dirname($domain_cfg['VIRTIOISO'])) !== 0) {
-				$strManual = 'manual';
+				is_file($domain_cfg['VIRTIOISO'])) {
+				$strMatch = 'manual';
 			}
 
-			$strMatch = $strManual;
 			foreach ($virtio_isos as $key => $value) {
-				if (empty($strMatch) &&
-					(basename($domain_cfg['VIRTIOISO']) == $value['name']) &&
-					is_file($iso_dir.$value['name'])
-					) {
+				if (($domain_cfg['VIRTIOISO'] == $iso_dir.$value['name']) && is_file($iso_dir.$value['name'])) {
 					$strMatch = $value['name'];
 				}
 				echo mk_option($strMatch, $value['name'], $value['name']);
 			}
 
-			echo mk_option($strManual, 'manual', 'Manual');
+			echo mk_option($strMatch, 'manual', 'Manual');
 		?>
 		</select><input type="text" id="winvirtio" name="VIRTIOISO" data-pickfilter="iso" data-pickcloseonfile="true" data-pickroot="<?= (is_dir('/mnt/user/') ? '/mnt/user/' : '/mnt/') ?>" value="<?=$domain_cfg['VIRTIOISO']?>"<?if ($var['fsState'] == "Started"):?> placeholder="Click to Select"><i class="fa fa-download" id="download_button" title="Download Windows VirtIO driver ISO"> <span>Download</span></i><span id="download_status"></span<?endif;?>>
 	</dd>

plugins/dynamix/ArrayOperation.page

@@ -330,6 +330,12 @@ $('.tabs').append("<span class='status vhshift'><input type='button' value='Refr
         <tr>
         <td><?=status_indicator()?><strong>Stopped</strong>. Unclean shutdown detected.</td>
         <td><input type="submit" name="cmdStart" value="Start"></td>
+        <td><strong>Start</strong> will bring the array on-line.</td>
+        </tr>
+<?    elseif ($var['sbClean']!="yes" && strstr($var['mdResyncAction'],"check")):?>
+        <tr>
+        <td><?=status_indicator()?><span class="strong big">Stopped</span>. Unclean shutdown detected.</td>
+        <td><input type="submit" name="cmdStart" value="Start"></td>
         <td><strong>Start</strong> will bring the array on-line and start <strong>Parity-Check</strong>.
           <br><input type="checkbox" name="optionCorrect" value="correct" checked><small>Write corrections to parity</small></td>
         </tr>

plugins/dynamix/DiskSettings.page

@@ -121,6 +121,12 @@ Default file system:
 >
 > The default file system type for a single or multi-device cache is always Btrfs.
 
+Shutdown time-out:
+: <input type="text" name="shutdown_timeout" maxlength="10" value="<?=$var['shutdownTimeout']?>" class="narrow">
+
+> When shutting down the server, this defines how long to wait in seconds for *graceful* shutdown before forcing
+> shutdown to continue.
+
 Tunable (poll_attributes):
 : <input type="text" name="poll_attributes" maxlength="10" value="<?=$var['poll_attributes']?>" class="narrow"><?=$var['poll_attributes_status']?>
 
@@ -241,6 +247,7 @@ Default SMART controller type:
 : <select name="smType" size="1" onchange="setIndex(this.form)">
   <?=mk_option($var['smType'], "", "Automatic")?>
   <?=mk_option($var['smType'], "-d ata", "ATA")?>
+  <?=mk_option($var['smType'], "-d sat", "SATA")?>
   <?=mk_option($var['smType'], "-d scsi", "SCSI")?>
   <?=mk_option($var['smType'], "-d 3ware", "3Ware")?>
   <?=mk_option($var['smType'], "-d areca", "Areca")?>

plugins/dynamix/ShareEdit.page

@@ -285,17 +285,17 @@ Use cache disk:
 > **No** prohibits new files and subdirectories from being written onto the Cache disk/pool.
 >
 > **Yes** indicates that all new files and subdirectories should be written to the Cache disk/pool, provided
-> enough free space exists on the Cache disk/pool.  If there is insufficant space on the Cache disk/pool, then
+> enough free space exists on the Cache disk/pool.  If there is insufficient space on the Cache disk/pool, then
 > new files and directories are created on the array.  When the *mover* is invoked, files and subdirectories are
-> transfered off the Cache disk/pool and onto the array.
+> transferred off the Cache disk/pool and onto the array.
 >
 > **Only** indicates that all new files and subdirectories must be writen to the Cache disk/pool.  If there
 > is insufficient free space on the Cache disk/pool, *create* operations will fail with *out of space* status.
 >
 > **Prefer** indicates that all new files and subdirectories should be written to the Cache disk/pool, provided
-> enough free space exists on the Cache disk/pool.  If there is insufficant space on the Cache disk/pool, then
+> enough free space exists on the Cache disk/pool.  If there is insufficient space on the Cache disk/pool, then
 > new files and directories are created on the array.  When the *mover* is invoked, files and subdirectories are
-> transfered off the array and onto Cache disk/pool.
+> transferred off the array and onto Cache disk/pool.
 
 Enable Copy-on-write:
 : <select name="shareCOW" size="1"<?if ($name):?> disabled<?endif;?>>

plugins/dynamix/dynamix.plg

@@ -3,9 +3,10 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "dynamix">
 <!ENTITY author    "Bergware">
-<!ENTITY version   "2016.09.15">   <!-- Intended new version of Dynamix webGUI -->
-<!ENTITY unRAID    "6.2">          <!-- Change to new unRAID version when issued together -->
-<!ENTITY pluginURL "https://raw.github.com/limetech/&name;-6.2/master/plugins/&name;/&name;.plg">
+<!ENTITY branch    "6.2">
+<!ENTITY version   "2016.11.05">  <!-- Intended new version of Dynamix webGUI -->
+<!ENTITY unRAID    "6.2.4">  <!-- Change to new unRAID version when issued together -->
+<!ENTITY pluginURL "https://raw.github.com/limetech/webgui/&branch;/plugins/&name;/&name;.plg">
 ]>
 
 <PLUGIN name="&name;" author="&author;" version="&version;" unRAID="&unRAID;" pluginURL="&pluginURL;">
@@ -15,13 +16,13 @@ Dynamix webGui v&version;
 -------------------------
 
 Please refer to
-**&lt;a href="https://github.com/limetech/&name;-6.2/commits/master" target="_blank">commit history&lt;/a>**
+**&lt;a href="https://github.com/limetech/webgui/commits/&branch;" target="_blank">commit history&lt;/a>**
 on github.
 </CHANGES>
 
 <!-- Get from github as tarball. -->
 <FILE Name="/boot/config/plugins/&name;/&name;-&version;.tar.gz">
-<URL>"https://github.com/limetech/&name;/archive/&version;.tar.gz"</URL>
+<URL>"https://github.com/limetech/webgui/&branch;/archive/&version;.tar.gz"</URL>
 </FILE>
 
 <!-- The 'install' script. -->

plugins/dynamix/scripts/diagnostics

@@ -19,6 +19,7 @@ $cli = empty($zip);
 $get = "/var/local/emhttp";
 $var = file_exists("$get/var.ini") ? parse_ini_file("$get/var.ini") : [];
 
+$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 $folders = ['/boot','/boot/config','/boot/config/plugins','/boot/extra','/boot/syslinux','/var/log','/var/log/plugins','/var/log/packages','/tmp'];
 
 function anonymize($text,$select) {
@@ -170,8 +171,8 @@ if ($qemu) {
   file_put_contents("/$diag/qemu/no qemu log files","");
 // create SMART reports (suppress errors)
 $disks = file_exists("$get/disks.ini") ? parse_ini_file("$get/disks.ini", true) : [];
-include_once '/usr/local/emhttp/webGui/include/CustomMerge.php';
-exec("ls -l /dev/disk/by-id/[asun]* 2>/dev/null|sed '/-part/d;s:^.*/by-id/[^-]*-::;s:-> ../../::'", $devices);
+include_once "$docroot/webGui/include/CustomMerge.php";
+exec("ls -l /dev/disk/by-id/[asun]* 2>/dev/null|sed '/-part/d;s|^.*/by-id/[^-]*-||;s|-> ../../||;s|:|-|'", $devices);
 foreach ($devices as $device) {
   list($name,$dev) = explode(' ',$device);
   $type = '';

plugins/unRAIDServer/unRAIDServer.plg

@@ -3,10 +3,10 @@
 <!DOCTYPE PLUGIN [
 <!ENTITY name      "unRAIDServer">
 <!ENTITY author    "LimeTech">
-
-<!ENTITY version   "6.3-2016.09.22">
-<!ENTITY pluginURL "https://raw.github.com/limetech/webgui/master/plugins/&name;/&name;.plg">
-<!ENTITY category  "next">
+<!ENTITY branch    "6.2">
+<!ENTITY version   "6.2.4">
+<!ENTITY pluginURL "https://raw.github.com/limetech/webgui/&branch;/plugins/&name;/&name;.plg">
+<!ENTITY category  "stable">
 
 <!ENTITY zip       "https://s3.amazonaws.com/dnld.lime-technology.com/&category;/unRAIDServer-&version;-x86_64.zip">
 <!ENTITY md5       "https://s3.amazonaws.com/dnld.lime-technology.com/&category;/unRAIDServer-&version;-x86_64.md5">
@@ -25,6 +25,85 @@
 unRAID Server OS Change Log
 ===========================
 
+Version 6.2.4 2016-11-05
+------------------------
+
+Base distro:
+
+- curl: version 7.51.0 (CVE-2016-8615, CVE-2016-8616, CVE-2016-8617, CVE-2016-8618, CVE-2016-8619, CVE-2016-8620, CVE-2016-8621, CVE-2016-8622, CVE-2016-8623, CVE-2016-8624, CVE-2016-8625)
+- glibc-zoneinfo: version 2016i
+
+Linux kernel:
+
+- added config options:
+  - CONGIG_CFQ_GROUP_IOSCHED: CFQ Group Scheduling support
+  - CONFIG_CGROUP_PIDS: PIDs cgroup subsystem
+  - CONGIG_BLK_DEV_THROTTLING: Block layer bio throttling support
+  - CONFIG_XFRM_USER: Transformation user configuration interface
+
+Version 6.2.3 2016-11-01
+------------------------
+
+Base distro:
+
+- php: version 5.6.27
+
+Linux kernel:
+
+- version 4.4.30
+- md/unraid version: 2.6.8
+  - make the 'check' command "correct"/"nocorrect" argument case insensitive
+  - mark superblock 'clean' upon initialization
+    
+Management:
+
+- emhttp: ensure disk shares have proper permissions set even if not being exported
+- emhttp: fix detecton of unclean shutdown to trigger automatic parity check upon Start if necessary
+- emhttp: unmount docker/libvirt loopback if docker/libvirt fail to start properly
+- update: hwdata/{pci.ids,usb.ids,oui.txt,manuf.txt} smartmontools/drivedb.h
+- webGui: correct handling of unclean shutdown detection
+- webGui: fixed some help text typos
+- webGui: Fixed: Web UI Docker Stop/Restart does not cleanly stop container
+    
+Version 6.2.2 2016-10-21
+------------------------
+
+Linux kernel:
+
+- version 4.4.26 (CVE-2016-5195)
+- reiserfs: incorporated patch from SUSE to fix broken extended attributes bug
+
+Management:
+
+- shutdown: save diagnostics and additional logging in event of cmdStop timeout
+- webGui: Fixed: Windows unable to extract diagnostics zip file
+
+Version 6.2.1 2016-10-04
+------------------------
+
+Base distro:
+
+- curl: version 7.50.3 (CVE-2016-7167)
+- gnutls: version 3.4.15 (CVE-2015-6251)
+- netatalk: version 3.1.10
+- openssl: version 1.0.2j (CVE-2016-7052, CVE-2016-6304, CVE-2016-6305, CVE-2016-2183, CVE-2016-6303, CVE-2016-6302, CVE-2016-2182, CVE-2016-2180, CVE-2016-2177, CVE-2016-2178, CVE-2016-2179, CVE-2016-2181, CVE-2016-6306, CVE-2016-6307, CVE-2016-6308)
+- php: version 5.6.26 (CVE-2016-7124, CVE-2016-7125, CVE-2016-7126, CVE-2016-7127, CVE-2016-7128, CVE-2016-7129, CVE-2016-7130, CVE-2016-7131, CVE-2016-7132, CVE-2016-7133, CVE-2016-7134, CVE-2016-7416, CVE-2016-7412, CVE-2016-7414, CVE-2016-7417, CVE-2016-7411, CVE-2016-7413, CVE-2016-7418)
+
+Linux kernel:
+
+- version 4.4.23 (CVE-2016-0758, CVE-2016-6480)
+- added config options:
+  - CONFIG_SENSORS_I5500: Intel 5500/5520/X58 temperature sensor
+
+Management:
+
+- bug fix: For file system type "auto", only attempt btrfs,xfs,reiserfs mounts.
+- bug fix: For docker.img and libvirt.img, if path on /mnt/ check for mountpoint on any subdir component, not just second subdir.
+- bug fix: During shutdown force continue if array stop taking too long.
+- bug fix: Handle case in 'mover' where rsync may move a file but also return error status.
+- md/unraid: Fix bug where case of no data disks improperly detected.
+- webGui: Add "Shutdown time-out" control on Disk Settings page.
+
 Version 6.2 2016-09-15
 ----------------------
 
@@ -70,7 +149,7 @@ webGui:
 - Improved feedback for clickable links
 - Remove unneeded title messages in links
 - Save mail password encrypted in configuration file
-    
+
 Version 6.2.0-rc4 2016-08-18
 ----------------------------