first pass at getting things in alignment for gui upgrades. Should only affect upgrades, not installs

1 files changed, 17 insertions, 0 deletions

diff --git a/fsset.py b/fsset.py
index de51b64be..98127ee95 100644
--- a/fsset.py
+++ b/fsset.py
@@ -84,6 +84,8 @@ class LabelFactory:
         return mountpoint
 
     def reserveLabels(self, labels):
+        if self.labels == None:
+            self.labels = {}
         for device, label in labels.items():
             self.labels[label] = 1
 
@@ -935,6 +937,21 @@ def isValidExt2(device):
 
     return 0
 
+def mountLoopbackRoot(device, skipMount = 0):
+    isys.mount(device, '/mnt/loophost', fstype = "vfat")
+    isys.makeDevInode("loop1", '/tmp/' + "loop1")
+    isys.losetup("/tmp/loop1", "/mnt/loophost/redhat.img")
+
+    if not skipMount:
+	isys.mount("loop1", '/mnt/sysimage')
+
+def unmountLoopbackRoot(skipMount = 0):
+    if not skipMount:
+	isys.umount('/mnt/sysimage')        
+    isys.makeDevInode("loop1", '/tmp/' + "loop1")
+    isys.unlosetup("/tmp/loop1")
+    isys.umount('/mnt/loophost')        
+
 def ext2FormatFilesystem(argList, messageFile, windowCreator, mntpoint):
     if windowCreator:
         w = windowCreator(_("Formatting"),