Merge pull request #3 from OpenMediaVault-Plugin-Developers/img-dev

Bugfix: no LUKS devices causes a (harmless) error message
OpenMediaVault-Plugin-Developers · Jan 13, 2016 · a36dd48 · a36dd48
2 parents 44b0ac1 + 181c38a
commit a36dd48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+openmediavault-luksencryption (2.1.1) unstable; urgency=medium
+
+  * Bugfix: no LUKS devices present would cause an error message.
+
+ -- OpenMediaVault Plugin Developers <[email protected]>  Wed, 13 Jan 2016 10:59:49 +0000
+
 openmediavault-luksencryption (2.1.0) unstable; urgency=high
 
   * Tested on OMV 3.0.

diff --git a/usr/share/php/openmediavault/luks.inc b/usr/share/php/openmediavault/luks.inc
@@ -41,7 +41,7 @@ class OMVLuksContainers extends OMVObject {
     public static function enumerate() {
         $cmd = "export LANG=C; blkid -t TYPE=crypto_LUKS -o device 2>/dev/null";
         @OMVUtil::exec($cmd, $output, $result);
-        if($result !== 0)
+        if(!in_array($result, array(0,2), TRUE))
             return FALSE;
         $list = array();
         // Parse command output: