2007-01-17 Jeremy Katz <katzj@redhat.com>

	* iw/progress_gui.py (InstallProgressWindow.completePackage):
	Quick and dirty way of handling-non rpm installs.  This needs to
	be reworked more completely

	* timezone.py (Timezone.__init__): Add a default in case the step
	is skipped

	* instdata.py (InstallData.write): Ensure that network is written
	out rather than counting on our backend to do so in its preinstall

	* fsset.py (FileSystemType.isKernelFS): Add a method to determine
	if we're an in-kernel pseudo-filesystem
	(PsudoFileSystem.isKernelFS): And implement it
	(FileSystemSet.umountFilesystems): Allow unmounting filesystems
	without turning off swap.

1 files changed, 10 insertions, 1 deletions

diff --git a/fsset.py b/fsset.py
index a6b690454..5d407a0b1 100644
--- a/fsset.py
+++ b/fsset.py
@@ -176,6 +176,10 @@ class FileSystemType:
         self.maxLabelChars = 16
         self.packages = []
 
+    def isKernelFS(self):
+        """Returns True if this is an in-kernel pseudo-filesystem."""
+        return False
+
     def mount(self, device, mountpoint, readOnly=0, bindMount=0,
               instroot=""):
         if not self.isMountable():
@@ -966,6 +970,9 @@ class PsudoFileSystem(FileSystemType):
         self.name = name
         self.supported = 0
 
+    def isKernelFS(self):
+        return True
+
 class ProcFileSystem(PsudoFileSystem):
     def __init__(self):
         PsudoFileSystem.__init__(self, "proc")
@@ -1870,7 +1877,7 @@ MAILADDR root
 
 	return ret
 
-    def umountFilesystems(self, instPath, ignoreErrors = 0):
+    def umountFilesystems(self, instPath, ignoreErrors = 0, swapoff = True):
         # XXX remove special case
         try:
             isys.umount(instPath + '/proc/bus/usb', removeDir = 0)
@@ -1884,6 +1891,8 @@ MAILADDR root
         reverse.reverse()
 
 	for entry in reverse:
+            if entry.mountpoint == "swap" and not swapoff:
+                continue
             entry.umount(instPath)
 
 class FileSystemSetEntry: