diff options
author | Matt Wilson <msw@redhat.com> | 2001-07-26 18:15:36 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 2001-07-26 18:15:36 +0000 |
commit | 163a906dc101776102d8871f450611eca555ee34 (patch) | |
tree | c0cb3dbe99bb6d208275969dcf64a3ba98d30f46 /fsset.py | |
parent | bf0b060c2c700e64050d9d9d254a912f95276543 (diff) | |
download | anaconda-163a906dc101776102d8871f450611eca555ee34.tar.gz anaconda-163a906dc101776102d8871f450611eca555ee34.tar.xz anaconda-163a906dc101776102d8871f450611eca555ee34.zip |
don't decref mount count when we don't actually disable swap right now
Diffstat (limited to 'fsset.py')
-rw-r--r-- | fsset.py | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -377,7 +377,7 @@ class swapFileSystem(FileSystemType): def umount(self, device, path): # unfortunately, turning off swap is bad. - pass + raise RuntimeError, "unable to turn off swap" def formatDevice(self, entry, progress, chroot='/'): file = entry.device.setupDevice(chroot) @@ -944,9 +944,12 @@ class FileSystemSetEntry: def umount(self, chroot='/'): if self.mountcount > 0: - self.fsystem.umount(self.device, "%s/%s" % (chroot, - self.mountpoint)) - self.mountcount = self.mountcount - 1 + try: + self.fsystem.umount(self.device, "%s/%s" % (chroot, + self.mountpoint)) + self.mountcount = self.mountcount - 1 + except RuntimeError: + pass def setFileSystemType(self, fstype): self.fsystem = fstype |