Porting PR saltstack#51956 to 2019.2.1

garethgreenaway · Sep 19, 2019 · 1859c43 · 1859c43
1 parent 8d4d5ea
commit 1859c43
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/salt/states/blockdev.py b/salt/states/blockdev.py
@@ -193,5 +193,6 @@ def _checkblk(name):
     Check if the blk exists and return its fstype if ok
     '''
 
-    blk = __salt__['cmd.run']('blkid -o value -s TYPE {0}'.format(name))
+    blk = __salt__['cmd.run']('blkid -o value -s TYPE {0}'.format(name),
+                              ignore_retcode=True)
     return '' if not blk else blk