summaryrefslogtreecommitdiffstats
path: root/partitioning.py
diff options
context:
space:
mode:
authorMatt Wilson <msw@redhat.com>2001-06-22 17:52:56 +0000
committerMatt Wilson <msw@redhat.com>2001-06-22 17:52:56 +0000
commit3a4a525f1646dcb7e39ee330cd20af9faaeb1c99 (patch)
treecd078fd3091d0f4ea1362d52e18e319b12254238 /partitioning.py
parentaf2a741bb5771adfdc3b6e180fd351dfd19ad4f9 (diff)
downloadanaconda-3a4a525f1646dcb7e39ee330cd20af9faaeb1c99.tar.gz
anaconda-3a4a525f1646dcb7e39ee330cd20af9faaeb1c99.tar.xz
anaconda-3a4a525f1646dcb7e39ee330cd20af9faaeb1c99.zip
minor upgrade fixups
Diffstat (limited to 'partitioning.py')
-rw-r--r--partitioning.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/partitioning.py b/partitioning.py
index 253e5ef55..356af9952 100644
--- a/partitioning.py
+++ b/partitioning.py
@@ -21,6 +21,7 @@ if __name__ == "__main__":
import isys
import parted
import math
+import raid
from fsset import *
from translate import _
@@ -608,7 +609,8 @@ class DiskSet:
isys.mount(dev, '/mnt/sysimage', readOnly = 1)
except SystemError, (errno, msg):
intf.messageWindow(_("Error"),
- _("Error mounting filesystem on %s: %s") % (dev, msg))
+ _("Error mounting filesystem "
+ "on %s: %s") % (dev, msg))
continue
if os.access ('/mnt/sysimage/etc/fstab', os.R_OK):
rootparts.append ((dev, "ext2"))
@@ -627,19 +629,19 @@ class DiskSet:
or part.fs_type.name == "ext3"):
node = get_partition_name(part)
try:
- isys.mount(dev, '/mnt/sysimage')
+ isys.mount(node, '/mnt/sysimage')
except SystemError, (errno, msg):
intf.messageWindow(_("Error"),
_("Error mounting filesystem on "
- "%s: %s") % (dev, msg))
+ "%s: %s") % (node, msg))
part = disk.next_partition(part)
continue
if os.access ('/mnt/sysimage/etc/fstab', os.R_OK):
- rootparts.append ((dev, "ext2"))
+ rootparts.append ((node, "ext2"))
isys.umount('/mnt/sysimage')
if part.fs_type and (part.fs_type.name == "DOS"):
try:
- isys.mount(dev, '/mnt/sysimage', fstype = "vfat",
+ isys.mount(node, '/mnt/sysimage', fstype = "vfat",
readOnly = 1)
except:
log("failed to mount vfat filesystem on %s\n"
@@ -648,7 +650,7 @@ class DiskSet:
continue
if os.access('/mnt/sysimage/redhat.img', os.R_OK):
- rootparts.append((dev, "vfat"))
+ rootparts.append((node, "vfat"))
isys.umount('/mnt/sysimage')