diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-11-27 22:40:50 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-11-27 22:40:50 +0000 |
| commit | 2917e440afa82045a8f1e3fbfabf642c6b9bb69c (patch) | |
| tree | fa8ff8e23e7a99a912f5279f460c909c7223d868 /partitioning.py | |
| parent | 47913796e33561f31dbd0df3ec90db894cefe2f3 (diff) | |
| download | anaconda-2917e440afa82045a8f1e3fbfabf642c6b9bb69c.tar.gz anaconda-2917e440afa82045a8f1e3fbfabf642c6b9bb69c.tar.xz anaconda-2917e440afa82045a8f1e3fbfabf642c6b9bb69c.zip | |
remove most of the static instances of /mnt/sysimage (#14632)
Diffstat (limited to 'partitioning.py')
| -rw-r--r-- | partitioning.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/partitioning.py b/partitioning.py index 8ec4a6931..0d0dddeb9 100644 --- a/partitioning.py +++ b/partitioning.py @@ -1267,7 +1267,7 @@ class DiskSet: return labels - def findExistingRootPartitions(self, intf): + def findExistingRootPartitions(self, intf, mountpoint): rootparts = [] self.startAllRaid() @@ -1279,18 +1279,18 @@ class DiskSet: continue try: - isys.mount(dev, '/mnt/sysimage', readOnly = 1) + isys.mount(dev, mountpoint, readOnly = 1) except SystemError, (errno, msg): try: - isys.mount(dev, '/mnt/sysimage', "ext3", readOnly = 1) + isys.mount(dev, mountpoint, "ext3", readOnly = 1) except SystemError, (errno, msg): intf.messageWindow(_("Error"), _("Error mounting filesystem " "on %s: %s") % (dev, msg)) continue - if os.access ('/mnt/sysimage/etc/fstab', os.R_OK): + if os.access (mountpoint + '/etc/fstab', os.R_OK): rootparts.append ((dev, "ext2")) - isys.umount('/mnt/sysimage') + isys.umount(mountpoint) self.stopAllRaid() @@ -1313,20 +1313,20 @@ class DiskSet: or part.fs_type.name == "reiserfs"): node = get_partition_name(part) try: - isys.mount(node, '/mnt/sysimage', part.fs_type.name) + isys.mount(node, mountpoint, part.fs_type.name) except SystemError, (errno, msg): intf.messageWindow(_("Error"), _("Error mounting filesystem on " "%s: %s") % (node, msg)) part = disk.next_partition(part) continue - if os.access ('/mnt/sysimage/etc/fstab', os.R_OK): + if os.access (mountpoint + '/etc/fstab', os.R_OK): rootparts.append ((node, part.fs_type.name)) - isys.umount('/mnt/sysimage') + isys.umount(mountpoint) elif part.fs_type and (part.fs_type.name == "FAT"): node = get_partition_name(part) try: - isys.mount(node, '/mnt/sysimage', fstype = "vfat", + isys.mount(node, mountpoint, fstype = "vfat", readOnly = 1) except: log("failed to mount vfat filesystem on %s\n" @@ -1334,10 +1334,10 @@ class DiskSet: part = disk.next_partition(part) continue - if os.access('/mnt/sysimage/redhat.img', os.R_OK): + if os.access(mountpoint + '/redhat.img', os.R_OK): rootparts.append((node, "vfat")) - isys.umount('/mnt/sysimage') + isys.umount(mountpoint) part = disk.next_partition(part) return rootparts |