[backend] support firmware settings for UEFI boot with product medias

openSUSE · Feb 15, 2013 · 03c6970 · 03c6970
1 parent a06e8d1
commit 03c6970
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/backend/BSKiwiXML.pm b/src/backend/BSKiwiXML.pm
@@ -68,6 +68,7 @@ our $kiwidesc = [
               'compressed',
               'flags',
               'filesystem',
+              'firmware',
               'fsnocheck',
               'fsreadonly',
               'fsreadwrite',

diff --git a/src/backend/BSProductXML.pm b/src/backend/BSProductXML.pm
@@ -220,6 +220,7 @@ our $productdesc = [
             'flavor',
             'repo_only',
             'mediastyle',
+            'firmware',
             'registration',
             'create_repomd',
             'sourcemedia',

diff --git a/src/backend/bs_productconvert b/src/backend/bs_productconvert
@@ -1321,7 +1321,9 @@ foreach my $medium ( @$media ){
           my $kiwi = Storable::dclone(\%generalImage);
 	  if (defined($medium->{'mediastyle'}) && $medium->{'mediastyle'} ne "suse-11.1" && $medium->{'mediastyle'} ne "suse-11.2") {
 	      $kiwi->{schemaversion} = "4.1"; # new kiwi requires exact this version
-	      $kiwi->{preferences}->{type} = [{image => "product"}];
+	      my $attrs = {image => "product"};
+              $attrs->{'firmware'} = $medium->{'firmware'} if $medium->{'firmware'};
+	      $kiwi->{preferences}->{type} = [$attrs];
 	  }else{
 	      # the schemE vs. schemA is intended by kiwi!
 	      $kiwi->{schemeversion} = "2.4"; # before openSUSE 11.3, until kiwi 3.74