Hello community,
here is the log from the commit of package kiwi for openSUSE:12.3 checked in at
2013-02-04 17:53:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/kiwi (Old)
and /work/SRC/openSUSE:12.3/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.3/kiwi/kiwi.changes 2013-02-04 14:04:23.000000000
+0100
+++ /work/SRC/openSUSE:12.3/.kiwi.new/kiwi.changes 2013-02-04
17:53:07.000000000 +0100
@@ -4 +4 @@
-- 3 hotfixes from ms
+- 4 hotfixes from ms
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.patch ++++++
--- /var/tmp/diff_new_pack.kJ4uSe/_old 2013-02-04 17:53:08.000000000 +0100
+++ /var/tmp/diff_new_pack.kJ4uSe/_new 2013-02-04 17:53:08.000000000 +0100
@@ -94,3 +94,68 @@
}
return 1;
}
+commit cbdf8233e03d87acba3d7eff1e503bd9eb92446d
+Author: Marcus Schäfer <m...@suse.de>
+Date: Mon Feb 4 15:19:08 2013 +0100
+
+ - fixed search and call code for editbootconfig and editbootinstall
+ evaluation when building iso images, live and install media
+
+diff --git a/modules/KIWIIsoLinux.pm b/modules/KIWIIsoLinux.pm
+index 2283c4d..63d789a 100644
+--- a/modules/KIWIIsoLinux.pm
++++ b/modules/KIWIIsoLinux.pm
+@@ -820,9 +820,22 @@ sub createISO {
+ if ((! $editBoot) && ($xml)) {
+ $editBoot = $xml -> getEditBootConfig_legacy();
+ }
+- if (($editBoot) && (-e $editBoot)) {
+- $kiwi -> info ("Calling pre bootloader install
script...\n");
+- system ("cd $src && bash --norc -c $editBoot");
++ if ($editBoot) {
++ my $rootpath = $cmdL -> getConfigDir();
++ if ($rootpath) {
++ if (open my $FD,
'<',"$rootpath/image/main::Prepare") {
++ my $idesc = <$FD>; close $FD;
++ if ($idesc) {
++ $editBoot =
$idesc."/".$editBoot;
++ }
++ }
++ }
++ if (($editBoot) && (-e $editBoot)) {
++ $kiwi -> info ("Calling pre bootloader install
script...\n");
++ $kiwi -> info ("--> $editBoot\n");
++ system ("cd $src && chmod u+x $editBoot");
++ system ("cd $src && bash --norc -c $editBoot");
++ }
+ }
+ }
+ #==========================================
+@@ -873,10 +886,23 @@ sub createISO {
+ if ((! $editBoot) && ($xml)) {
+ $editBoot = $xml -> getEditBootInstall_legacy();
+ }
+- if (($editBoot) && (-e $editBoot)) {
+- $kiwi -> info ("Calling post bootloader install
script...\n");
+- my @opts = ("'".$cmdln."'");
+- system ("cd $src && bash --norc -c \"$editBoot
@opts\"");
++ if ($editBoot) {
++ my $rootpath = $cmdL -> getConfigDir();
++ if ($rootpath) {
++ if (open my $FD,
'<',"$rootpath/image/main::Prepare") {
++ my $idesc = <$FD>; close $FD;
++ if ($idesc) {
++ $editBoot =
$idesc."/".$editBoot;
++ }
++ }
++ }
++ if (($editBoot) && (-e $editBoot)) {
++ $kiwi -> info ("Calling post bootloader install
script...\n");
++ $kiwi -> info ("--> $editBoot\n");
++ my @opts = ("'".$cmdln."'");
++ system ("cd $src && chmod u+x $editBoot");
++ system ("cd $src && bash --norc -c \"$editBoot
@opts\"");
++ }
+ }
+ }
+ #==========================================
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
