diff options
| -rw-r--r-- | rescue.py | 2 | ||||
| -rw-r--r-- | todo.py | 3 | ||||
| -rw-r--r-- | upgrade.py | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -76,7 +76,7 @@ def runRescue(serial): rootmounted = 0 if root: try: - upgrade.mountRootPartition(root, fstab, '/mnt/sysimage', + upgrade.mountRootPartition(intf, root, fstab, '/mnt/sysimage', allowDirty = 1) ButtonChoiceWindow(screen, _("Rescue"), _("Your system has been mounted under /mnt/sysimage.\n\n" @@ -1076,7 +1076,8 @@ class ToDo: def upgradeFindPackages (self, rootInfo): if self.setupFilesystems: try: - upgrade.mountRootPartition(rootInfo, self.fstab, self.instPath, + upgrade.mountRootPartition(self.intf,rootInfo, + self.fstab, self.instPath, allowDirty = 0) except SystemError, msg: intf.messageWindow(("Dirty Filesystems"), diff --git a/upgrade.py b/upgrade.py index cd7d0e18c..0e4b78b5f 100644 --- a/upgrade.py +++ b/upgrade.py @@ -77,7 +77,7 @@ def findExistingRoots (intf, theFstab): win.pop () return rootparts -def mountRootPartition(rootInfo, theFstab, instPath, allowDirty = 0): +def mountRootPartition(intf, rootInfo, theFstab, instPath, allowDirty = 0): (root, rootFs) = rootInfo mdList = raid.startAllRaid(theFstab.driveList()) @@ -97,6 +97,7 @@ def mountRootPartition(rootInfo, theFstab, instPath, allowDirty = 0): raid.stopAllRaid(mdList) if not allowDirty and theFstab.hasDirtyFilesystems(): + import sys intf.messageWindow(("Dirty Filesystems"), _("One or more of the filesystems for your Linux system " "was not unmounted cleanly. Please boot your Linux " |