[elbe-devel] [PATCH 06/13] hdimg: set default for grub_fw_type parameter

Manuel Traut manut at linutronix.de
Wed Aug 29 21:07:27 CEST 2018


dec1bf036 introduced a new paramter grub_fw_type. To ensure existing
code is able to use the function as before, set it to a default value
that the ensure a behaviour of the function as it was before.

Signed-off-by: Manuel Traut <manut at linutronix.de>
---
 elbepack/efilesystem.py | 2 +-
 elbepack/hdimg.py       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/elbepack/efilesystem.py b/elbepack/efilesystem.py
index 70c15c07..e6a8c2ab 100644
--- a/elbepack/efilesystem.py
+++ b/elbepack/efilesystem.py
@@ -302,7 +302,7 @@ class TargetFs(ChRootFilesystem):
                     f.write(fstab.get_str())
             f.close()
 
-    def part_target(self, targetdir, grub_version, grub_fw_type):
+    def part_target(self, targetdir, grub_version, grub_fw_type=None):
 
         # create target images and copy the rfs into them
         self.images = do_hdimg(
diff --git a/elbepack/hdimg.py b/elbepack/hdimg.py
index 3b857ea5..9604ca79 100644
--- a/elbepack/hdimg.py
+++ b/elbepack/hdimg.py
@@ -464,7 +464,7 @@ def create_logical_partitions(
         current_sector += lpart.getLength()
 
 
-def do_image_hd(outf, hd, fslabel, target, grub_version, grub_fw_type):
+def do_image_hd(outf, hd, fslabel, target, grub_version, grub_fw_type=None):
 
     # pylint: disable=too-many-arguments
     # pylint: disable=too-many-locals
@@ -566,7 +566,7 @@ def add_binary_blob(outf, hd, target):
             bs))
 
 
-def do_hdimg(outf, xml, target, rfs, grub_version, grub_fw_type):
+def do_hdimg(outf, xml, target, rfs, grub_version, grub_fw_type=None):
 
     # pylint: disable=too-many-arguments
     # pylint: disable=too-many-locals
-- 
2.18.0




More information about the elbe-devel mailing list