Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-03-21 12:13:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-03-05 15:36:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-03-21 12:14:05.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Mar 12 09:15:33 UTC 2014 - [email protected] + +- fix grub2-*-efi package not installed (bnc#867380) +- 3.1.13 + +------------------------------------------------------------------- +Mon Mar 10 12:07:17 UTC 2014 - [email protected] + +- do not crash if there is no swap partition (bnc#867435) +- 3.1.12 + +------------------------------------------------------------------- +Mon Mar 10 08:30:40 UTC 2014 - [email protected] + +- fix some serial console issues (bnc#862388) (bnc#866710) +- 3.1.11 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.10.tar.bz2 New: ---- yast2-bootloader-3.1.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.jrAthU/_old 2014-03-21 12:14:06.000000000 +0100 +++ /var/tmp/diff_new_pack.jrAthU/_new 2014-03-21 12:14:06.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.10 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.10.tar.bz2 -> yast2-bootloader-3.1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/.yardopts new/yast2-bootloader-3.1.13/.yardopts --- old/yast2-bootloader-3.1.10/.yardopts 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-3.1.13/.yardopts 2014-03-14 11:28:10.000000000 +0100 @@ -0,0 +1 @@ +--no-private --markup markdown --protected src/**/*.rb --readme README.md --output-dir ./doc/autodocs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/package/yast2-bootloader.changes new/yast2-bootloader-3.1.13/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.10/package/yast2-bootloader.changes 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/package/yast2-bootloader.changes 2014-03-14 11:28:10.000000000 +0100 @@ -1,4 +1,22 @@ ------------------------------------------------------------------- +Wed Mar 12 09:15:33 UTC 2014 - [email protected] + +- fix grub2-*-efi package not installed (bnc#867380) +- 3.1.13 + +------------------------------------------------------------------- +Mon Mar 10 12:07:17 UTC 2014 - [email protected] + +- do not crash if there is no swap partition (bnc#867435) +- 3.1.12 + +------------------------------------------------------------------- +Mon Mar 10 08:30:40 UTC 2014 - [email protected] + +- fix some serial console issues (bnc#862388) (bnc#866710) +- 3.1.11 + +------------------------------------------------------------------- Wed Mar 5 10:02:23 CET 2014 - [email protected] - always allow grub2 (bnc #866863) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/package/yast2-bootloader.spec new/yast2-bootloader-3.1.13/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.10/package/yast2-bootloader.spec 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/package/yast2-bootloader.spec 2014-03-14 11:28:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.10 +Version: 3.1.13 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.13/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.10/src/include/bootloader/routines/misc.rb 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/src/include/bootloader/routines/misc.rb 2014-03-14 11:28:10.000000000 +0100 @@ -2036,6 +2036,46 @@ ret end + # This function gets bootloader's serial settings from append (bnc#862388) + def GetSerialFromAppend () + append = @globals["append"] || "" + type = Builtins.regexpsub(append, "^.*console=([[:alpha:]]+)[[:digit:]]+,*[[:digit:]]*[noe]*[[:digit:]]*.*[[:space:]]*.*$", "\\1") + 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? + + unit = Builtins.regexpsub(args, "([[:digit:]]+),*[[:digit:]]*[noe]*[[:digit:]]*", "\\1") + return "" if unit == "" + + ret = "serial --unit=#{unit}" + + speed = Builtins.regexpsub(args, "[[:digit:]]+,*([[:digit:]]*)[noe]*[[:digit:]]*", "\\1") + speed = "9600" if speed.empty? + ret << " --speed=#{speed}" + + parity = Builtins.regexpsub(args, "[[:digit:]]+,*[[:digit:]]*([noe]*)[[:digit:]]*", "\\1") + case parity + when "n" + ret << " --parity=no" + when "o" + ret << " --parity=odd" + when "e" + ret << " --parity=even" + when "" + # no parity, do nothing + else + raise "unknown parity flag #{parity}" + end + + word = Builtins.regexpsub(args, "[[:digit:]]+,*[[:digit:]]*[noe]*([[:digit:]]*)", "\\1") + if !word.empty? + ret << " --word=#{word}" + end + + ret + end + # FATE #110038: Serial console # Add console arg for kernel if there is defined serial console # - add key console with value to section type image and xen @@ -2092,6 +2132,23 @@ # - add key console with value to section type image and xen def HandleConsole2 + + if @globals["terminal"] != "serial" + # if bootloader is not set to serial console, we should leave the + # kernel append as is to allow it's serial console be enabled + # for debugging output and so on (bnc#866710) + return + end + + if !@globals["serial"] || @globals["serial"].empty? + # http://www.gnu.org/software/grub/manual/grub.html#serial + # https://www.kernel.org/doc/Documentation/serial-console.txt + # default settings is the same, we should at least tell kernel the + # port (aka unit) to use and grub2 defaults to 0. + # speed is also required by builkConsoleValue + @globals["serial"] = "serial --unit=0 --speed=9600" + end + console_value = getConsoleValue if Ops.get(@globals, "append") != nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/src/lib/bootloader/grub2base.rb new/yast2-bootloader-3.1.13/src/lib/bootloader/grub2base.rb --- old/yast2-bootloader-3.1.10/src/lib/bootloader/grub2base.rb 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/src/lib/bootloader/grub2base.rb 2014-03-14 11:28:10.000000000 +0100 @@ -101,7 +101,7 @@ BootCommon.globals.merge! StandardGlobals() swap_parts = BootCommon.getSwapPartitions - largest_swap_part = swap_parts.max_by{|part, size| size}.first || "" + largest_swap_part = (swap_parts.max_by{|part, size| size} || [""]).first resume = BootArch.ResumeAvailable ? largest_swap_part : "" # try to use label or udev id for device name... FATE #302219 @@ -114,6 +114,14 @@ BootCommon.globals["distributor"] = Product.name BootCommon.kernelCmdLine = Kernel.GetCmdLine + # Propose bootloader serial settings from kernel cmdline during install (bnc#862388) + serial = BootCommon.GetSerialFromAppend + + if !serial.empty? + BootCommon.globals["terminal"] = "serial" + BootCommon.globals["serial"] = serial + end + Builtins.y2milestone("Proposed globals: %1", BootCommon.globals) nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/src/modules/BootCommon.rb new/yast2-bootloader-3.1.13/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.10/src/modules/BootCommon.rb 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/src/modules/BootCommon.rb 2014-03-14 11:28:10.000000000 +0100 @@ -1292,6 +1292,7 @@ publish :function => :getBootDisk, :type => "string ()" publish :function => :HandleConsole, :type => "void ()" publish :function => :HandleConsole2, :type => "void ()" + publish :function => :GetSerialFromAppend, :type => "void ()" publish :function => :UpdateProposalFromClient, :type => "boolean ()" publish :function => :DiskOrderSummary, :type => "string ()" publish :function => :DisksChanged, :type => "boolean ()" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/src/modules/BootGRUB2EFI.rb new/yast2-bootloader-3.1.13/src/modules/BootGRUB2EFI.rb --- old/yast2-bootloader-3.1.10/src/modules/BootGRUB2EFI.rb 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/src/modules/BootGRUB2EFI.rb 2014-03-14 11:28:10.000000000 +0100 @@ -101,11 +101,20 @@ # Constructor def BootGRUB2EFI + + if Arch.i386 + packages = ["grub2-i386-efi"] + elsif Arch.x86_64 + packages = ["grub2-x86_64-efi", "shim"] + else + raise "no grub packages for EFI available for this architecture" + end + Ops.set( BootCommon.bootloader_attribs, "grub2-efi", { - "required_packages" => ["grub2-efi", "shim"], + "required_packages" => packages, "loader_name" => "GRUB2-EFI", "initializer" => fun_ref(method(:Initializer), "void ()") } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.10/src/modules/Bootloader.rb new/yast2-bootloader-3.1.13/src/modules/Bootloader.rb --- old/yast2-bootloader-3.1.10/src/modules/Bootloader.rb 2014-03-05 10:08:45.000000000 +0100 +++ new/yast2-bootloader-3.1.13/src/modules/Bootloader.rb 2014-03-14 11:53:06.000000000 +0100 @@ -1587,10 +1587,10 @@ cmd_enable_se = "pam-config -a --selinux 2>/dev/null" cmd_disable_aa = "pam-config -d --apparmor 2>/dev/null" - out = Convert.to_map(SCR.Execute(path(".target.bash"), cmd_disable_aa)) + out = SCR.Execute(path(".target.bash_output"), cmd_disable_aa) Builtins.y2debug("result of disabling the AppArmor PAM module is %1", out) - out = Convert.to_map(SCR.Execute(path(".target.bash"), cmd_enable_se)) + out = SCR.Execute(path(".target.bash_output"), cmd_enable) Builtins.y2debug("result of enabling the SELinux PAM module is %1", out) nil @@ -1599,10 +1599,10 @@ cmd_disable_se = "pam-config -d --selinux 2>/dev/null" cmd_enable_aa = "pam-config -a --apparmor 2>/dev/null" - out = Convert.to_map(SCR.Execute(path(".target.bash"), cmd_disable_se)) + out = SCR.Execute(path(".target.bash_output"), cmd_disable_se) Builtins.y2debug("result of disabling the SELinux PAM module is %1", out) - out = Convert.to_map(SCR.Execute(path(".target.bash"), cmd_enable_aa)) + out = SCR.Execute(path(".target.bash_output"), cmd_enable_aa) Builtins.y2debug("result of enabling the AppArmor PAM module is %1", out) nil -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
