[PATCH] Improve handling for various nodev filesystems in fstab. (#493685, #493202)

[David Lehman <dlehman redhat com>]

---
 storage/__init__.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/__init__.py b/storage/__init__.py
index 7c17ec8..e320cdb 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -1248,10 +1248,11 @@ class FSSet(object):
         else:
             # nodev filesystem -- preserve or drop completely?
             format = getFormat(fstype)
-            if isinstance(format, get_device_format_class("nodev")):
+            if devspec == "none" or \
+               isinstance(format, get_device_format_class("nodev")):
                 device = NoDevice(format)
             else:
-                device = Device(devspec)
+                device = StorageDevice(devspec)
 
         if device is None:
             log.error("failed to resolve %s (%s) from fstab" % (devspec,
-- 
1.6.0.6