Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-02-16 09:10:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-31 11:51:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-02-16 09:10:51.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Feb 12 10:18:39 UTC 2014 - [email protected] + +- rephrase bootloader proposal on summary screen (BNC#853058) +- 3.1.5 + +------------------------------------------------------------------- +Mon Feb 10 10:56:36 CET 2014 - [email protected] + +- don't ask to run yast.ssh in second stage as there's no second stage + anymore (bnc 861537) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.4.tar.bz2 New: ---- yast2-bootloader-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.NIt57q/_old 2014-02-16 09:10:52.000000000 +0100 +++ /var/tmp/diff_new_pack.NIt57q/_new 2014-02-16 09:10:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.4.tar.bz2 -> yast2-bootloader-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/package/yast2-bootloader.changes new/yast2-bootloader-3.1.5/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.4/package/yast2-bootloader.changes 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/package/yast2-bootloader.changes 2014-02-12 17:28:04.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Feb 12 10:18:39 UTC 2014 - [email protected] + +- rephrase bootloader proposal on summary screen (BNC#853058) +- 3.1.5 + +------------------------------------------------------------------- +Mon Feb 10 10:56:36 CET 2014 - [email protected] + +- don't ask to run yast.ssh in second stage as there's no second stage + anymore (bnc 861537) + +------------------------------------------------------------------- Tue Jan 28 09:56:33 UTC 2014 - [email protected] - Fix examining MBR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/package/yast2-bootloader.spec new/yast2-bootloader-3.1.5/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.4/package/yast2-bootloader.spec 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/package/yast2-bootloader.spec 2014-02-12 17:28:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/clients/bootloader_finish.rb new/yast2-bootloader-3.1.5/src/clients/bootloader_finish.rb --- old/yast2-bootloader-3.1.4/src/clients/bootloader_finish.rb 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/src/clients/bootloader_finish.rb 2014-02-12 17:28:04.000000000 +0100 @@ -127,53 +127,23 @@ @ipl_msg = "" @ipl_msg = Ops.get_string(@finish_ret, "ipl_msg", "") - # SSH modification - @usessh_msg = "" - if Linuxrc.usessh - # TRANSLATORS: part of the reboot message - #/ %1 is replaced with a command name - # (message ID#SSH) - @usessh_msg = Builtins.sformat( - _("Then reconnect and run the following:\n%1\n"), - "yast.ssh" - ) - end - # TRANSLATORS: reboot message # %1 is replaced with additional message from reIPL - # %2 is replaced with additional message when using SSH - # See message ID#SSH Misc.boot_msg = Builtins.sformat( _( "\n" + - "Your system will now shut down.%1%2\n" + + "Your system will now shut down.%1\n" + "For details, read the related chapter \n" + "in the documentation. \n" ), - @ipl_msg, - @usessh_msg + @ipl_msg ) else - if Linuxrc.usessh && !Linuxrc.vnc - # Final message after all packages from CD1 are installed - # and we're ready to start (boot into) the installed system - # Message that will be displayed along with information - # how the boot loader was installed - Misc.boot_msg = Builtins.sformat( - _( - "The system will reboot now.\n" + - "After reboot, reconnect and run the following:\n" + - "%1" - ), - "yast.ssh" - ) - else - # Final message after all packages from CD1 are installed - # and we're ready to start (boot into) the installed system - # Message that will be displayed along with information - # how the boot loader was installed - Misc.boot_msg = _("The system will reboot now...") - end + # Final message after all packages from CD1 are installed + # and we're ready to start (boot into) the installed system + # Message that will be displayed along with information + # how the boot loader was installed + Misc.boot_msg = _("The system will reboot now...") end #-------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/include/bootloader/routines/popups.rb new/yast2-bootloader-3.1.5/src/include/bootloader/routines/popups.rb --- old/yast2-bootloader-3.1.4/src/include/bootloader/routines/popups.rb 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/src/include/bootloader/routines/popups.rb 2014-02-12 17:28:04.000000000 +0100 @@ -151,8 +151,10 @@ # @param [String] reason text stating why the location should be re-proposed # @return [Boolean] yes if shall be reset def askLocationResetPopup(reason) - # yes-no popup Popup.YesNo( + # Confirmation box with yes-no popup. %1 is reason why we need to set + # default location. It is translated on caller side and it is complete + # sentence. Builtins.sformat(_("%1Set default boot loader location?\n"), reason) ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/include/bootloader/routines/section_helps.rb new/yast2-bootloader-3.1.5/src/include/bootloader/routines/section_helps.rb --- old/yast2-bootloader-3.1.4/src/include/bootloader/routines/section_helps.rb 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/src/include/bootloader/routines/section_helps.rb 2014-02-12 17:28:04.000000000 +0100 @@ -63,7 +63,7 @@ "type_menu" => _("<p><b>Menu Section</b></p>"), "menu_root" => _("<p><b>Partition of Menu File</b></p>"), "configfile" => _( - "<p><b>Menu Description File<b> specifies path on root device from which is loaded menu file.</p>" + "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>" ), "remap" => _( "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.5/src/modules/BootGRUB.rb --- old/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/src/modules/BootGRUB.rb 2014-02-12 17:28:04.000000000 +0100 @@ -658,98 +658,48 @@ # def urlLocationSummary Builtins.y2milestone("Prepare url summary for GRUB") - ret = "" - line = "" locations = [] line = "<ul>\n<li>" - if Ops.get(BootCommon.globals, "boot_mbr", "") == "true" - line = Ops.add( - Ops.add( - line, - _( - "Boot from MBR is enabled (<a href=\"disable_boot_mbr\">disable</a>" - ) - ), - ")</li>\n" + if BootCommon.globals["boot_mbr"] == "true" + line << _( + "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)" ) else - line = Ops.add( - Ops.add( - line, - _( - "Boot from MBR is disabled (<a href=\"enable_boot_mbr\">enable</a>" - ) - ), - ")</li>\n" + line << _( + "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)" ) end - locations = Builtins.add(locations, line) - line = "<li>" + line << "</li>\n" + locations << line - set_boot_boot = false - if Ops.get(BootCommon.globals, "boot_boot", "") == "true" && - BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice - set_boot_boot = true - line = Ops.add( - Ops.add( - line, - _( - "Boot from /boot partition is enabled (<a href=\"disable_boot_boot\">disable</a>" - ) - ), - ")</li></ul>" - ) - elsif Ops.get(BootCommon.globals, "boot_boot", "") == "false" && - BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice - set_boot_boot = true - line = Ops.add( - Ops.add( - line, - _( - "Boot from /boot partition is disabled (<a href=\"enable_boot_boot\">enable</a>" - ) - ), - ")</li></ul>" - ) - end - if line != "<li>" - locations = Builtins.add(locations, line) - line = "<li>" - end - if Ops.get(BootCommon.globals, "boot_root", "") == "true" && - !set_boot_boot - line = Ops.add( - Ops.add( - line, - _( - "Boot from \"/\" partition is enabled (<a href=\"disable_boot_root\">disable</a>" - ) - ), - ")</li></ul>" - ) - elsif Ops.get(BootCommon.globals, "boot_root", "") == "false" && - !set_boot_boot - line = Ops.add( - Ops.add( - line, - _( - "Boot from \"/\" partition is disabled (<a href=\"enable_boot_root\">enable</a>" - ) - ), - ")</li></ul>" - ) - end - locations = Builtins.add(locations, line) if !set_boot_boot + line = "<li>" - if Ops.greater_than(Builtins.size(locations), 0) - # FIXME: should we translate all devices to names and add MBR suffixes? - ret = Builtins.sformat( - _("Change Location: %1"), - Builtins.mergestring(locations, " ") - ) + # check for separated boot partition, use root otherwise + if BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice + if BootCommon.globals["boot_boot"] == "true" + line << _( + "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)" + ) + else + line << _( + "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)" + ) + end + else + if BootCommon.globals["boot_root"] == "true" + line << _( + "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)" + ) + else + line << _( + "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">do not install</a>" + ) + end end + line << "</li></ul>" + locations << line - ret + return _("Change Location: %s") % locations.join(" ") end # Display bootloader summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.5/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb 2014-01-30 14:13:00.000000000 +0100 +++ new/yast2-bootloader-3.1.5/src/modules/BootGRUB2.rb 2014-02-12 17:28:04.000000000 +0100 @@ -228,99 +228,50 @@ # # def urlLocationSummary - Builtins.y2milestone("Prepare url summary for GRUB") - ret = "" - line = "" + Builtins.y2milestone("Prepare url summary for GRUB2") + # FIXME identical code in BootGRUB module locations = [] line = "<ul>\n<li>" - if Ops.get(BootCommon.globals, "boot_mbr", "") == "true" - line = Ops.add( - Ops.add( - line, - _( - "Boot from MBR is enabled (<a href=\"disable_boot_mbr\">disable</a>" - ) - ), - ")</li>\n" + if BootCommon.globals["boot_mbr"] == "true" + line << _( + "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)" ) else - line = Ops.add( - Ops.add( - line, - _( - "Boot from MBR is disabled (<a href=\"enable_boot_mbr\">enable</a>" - ) - ), - ")</li>\n" + line << _( + "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)" ) end - locations = Builtins.add(locations, line) - line = "<li>" + line << "</li>\n" + locations << line - set_boot_boot = false - if Ops.get(BootCommon.globals, "boot_boot", "") == "true" && - BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice - set_boot_boot = true - line = Ops.add( - Ops.add( - line, - _( - "Boot from /boot partition is enabled (<a href=\"disable_boot_boot\">disable</a>" - ) - ), - ")</li></ul>" - ) - elsif Ops.get(BootCommon.globals, "boot_boot", "") == "false" && - BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice - set_boot_boot = true - line = Ops.add( - Ops.add( - line, - _( - "Boot from /boot partition is disabled (<a href=\"enable_boot_boot\">enable</a>" - ) - ), - ")</li></ul>" - ) - end - if line != "<li>" - locations = Builtins.add(locations, line) - line = "<li>" - end - if Ops.get(BootCommon.globals, "boot_root", "") == "true" && - !set_boot_boot - line = Ops.add( - Ops.add( - line, - _( - "Boot from \"/\" partition is enabled (<a href=\"disable_boot_root\">disable</a>" - ) - ), - ")</li></ul>" - ) - elsif Ops.get(BootCommon.globals, "boot_root", "") == "false" && - !set_boot_boot - line = Ops.add( - Ops.add( - line, - _( - "Boot from \"/\" partition is disabled (<a href=\"enable_boot_root\">enable</a>" - ) - ), - ")</li></ul>" - ) - end - locations = Builtins.add(locations, line) if !set_boot_boot + line = "<li>" - if Ops.greater_than(Builtins.size(locations), 0) - # FIXME: should we translate all devices to names and add MBR suffixes? - ret = Builtins.sformat( - _("Change Location: %1"), - Builtins.mergestring(locations, " ") - ) + # check for separated boot partition, use root otherwise + if BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice + if BootCommon.globals["boot_boot"] == "true" + line << _( + "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)" + ) + else + line << _( + "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)" + ) + end + else + if BootCommon.globals["boot_root"] == "true" + line << _( + "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)" + ) + else + line << _( + "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">do not install</a>" + ) + end end + line << "</li></ul>" + locations << line - ret + return _("Change Location: %s") % locations.join(" ") end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
