diff --git a/pym/cl_fill.py b/pym/cl_fill.py
index cb7981a..c4241f6 100644
--- a/pym/cl_fill.py
+++ b/pym/cl_fill.py
@@ -189,7 +189,7 @@ class fillVars(varsShare):
             # check root for /dev/sd view
             if re.match("^\/dev\/[a-z]+.*$", rootparam):
                 return getUdevDeviceInfo(
-                   name=rootparam.strip()).get('DEVNAME','')
+                   name=rootparam.strip()).get('DEVNAME',rootparam)
             # check root set by uuid
             if re.match("^UUID=.*$",rootparam):
                 uuid = rootparam[5:].strip("\"'")
@@ -225,7 +225,7 @@ class fillVars(varsShare):
             return (path.normpath(os.path.join(basedir,targetfile)),linkfile)
         rootDev = self.Get("os_root_dev")
         if rootDev:
-            if "/dev/ram" in rootDev:
+            if "/dev/ram" in rootDev or "/dev/nfs" in rootDev:
                 return "livecd"
             idDict = dict(map(link2pair,
                      filter(lambda x:path.islink(x),