diff options
| author | Matt Wilson <msw@redhat.com> | 2001-07-10 03:14:21 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2001-07-10 03:14:21 +0000 |
| commit | 53ab665d50509ad65c67d4ddaca650b7ae91dbcf (patch) | |
| tree | 258d34696f346ff735f014d5b8b658676d036f71 | |
| parent | 6280955e6032ff1324f2ac226d8ddf5ec94e1f7f (diff) | |
| download | anaconda-53ab665d50509ad65c67d4ddaca650b7ae91dbcf.tar.gz anaconda-53ab665d50509ad65c67d4ddaca650b7ae91dbcf.tar.xz anaconda-53ab665d50509ad65c67d4ddaca650b7ae91dbcf.zip | |
non-ext2 upgrade support
| -rw-r--r-- | partitioning.py | 10 | ||||
| -rw-r--r-- | upgrade.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/partitioning.py b/partitioning.py index 0459b3bc2..5390e6bd9 100644 --- a/partitioning.py +++ b/partitioning.py @@ -826,6 +826,7 @@ class DiskSet: mdList = raid.startAllRaid(drives) for dev in mdList: + # XXX multifsify if not fsset.isValidExt2 (dev): continue @@ -850,10 +851,11 @@ class DiskSet: part = disk.next_partition () while part: if part.fs_type and (part.fs_type.name == "ext2" - or part.fs_type.name == "ext3"): + or part.fs_type.name == "ext3" + or part.fs_type.name == "reiserfs"): node = get_partition_name(part) try: - isys.mount(node, '/mnt/sysimage') + isys.mount(node, '/mnt/sysimage', part.fs_type.name) except SystemError, (errno, msg): intf.messageWindow(_("Error"), _("Error mounting filesystem on " @@ -861,9 +863,9 @@ class DiskSet: part = disk.next_partition(part) continue if os.access ('/mnt/sysimage/etc/fstab', os.R_OK): - rootparts.append ((node, "ext2")) + rootparts.append ((node, part.fs_type.name)) isys.umount('/mnt/sysimage') - if part.fs_type and (part.fs_type.name == "DOS"): + if part.fs_type and (part.fs_type.name == "FAT"): try: isys.mount(node, '/mnt/sysimage', fstype = "vfat", readOnly = 1) diff --git a/upgrade.py b/upgrade.py index e41007251..903ee3bea 100644 --- a/upgrade.py +++ b/upgrade.py @@ -52,7 +52,7 @@ def mountRootPartition(intf, rootInfo, oldfsset, instPath, allowDirty = 0, if rootFs == "vfat": fsset.mountLoopbackRoot(root) else: - isys.mount(root, '/mnt/sysimage') + isys.mount(root, '/mnt/sysimage', rootFs) oldfsset.reset() newfsset = fsset.readFstab(instPath + '/etc/fstab') |