diff options
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/imount.c | 2 | ||||
| -rw-r--r-- | isys/isys.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/isys/imount.c b/isys/imount.c index a2c01ad70..5c0cec4ad 100644 --- a/isys/imount.c +++ b/isys/imount.c @@ -56,7 +56,7 @@ int doPwMount(char * dev, char * where, char * fs, int rdonly, int istty, if (mkdirChain(where)) return IMOUNT_ERR_ERRNO; - if (!isnfs && *dev == '/') { + if (!isnfs && (*dev == '/' || !strcmp(dev, "none"))) { buf = dev; } else if (!isnfs) { buf = alloca(200); diff --git a/isys/isys.py b/isys/isys.py index 525877da4..5dae4127b 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -108,7 +108,7 @@ def ddfile(file, megs, pw = None): def mount(device, location, fstype = "ext2", readOnly = 0): location = os.path.normpath(location) - if device[0] != "/": + if device and device != "none" and device[0] != "/": devName = "/tmp/%s" % device makeDevInode(device, devName) device = devName @@ -122,7 +122,7 @@ def mount(device, location, fstype = "ext2", readOnly = 0): if not rc: mountCount[location] = 1 - if device != "/proc" and device != "/usbdevfs": + if device != "none": os.unlink(device) return rc |