Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Jul 18 13:49:11 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-07-15 17:00:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-07-18 11:57:29.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 18 11:41:58 CEST 2011 - [email protected] + +- do not try to run boot loader setup code when no boot loader exists + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.ToTbbG/_old 2011-07-18 13:48:50.000000000 +0200 +++ /var/tmp/diff_new_pack.ToTbbG/_new 2011-07-18 13:48:50.000000000 +0200 @@ -70,7 +70,7 @@ %endif Summary: OpenSuSE - KIWI Image System Version: 4.93.1 -Release: 1 +Release: 3 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 +++ new/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 @@ -1 +1 @@ -6f33406e6824b28c1038daf9e023dab8a227aea8 +ecdf521ada7a742a2366d145557bb6daaf3a96fc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2011-07-15 16:58:11.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2011-07-18 11:52:49.000000000 +0200 @@ -658,11 +658,16 @@ $attr, $checkmedia); - if(!$iso->callBootMethods()) { - $this->logMsg("W", "Creating boot methods failed, medium maybe not be bootable"); - } - else { - $this->logMsg("I", "Boot methods called successfully"); + # Just the first media is usually bootable at SUSE + my $is_bootable = 0; + if(-d "$this->{m_basesubdir}->{$cd}/boot") { + if(!$iso->callBootMethods()) { + $this->logMsg("W", "Creating boot methods failed, medium maybe not be bootable"); + } + else { + $this->logMsg("I", "Boot methods called successfully"); + $is_bootable = 1; + } } if(!$iso->createISO()) { $this->logMsg("E", "Cannot create Iso image"); @@ -671,19 +676,21 @@ else { $this->logMsg("I", "Created Iso image <$isoname>"); } - if (! $iso->relocateCatalog()) { - return 1; - } - if (! $iso->fixCatalog()) { - return 1; - } - if ($hybridmedia) { - if(!$iso->createHybrid()) { - $this->logMsg("E", "Isohybrid call failed"); + if ($is_bootable) { + if (! $iso->relocateCatalog()) { + return 1; + } + if (! $iso->fixCatalog()) { return 1; } - else { - $this->logMsg("I", "Isohybrid call successful"); + if ($hybridmedia) { + if(!$iso->createHybrid()) { + $this->logMsg("E", "Isohybrid call failed"); + return 1; + } + else { + $this->logMsg("I", "Isohybrid call successful"); + } } } if(!$iso->checkImage()) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
