[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 3/4] Pass clearPartType to the devicetree as well.



---
 storage/__init__.py   |    2 ++
 storage/devicetree.py |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/storage/__init__.py b/storage/__init__.py
index d7b53b6..a8eee08 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -225,6 +225,7 @@ class Storage(object):
         self.devicetree = DeviceTree(intf=self.anaconda.intf,
                                      ignored=self.ignoredDisks,
                                      exclusive=self.exclusiveDisks,
+                                     type=self.clearPartType,
                                      clear=self.clearPartDisks,
                                      reinitializeDisks=self.reinitializeDisks,
                                      protected=self.protectedPartitions,
@@ -283,6 +284,7 @@ class Storage(object):
         self.devicetree = DeviceTree(intf=self.anaconda.intf,
                                      ignored=self.ignoredDisks,
                                      exclusive=self.exclusiveDisks,
+                                     type=self.clearPartType,
                                      clear=self.clearPartDisks,
                                      reinitializeDisks=self.reinitializeDisks,
                                      protected=self.protectedPartitions,
diff --git a/storage/devicetree.py b/storage/devicetree.py
index 71df344..c73a24d 100644
--- a/storage/devicetree.py
+++ b/storage/devicetree.py
@@ -185,8 +185,8 @@ class DeviceTree(object):
         except for resize actions.
     """
 
-    def __init__(self, intf=None, ignored=[], exclusive=[], clear=[],
-                 zeroMbr=None, reinitializeDisks=None, protected=[],
+    def __init__(self, intf=None, ignored=[], exclusive=[], type=CLEARPART_TYPE_NONE,
+                 clear=[], zeroMbr=None, reinitializeDisks=None, protected=[],
                  passphrase=None, luksDict=None):
         # internal data members
         self._devices = []
@@ -194,6 +194,7 @@ class DeviceTree(object):
 
         self.intf = intf
         self.exclusiveDisks = exclusive
+        self.clearPartType = type
         self.clearPartDisks = clear
         self.zeroMbr = zeroMbr
         self.reinitializeDisks = reinitializeDisks
-- 
1.6.1.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]