Hello community,
here is the log from the commit of package
kiwi-instsource-plugins-openSUSE-12-1 for openSUSE:12.3 checked in at
2013-02-25 21:35:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/kiwi-instsource-plugins-openSUSE-12-1 (Old)
and /work/SRC/openSUSE:12.3/.kiwi-instsource-plugins-openSUSE-12-1.new
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-instsource-plugins-openSUSE-12-1", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:12.3/kiwi-instsource-plugins-openSUSE-12-1/kiwi-instsource-plugins-openSUSE-12-1.changes
2013-02-25 18:57:49.000000000 +0100
+++
/work/SRC/openSUSE:12.3/.kiwi-instsource-plugins-openSUSE-12-1.new/kiwi-instsource-plugins-openSUSE-12-1.changes
2013-02-25 21:35:20.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Feb 25 20:34:37 UTC 2013 - [email protected]
+
+- patch repo url into the uefi grub cfg (bnc#805234)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-instsource-plugins-openSUSE-12-1.diff ++++++
--- /var/tmp/diff_new_pack.KEaP5C/_old 2013-02-25 21:35:21.000000000 +0100
+++ /var/tmp/diff_new_pack.KEaP5C/_new 2013-02-25 21:35:21.000000000 +0100
@@ -265,7 +265,7 @@
===================================================================
--- /dev/null
+++ KIWIFinishEFIPlugin.pm
-@@ -0,0 +1,147 @@
+@@ -0,0 +1,144 @@
+################################################################
+# Copyright (c) 2012 SUSE
+#
@@ -396,10 +396,7 @@
+ %type = %{$this->collect()->{m_xml}->getImageTypeAndAttributes_legacy()};
+ my $firmware = $type{firmware};
+ if ($firmware eq "efi" || $firmware eq "uefi") {
-+ my $dir = $this->handler()->collect()->basedir();
-+ $dir .= "/".$this->{m_handler}->mediaName();
-+ $dir .= "/".$this->{m_requireddirs}->[0];
-+ $dir = $this->collect()->basesubdirs()->{$cd};
++ my $dir = $this->collect()->basesubdirs()->{$cd};
+
+ my $efi = "$dir/boot/x86_64/efi";
+ $this->logMsg("I", "creating $efi");
@@ -413,3 +410,45 @@
+
+1;
+
+Index: KIWIMiniIsoPlugin.pm
+===================================================================
+--- KIWIMiniIsoPlugin.pm.orig
++++ KIWIMiniIsoPlugin.pm
+@@ -41,6 +41,7 @@ use Data::Dumper;
+ use Config::IniFiles;
+ use File::Find;
+
++use KIWIQX qw (qxx);
+
+ sub new
+ {
+@@ -225,6 +226,29 @@ sub execute
+ close(F);
+ $retval++;
+ }
++
++ my $grubcfg = $this->collect()->basesubdirs()->{1} . "/EFI/BOOT/grub.cfg";
++ if ( -f $grubcfg ) {
++ $this->logMsg("I", "editing <$grubcfg>");
++ open(IN, $grubcfg) || die "oops";
++ open(OUT, ">", "$grubcfg.new") || die "can't open output";
++ while( <IN> ) {
++ my $line = $_;
++ chomp $line;
++ $this->logMsg("I", "-$line");
++ $line =~ s,(linuxefi /boot/x86_64/loader/linux),$1 install=$repoloc,;
++ $this->logMsg("I", "+$line");
++ print OUT "$line\n";
++ }
++ close(OUT);
++ close(IN);
++ qxx("diff -u $grubcfg $grubcfg.new");
++ rename("$grubcfg.new", $grubcfg);
++ } else {
++ $this->logMsg("I", "no grub.cfg at <$grubcfg>");
++ }
++
++
+ return $retval;
+ }
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
