Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2015-02-06 10:21:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2015-01-21 21:52:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2015-02-06 10:21:45.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 4 13:56:13 UTC 2015 - [email protected] + +- initialize bootloader during update if proposed from scratch + (bnc#899743) +- 3.1.117 + +------------------------------------------------------------------- +Tue Feb 3 15:08:09 UTC 2015 - [email protected] + +- Use ttyAMA instead of ttyS on aarch64 +- 3.1.116 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.115.tar.bz2 New: ---- yast2-bootloader-3.1.117.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.THRRWj/_old 2015-02-06 10:21:46.000000000 +0100 +++ /var/tmp/diff_new_pack.THRRWj/_new 2015-02-06 10:21:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.115 +Version: 3.1.117 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.115.tar.bz2 -> yast2-bootloader-3.1.117.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.115/package/yast2-bootloader.changes new/yast2-bootloader-3.1.117/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.115/package/yast2-bootloader.changes 2015-01-20 13:12:11.000000000 +0100 +++ new/yast2-bootloader-3.1.117/package/yast2-bootloader.changes 2015-02-04 15:42:11.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed Feb 4 13:56:13 UTC 2015 - [email protected] + +- initialize bootloader during update if proposed from scratch + (bnc#899743) +- 3.1.117 + +------------------------------------------------------------------- +Tue Feb 3 15:08:09 UTC 2015 - [email protected] + +- Use ttyAMA instead of ttyS on aarch64 +- 3.1.116 + +------------------------------------------------------------------- Tue Jan 20 10:54:52 UTC 2015 - [email protected] - Use grub2-efi on aarch64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.115/package/yast2-bootloader.spec new/yast2-bootloader-3.1.117/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.115/package/yast2-bootloader.spec 2015-01-20 13:12:11.000000000 +0100 +++ new/yast2-bootloader-3.1.117/package/yast2-bootloader.spec 2015-02-04 15:42:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.115 +Version: 3.1.117 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.115/src/clients/inst_bootloader.rb new/yast2-bootloader-3.1.117/src/clients/inst_bootloader.rb --- old/yast2-bootloader-3.1.115/src/clients/inst_bootloader.rb 2015-01-20 13:12:11.000000000 +0100 +++ new/yast2-bootloader-3.1.117/src/clients/inst_bootloader.rb 2015-02-04 15:42:11.000000000 +0100 @@ -30,7 +30,9 @@ return :auto # don't execute this once more end - if Mode.installation + # if BL config is created from scratch, prepare config files + # in order not to touch old files (bnc#899743) + if Mode.installation || !BootCommon.was_read Bootloader.blSave(false, false, false) @files = BootCommon.GetFilesContents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.115/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.117/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.115/src/include/bootloader/routines/misc.rb 2015-01-20 13:12:11.000000000 +0100 +++ new/yast2-bootloader-3.1.117/src/include/bootloader/routines/misc.rb 2015-02-04 15:42:11.000000000 +0100 @@ -422,7 +422,11 @@ ret = "" if unit != "" && speed != "" # add number of serial console - ret = Ops.add("ttyS", unit) + if Arch.aarch64 + ret = Ops.add("ttyAMA", unit) + else + ret = Ops.add("ttyS", unit) + end # add speed ret = Ops.add(Ops.add(ret, ","), speed) if parity != "" @@ -507,7 +511,7 @@ args = Builtins.regexpsub(append, "^.*console=[[:alpha:]]+([[:digit:]]*,*[[:digit:]]*[noe]*[[:digit:]]*).*[[:space:]]*.*$", "\\1") Builtins.y2milestone("BuildSerialFromAppend: %1, %2", type, args) - return "" if type != "ttyS" || args.empty? + return "" if (type != "ttyS" && type != "ttyAMA") || args.empty? unit = Builtins.regexpsub(args, "([[:digit:]]+),*[[:digit:]]*[noe]*[[:digit:]]*", "\\1") return "" if unit == "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.115/src/lib/bootloader/proposal_client.rb new/yast2-bootloader-3.1.117/src/lib/bootloader/proposal_client.rb --- old/yast2-bootloader-3.1.115/src/lib/bootloader/proposal_client.rb 2015-01-20 13:12:11.000000000 +0100 +++ new/yast2-bootloader-3.1.117/src/lib/bootloader/proposal_client.rb 2015-02-04 15:42:11.000000000 +0100 @@ -122,6 +122,10 @@ Yast::Bootloader.blRead(true, true) Yast::BootCommon.was_read = true end + elsif old_bootloader == "none" + log.info "Bootloader not configured, do not repropose" + # blRead just exits for none bootloader + BootCommon.was_read = true elsif !Yast::BootCommon.was_proposed || force_reset # Repropose the type. A regular Reset/Propose is not enough. # For more details see bnc#872081 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.115/test/bootloader_proposal_client_test.rb new/yast2-bootloader-3.1.117/test/bootloader_proposal_client_test.rb --- old/yast2-bootloader-3.1.115/test/bootloader_proposal_client_test.rb 2015-01-20 13:12:11.000000000 +0100 +++ new/yast2-bootloader-3.1.117/test/bootloader_proposal_client_test.rb 2015-02-04 15:42:11.000000000 +0100 @@ -145,7 +145,7 @@ Yast.import "Mode" expect(Yast::Mode).to receive(:update).and_return(true) - expect(subject).to receive("old_bootloader").and_return("grub") + expect(subject).to receive("old_bootloader").and_return("grub").twice expect(Yast::BootCommon).to receive(:setLoaderType).with(nil) allow(Yast::BootCommon).to receive(:getLoaderType).and_return("grub2") @@ -155,6 +155,15 @@ subject.make_proposal({}) end + + it "do not propose during update if if old bootloader is none" do + Yast.import "Mode" + expect(Yast::Mode).to receive(:update).and_return(true) + + expect(subject).to receive("old_bootloader").and_return("none").twice + + subject.make_proposal({}) + end it "just read old configuration update if old bootloader is grub2" do Yast.import "Mode" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
