change squashfsopts2 name to squashfsoptions_maxsize

Change-Id: I934d9b2ea558644d8a3330193e14665e47008fc6
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/mic/imager/loop.py b/mic/imager/loop.py
index 7f42e3d..18f226c 100644 (file)
--- a/mic/imager/loop.py
+++ b/mic/imager/loop.py
@@ -171,7 +171,7 @@ class LoopImageCreator(BaseImageCreator):
                     'f2fsopts': part.f2fsopts or None,
                     'vdfsopts': part.vdfsopts or None,
                     'squashfsopts': part.squashfsopts or None,
-                    'squashfsopts2': part.squashfsopts2 or None,
+                    'squashfsoptions_maxsize': part.squashfsoptions_maxsize or None,
                     'cpioopts': part.cpioopts or None,
                     'loop': None,  # to be created in _mount_instroot
                     'uuid': part.uuid or None,
@@ -457,11 +457,11 @@ class LoopImageCreator(BaseImageCreator):
                     else:
                         runner.show("%s " % args)
 
-                    if item['squashfsopts2']:
-                        squashfsopts2=int(item['squashfsopts2']) * 1024 * 1024
+                    if item['squashfsoptions_maxsize']:
+                        squashfsoptions_maxsize=int(item['squashfsoptions_maxsize']) * 1024 * 1024
                         imgsize = os.stat(self._imgdir+"/"+item['label']+fs_suffix).st_size
-                        if imgsize > squashfsopts2:
-                            msger.error("squashfs img size is too large (%d > %d)" % (imgsize, squashfsopts2))
+                        if imgsize > squashfsoptions_maxsize:
+                            msger.error("squashfs img size is too large (%d > %d)" % (imgsize, squashfsoptions_maxsize))
                             sys.exit()
 
                 if item['aft_fstype'] == "vdfs":

diff --git a/mic/kickstart/custom_commands/partition.py b/mic/kickstart/custom_commands/partition.py
index 595b796..b0e9246 100755 (executable)
--- a/mic/kickstart/custom_commands/partition.py
+++ b/mic/kickstart/custom_commands/partition.py
@@ -32,7 +32,7 @@ class Mic_PartData(FC4_PartData):
         self.exclude_image = kwargs.get("exclude_from_image", False)
         self.vdfsopts = kwargs.get("vdfsopts", None)
         self.squashfsopts = kwargs.get("squashfsopts", None)
-        self.squashfsopts2 = kwargs.get("squashfsopts2", 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)
@@ -56,8 +56,8 @@ class Mic_PartData(FC4_PartData):
             retval += " --vdfsoptions=%s" % self.vdfsopts
         if self.squashfsopts:
             retval += " --squashfsoptions=%s" % self.squashfsopts
-        if self.squashfsopts2:
-            retval += " --squashfsoptions2=%s" % self.squashfsopts2
+        if self.squashfsoptions_maxsize:
+            retval += " --squashfsoptions_maxsize=%s" % self.squashfsoptions_maxsize
         if self.cpioopts:
             retval += " --cpiooptions=%s" % self.cpioopts
         if self.no_shrink:
@@ -89,7 +89,7 @@ class Mic_Partition(FC4_Partition):
                       default=None)
         op.add_option("--squashfsoptions", type="string", action="store", dest="squashfsopts",
                       default=None)
-        op.add_option("--squashfsoptions2", type="string", action="store", dest="squashfsopts2",
+        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)