Merge branch 'installer-v2'

[ipfire-3.x.git] / pkgs / core / pomona / src / storage / __init__.py

diff --git a/pkgs/core/pomona/src/storage_old/__init__.py b/pkgs/core/pomona/src/storage/__init__.py
similarity index 99%
rename from pkgs/core/pomona/src/storage_old/__init__.py
rename to pkgs/core/pomona/src/storage/__init__.py
index a6cc2e7e81469ba9f0c197e91d4a1f46f7bd6808..2a0da0b8da5df1909a2c26c459da549cefd88d69 100644 (file)
--- a/pkgs/core/pomona/src/storage_old/__init__.py
+++ b/pkgs/core/pomona/src/storage/__init__.py
@@ -35,21 +35,21 @@ class Storage(object):
         self.protectedDisks = []
         self.clearDisks = []
         self.ignoredDisks = []
-
+        
         self.defaultFSType = get_default_filesystem_type()
         self.defaultBootFSType = get_default_filesystem_type(boot=True)
-
+        
         self.doAutoPartition = False
         self.encryptedAutoPart = False
         #self.autoPartitionRequests = []
         self.autoPartitionRequests = [PartSpec(mountpoint="/", fstype=self.defaultFSType, size=1024, grow=True),
                                       PartSpec(mountpoint="/boot", fstype=self.defaultFSType, size=75, grow=False),]
-
+        
         #self.devicetree = DeviceTree(self.installer)
         self.devicetree = None
-
+        
         self._nextID = 0
-
+    
     def shutdown(self):
         self.installer.log.debug("Shutting down storage...")
 
@@ -142,7 +142,7 @@ class Storage(object):
         #    if isys.driveUsesModule(disk.name, ["usb-storage", "ub"]):
         #        usb_disks.append(disk)
         #    elif isys.driveUsesModule(disk.name, ["sbp2", "firewire-sbp2"]):
-        #        firewire_disks.append(disk)
+        #        firewire_disks.append(disk)   
 
         uses_usb = False
         uses_firewire = False
@@ -1167,7 +1167,7 @@ class CryptTab(object):
                                                 entry['device'].format.uuid,
                                                 entry['keyfile'],
                                                 entry['options'])
-        return crypttab
+        return crypttab                       
 
     def __getitem__(self, key):
         return self.mappings[key]