Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2013-02-21 10:38:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2013-02-18 13:48:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2013-02-21 10:38:04.000000000 +0100 @@ -1,0 +2,50 @@ +Wed Feb 20 17:07:11 CET 2013 - [email protected] + +- v5.04.50 released + +------------------------------------------------------------------- +Wed Feb 20 16:51:09 CET 2013 - [email protected] + +- make sure GRUB_TERMINAL is set in etc/default grub to make + yast bootloader happy. if yast can't find this setting it + switches to 'console' which deactivates the graphical grub2 + console (bnc #804725) + +------------------------------------------------------------------- +Wed Feb 20 15:25:00 CET 2013 - [email protected] + +- v5.04.49 released + +------------------------------------------------------------------- +Wed Feb 20 14:45:38 CET 2013 - [email protected] + +- fix product media creation for non-x86_64 when EFI + boot support is enabled (bnc #804428) + +------------------------------------------------------------------- +Wed Feb 20 11:21:31 CET 2013 - [email protected] + +- v5.04.48 released + +------------------------------------------------------------------- +Wed Feb 20 10:59:55 CET 2013 - [email protected] + +- added missing setup of etc/sysconfig/bootloader setup for grub2 +- fixed possible duplicate entries for quiet and splash= in + etc/default/grub + +------------------------------------------------------------------- +Tue Feb 19 17:12:35 CET 2013 - [email protected] + +- v5.04.47 released + +------------------------------------------------------------------- +Tue Feb 19 17:01:02 CET 2013 - [email protected] + +- KIWIISOLinux fixes: + + added addBootEFILive magic block creation to the source + media KIWICollect code too + + extend magic block lookup in findAndCopyMagicBlock() + from 2 to 8 files and from 4 to 8 blocks (bnc #804428) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.5Docap/_old 2013-02-21 10:38:07.000000000 +0100 +++ /var/tmp/diff_new_pack.5Docap/_new 2013-02-21 10:38:07.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.46 +Version: 5.04.50 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100 +++ new/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100 @@ -1 +1 @@ -a7cd6879743694b1b8d5e034140f76a5ebf8c433 +c98440d365e2f768d35028d60277cf0124354c2c 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 2013-02-18 11:07:44.000000000 +0100 +++ new/kiwi/modules/KIWICollect.pm 2013-02-20 15:28:05.000000000 +0100 @@ -767,6 +767,10 @@ $this->logMsg('W', $msg); } else { + if (grep {"x86_64" eq $_} $this->{m_archlist}->headList()) { + $this->logMsg('I', "Add EFI Live setup"); + $iso -> addBootEFILive(1); + } $this->logMsg('I', "Boot methods called successfully"); $is_bootable = 1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2013-02-18 11:07:44.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-02-20 17:07:36.000000000 +0100 @@ -931,7 +931,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.46"; + $data{Version} = "5.04.50"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2013-02-18 11:07:44.000000000 +0100 +++ new/kiwi/modules/KIWIIsoLinux.pm 2013-02-19 17:13:09.000000000 +0100 @@ -396,7 +396,7 @@ #========================================== # add end-of-header marker #------------------------------------------ - qxx ("echo $magicID >> $tmpdir/glump"); + qxx ("echo $magicID > $tmpdir/glump"); qxx ("echo $tmpdir/glump 1000000 >> $sort"); #========================================== # update parameter list @@ -732,9 +732,9 @@ my $files = $this -> isols(); found: for (@{$files}) { next unless $_->{type} eq ' '; - last if $cnt++ >= 2; # check only the first 2 files + last if $cnt++ >= 8; # check only the first 8 files my $buf; - for (my $i = 0; $i >= -4; $i--) { # go back up to 4 blocks + for (my $i = 0; $i >= -8; $i--) { # go back up to 8 blocks seek $iso_fd, ($_->{start} + $i) << 11, 0; sysread $iso_fd, $buf, length $magicID; $start = $_->{start} + $i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2013-02-18 11:07:44.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2013-02-20 17:07:36.000000000 +0100 @@ -2515,6 +2515,12 @@ elif [ -e /dev/hvc0 ];then cmdline="$cmdline console=hvc console=tty" fi + if [[ ! $cmdline =~ quiet ]];then + cmdline="$cmdline quiet" + fi + if [[ ! $cmdline =~ splash= ]];then + cmdline="$cmdline splash=silent" + fi #====================================== # check for boot TIMEOUT #-------------------------------------- @@ -2531,8 +2537,9 @@ GRUB_HIDDEN_TIMEOUT=0 GRUB_HIDDEN_TIMEOUT_QUIET=true GRUB_TIMEOUT=$timeout - GRUB_CMDLINE_LINUX_DEFAULT="$cmdline quiet splash=silent" + GRUB_CMDLINE_LINUX_DEFAULT="$cmdline" GRUB_CMDLINE_LINUX="" + GRUB_TERMINAL=gfxterm EOF #====================================== # write vesa vga setup @@ -2549,6 +2556,15 @@ echo "GRUB_THEME=\"$theme\"" >> $inst_default_grub echo "GRUB_BACKGROUND=\"$bgpng\"" >> $inst_default_grub fi + #====================================== + # create sysconfig/bootloader + #-------------------------------------- + mkdir -p $destsPrefix/etc/sysconfig + local sysb=$destsPrefix/etc/sysconfig/bootloader + echo "LOADER_TYPE=\"grub2\"" > $sysb + echo "LOADER_LOCATION=\"mbr\"" >> $sysb + echo "DEFAULT_APPEND=\"$cmdline\"" >> $sysb + echo "FAILSAFE_APPEND=\"$failsafe $cmdline\"" >> $sysb } #====================================== # setupBootLoaderYaboot -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
