Merge release-0.28.17 from 'tools/mic'

[platform/upstream/mic.git] / mic / kickstart / custom_commands / partition.py

diff --git a/mic/kickstart/custom_commands/partition.py b/mic/kickstart/custom_commands/partition.py
index 341e8dc..b0e9246 100755 (executable)
--- a/mic/kickstart/custom_commands/partition.py
+++ b/mic/kickstart/custom_commands/partition.py
@@ -26,11 +26,13 @@ class Mic_PartData(FC4_PartData):
         self.deleteRemovedAttrs()
         self.align = kwargs.get("align", None)
         self.extopts = kwargs.get("extopts", None)
+        self.f2fsopts = kwargs.get("f2fsopts", None)
         self.part_type = kwargs.get("part_type", None)
         self.uuid = kwargs.get("uuid", None)
         self.exclude_image = kwargs.get("exclude_from_image", False)
         self.vdfsopts = kwargs.get("vdfsopts", None)
         self.squashfsopts = kwargs.get("squashfsopts", None)
+        self.squashfsoptions_maxsize = kwargs.get("squashfsoptions_maxsize", None)
         self.cpioopts = kwargs.get("cpioopts", None)
         self.no_shrink = kwargs.get("no_shrink", False)
         self.init_expand = kwargs.get("init_expand", False)
@@ -42,6 +44,8 @@ class Mic_PartData(FC4_PartData):
             retval += " --align"
         if self.extopts:
             retval += " --extoptions=%s" % self.extopts
+        if self.f2fsopts:
+            retval += " --f2fsoptions=%s" % self.f2fsopts
         if self.part_type:
             retval += " --part-type=%s" % self.part_type
         if self.uuid:
@@ -52,6 +56,8 @@ class Mic_PartData(FC4_PartData):
             retval += " --vdfsoptions=%s" % self.vdfsopts
         if self.squashfsopts:
             retval += " --squashfsoptions=%s" % self.squashfsopts
+        if self.squashfsoptions_maxsize:
+            retval += " --squashfsoptions_maxsize=%s" % self.squashfsoptions_maxsize
         if self.cpioopts:
             retval += " --cpiooptions=%s" % self.cpioopts
         if self.no_shrink:
@@ -72,6 +78,8 @@ class Mic_Partition(FC4_Partition):
                       default=None)
         op.add_option("--extoptions", type="string", action="store", dest="extopts",
                       default=None)
+        op.add_option("--f2fsoptions", type="string", action="store", dest="f2fsopts",
+                      default=None)
         op.add_option("--part-type", type="string", action="store", dest="part_type",
                       default=None)
         op.add_option("--uuid", dest="uuid", action="store", type="string")
@@ -81,6 +89,8 @@ class Mic_Partition(FC4_Partition):
                       default=None)
         op.add_option("--squashfsoptions", type="string", action="store", dest="squashfsopts",
                       default=None)
+        op.add_option("--squashfsoptions_maxsize", type="string", action="store", dest="squashfsoptions_maxsize",
+                      default=None)
         op.add_option("--cpiooptions", type="string", action="store", dest="cpioopts",
                       default=None)
         op.add_option("--no-shrink", action="store_true", dest="no_shrink", default=False)