Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-05-13 20:45: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-05-10 07:48:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-05-13 20:45:52.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 12 12:35:51 UTC 2014 - jreidinger@suse.com + +- extended sysconfig options only for grub1 to prevent confusion + (bnc#870890) +- 3.1.34 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.33.tar.bz2 New: ---- yast2-bootloader-3.1.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.EwKTe2/_old 2014-05-13 20:45:53.000000000 +0200 +++ /var/tmp/diff_new_pack.EwKTe2/_new 2014-05-13 20:45:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.33 +Version: 3.1.34 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.33.tar.bz2 -> yast2-bootloader-3.1.34.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/package/yast2-bootloader.changes new/yast2-bootloader-3.1.34/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.33/package/yast2-bootloader.changes 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/package/yast2-bootloader.changes 2014-05-12 14:58:45.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 12 12:35:51 UTC 2014 - jreidinger@suse.com + +- extended sysconfig options only for grub1 to prevent confusion + (bnc#870890) +- 3.1.34 + +------------------------------------------------------------------- Tue May 6 11:20:06 UTC 2014 - jreidinger@suse.com - reinit perl-bootloader library in update mode to force write diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/package/yast2-bootloader.spec new/yast2-bootloader-3.1.34/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.33/package/yast2-bootloader.spec 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/package/yast2-bootloader.spec 2014-05-12 14:58:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.33 +Version: 3.1.34 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/scripts/Makefile.am new/yast2-bootloader-3.1.34/scripts/Makefile.am --- old/yast2-bootloader-3.1.33/scripts/Makefile.am 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/scripts/Makefile.am 2014-05-12 14:58:45.000000000 +0200 @@ -2,7 +2,7 @@ # Makefile.am for y2m_inst/ycp/bootloader/milo/agents # -ybin_SCRIPTS = ppc_postinstall.sh update_gfxmenu tp_mbr +ybin_SCRIPTS = update_gfxmenu tp_mbr EXTRA_DIST = $(ybin_SCRIPTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/scripts/ppc_postinstall.sh new/yast2-bootloader-3.1.34/scripts/ppc_postinstall.sh --- old/yast2-bootloader-3.1.33/scripts/ppc_postinstall.sh 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/scripts/ppc_postinstall.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,91 +0,0 @@ -#!/bin/bash -# -# PPC YaST2 postinstall script -# - - -while read line; do - case "$line" in - *MacRISC*) MACHINE="mac";; - *CHRP*) MACHINE="chrp";; - *PReP*) MACHINE="prep" ;; - *iSeries*) MACHINE="iseries";; - esac -done < /proc/cpuinfo - -if [ "$MACHINE" = iseries ] ; then - for i in `fdisk -l | sed -e '/^\/.*PReP/s/[[:blank:]].*$//p;d'` - do - j=`echo $i | sed 's/\([0-9]\)/ \1/'` - /sbin/activate $j - done - - sed '/^.*mingetty.*$/d' /etc/inittab > /etc/inittab.tmp - diff /etc/inittab /etc/inittab.tmp &>/dev/null || mv -v /etc/inittab.tmp /etc/inittab - rm -f /etc/inittab.tmp - - #echo "1:12345:respawn:/bin/login console" >> /etc/inittab - cat >> /etc/inittab <<-EOF - - -# iSeries virtual console: -1:2345:respawn:/sbin/agetty -L 38400 console - -# to allow only root to log in on the console, use this: -# 1:2345:respawn:/sbin/sulogin /dev/console - -# to disable authentication on the console, use this: -# y:2345:respawn:/bin/bash - -EOF - - echo console >> /etc/securetty - - if grep -q tty10 /etc/syslog.conf; then - echo "changing syslog.conf" - sed '/.*tty10.*/d; /.*xconsole.*/d' /etc/syslog.conf > /etc/syslog.conf.tmp - diff /etc/syslog.conf /etc/syslog.conf.tmp &>/dev/null || mv -v /etc/syslog.conf.tmp /etc/syslog.conf - rm -f /etc/syslog.conf.tmp - fi - - { - echo "SuSE Linux on iSeries -- the spicy solution!" - echo "Have a lot of fun..." - } > /etc/motd -fi # iseries - - -# Regatta systems might have a HMC console (hvc) -if [[ $( /etc/inittab.tmp - diff /etc/inittab /etc/inittab.tmp &>/dev/null || mv -v /etc/inittab.tmp /etc/inittab - - cat >> /etc/inittab <<-EOF - - -# Regatta systems virtual console: -#V0:12345:respawn:/sbin/agetty -L 9600 hvc0 vt320 - -# to allow only root to log in on the console, use this: -# 1:2345:respawn:/sbin/sulogin /dev/console - -# to disable authentication on the console, use this: -# y:2345:respawn:/bin/bash - -EOF - echo "hvc0" >> /etc/securetty - echo "hvc/0" >> /etc/securetty - -fi -# p690 - - -# -# Local variables: -# mode: ksh -# ksh-indent: 4 -# ksh-multiline-offset: 2 -# ksh-if-re: "\\s *\\b\\(if\\)\\b[^=]" -# End: -# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/src/clients/bootloader_finish.rb new/yast2-bootloader-3.1.34/src/clients/bootloader_finish.rb --- old/yast2-bootloader-3.1.33/src/clients/bootloader_finish.rb 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/src/clients/bootloader_finish.rb 2014-05-12 14:58:45.000000000 +0200 @@ -103,7 +103,7 @@ @finish_ret = Convert.to_map(WFM.call(@reipl_client)) Builtins.y2milestone( "result of reipl_bootloader_finish [%1, %2]", - Ops.get_string(@finish_ret, "different", "N/A"), + Ops.get_boolean(@finish_ret, "different", true), Ops.get_string(@finish_ret, "ipl_msg", "N/A2") ) Builtins.y2milestone( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/src/include/bootloader/routines/misc.rb new/yast2-bootloader-3.1.34/src/include/bootloader/routines/misc.rb --- old/yast2-bootloader-3.1.33/src/include/bootloader/routines/misc.rb 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/src/include/bootloader/routines/misc.rb 2014-05-12 14:58:45.000000000 +0200 @@ -1183,7 +1183,74 @@ def WriteToSysconf(inst_bootloader) lt = getLoaderType(false) Builtins.y2milestone("Saving /etc/sysconfig/bootloader for %1", lt) + # save some sysconfig variables + # register new agent pointing into the mounted filesystem + sys_agent = path(".sysconfig.bootloader") + + if inst_bootloader + sys_agent = Builtins.add(path(".target"), sys_agent) + target_sysconfig_path = Ops.add( + Installation.destdir, + "/etc/sysconfig/bootloader" + ) + SCR.RegisterAgent( + sys_agent, + term(:ag_ini, term(:SysConfigFile, target_sysconfig_path)) + ) + end + CreateBLSysconfigFile(inst_bootloader) + + comment = "" + comment = "\n" + + "## Path:\tSystem/Bootloader\n" + + "## Description:\tBootloader configuration\n" + + "## Type:\tlist(grub,grub2,grub2-efi,none)\n" + + "## Default:\tgrub2\n" + + "#\n" + + "# Type of bootloader in use.\n" + + "# For making the change effect run bootloader configuration tool\n" + + "# and configure newly selected bootloader\n" + + "#\n" + + "#\n" + + WriteOptionToSysconfig( + inst_bootloader, + sys_agent, + path(".LOADER_TYPE"), + lt, + comment + ) + + comment = "\n" + + "## Path:\tSystem/Bootloader\n" + + "## Description:\tBootloader configuration\n" + + "## Type:\tyesno\n" + + "## Default:\t\"no\"\n" + + "#\n" + + "# Enable UEFI Secure Boot support\n" + + "# This setting is only relevant to UEFI which supports UEFI. It won't\n" + + "# take effect on any other firmware type.\n" + + "#\n" + + "#\n" + + sb = getSystemSecureBootStatus(false) ? "yes" : "no" + WriteOptionToSysconfig( + inst_bootloader, + sys_agent, + path(".SECURE_BOOT"), + sb, + comment + ) + + grub1_extended_sysconfig(sysagent) if lt == "grub" + + nil + end + # extended sysconfig options to be used only for grub1 as grub2 store it + # in its config (bnc#870890) + # @note remove when grub1 support will be removed + def grub1_extended_sysconfig(sysagent) default_boot_section_name = "" # fix for bnc #440125 - default boot section with failsafe args # it is not possible create exact algoritmus but I hope it helps in @@ -1262,77 +1329,6 @@ xen_vga = default_vga end - # save some sysconfig variables - # register new agent pointing into the mounted filesystem - sys_agent = path(".sysconfig.bootloader") - - if inst_bootloader - sys_agent = Builtins.add(path(".target"), sys_agent) - target_sysconfig_path = Ops.add( - Installation.destdir, - "/etc/sysconfig/bootloader" - ) - SCR.RegisterAgent( - sys_agent, - term(:ag_ini, term(:SysConfigFile, target_sysconfig_path)) - ) - end - CreateBLSysconfigFile(inst_bootloader) - - comment = "" - comment = "\n" + - "## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tlist(grub,grub2,grub2-efi,none)\n" + - "## Default:\tgrub2\n" + - "#\n" + - "# Type of bootloader in use.\n" + - "# For making the change effect run bootloader configuration tool\n" + - "# and configure newly selected bootloader\n" + - "#\n" + - "#\n" - if !Arch.i386 && !Arch.x86_64 - comment = "\n" + - " ## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tstring\n" + - "## Default:\tnone\n" + - "#\n" + - "# Type of bootloader in use.\n" + - "# For making the change effect run bootloader configuration tool\n" + - "# and configure newly selected bootloader\n" + - "#\n" + - "#\n" - end - - WriteOptionToSysconfig( - inst_bootloader, - sys_agent, - path(".LOADER_TYPE"), - lt, - comment - ) - - comment = "\n" + - "## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tyesno\n" + - "## Default:\t\"no\"\n" + - "#\n" + - "# Enable UEFI Secure Boot support\n" + - "# This setting is only relevant to UEFI which supports UEFI. It won't\n" + - "# take effect on any other firmware type.\n" + - "#\n" + - "#\n" - - sb = getSystemSecureBootStatus(false) ? "yes" : "no" - WriteOptionToSysconfig( - inst_bootloader, - sys_agent, - path(".SECURE_BOOT"), - sb, - comment - ) comment = "\n" + "## Path:\tSystem/Bootloader\n" + @@ -1345,18 +1341,6 @@ "# for kernel.\n" + "#\n" - if !Arch.i386 && !Arch.x86_64 - comment = "\n" + - "## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tstring\n" + - "## Default:\tnone\n" + - "#\n" + - "# Arguments for kernel which is used like default boot section.\n" + - "# If the options is commented perl-Bootloader uses his default arguments\n" + - "# for kernel.\n" + - "#\n" - end WriteOptionToSysconfig( inst_bootloader, sys_agent, @@ -1409,31 +1393,6 @@ "# for kernel.\n" + "#\n" end - if Arch.ia64 - comment = "\n" + - "## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tstring\n" + - "## Default:\t\"nohalt noresume powersaved=off x11failsafe\"\n" + - "#\n" + - "# Arguments for kernel which is used like failsafe boot section\n" + - "# If the options is commented perl-Bootloader uses his default arguments\n" + - "# for kernel.\n" + - "#\n" - end - - if Arch.s390 - comment = "\n" + - "## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tstring\n" + - "## Default:\tnone\n" + - "#\n" + - "# Arguments for kernel which is used like failsafe boot section\n" + - "# If the options is commented perl-Bootloader uses his default arguments\n" + - "# for kernel.\n" + - "#\n" - end WriteOptionToSysconfig( inst_bootloader, @@ -1454,15 +1413,13 @@ "# Empty option could be cause of broken size of fonts etc.\n" + "#\n" - if Arch.i386 || Arch.x86_64 || Arch.ia64 - WriteOptionToSysconfig( - inst_bootloader, - sys_agent, - path(".FAILSAFE_VGA"), - failsafe_vga, - comment - ) - end + WriteOptionToSysconfig( + inst_bootloader, + sys_agent, + path(".FAILSAFE_VGA"), + failsafe_vga, + comment + ) comment = "\n" + "## Path:\tSystem/Bootloader\n" + @@ -1475,28 +1432,13 @@ "# for XEN kernel.\n" + "#\n" - if Arch.ia64 - comment = "\n" + - "## Path:\tSystem/Bootloader\n" + - "## Description:\tBootloader configuration\n" + - "## Type:\tstring\n" + - "## Default:\t\"splash=silent quiet\"\n" + - "#\n" + - "# Arguments for XEN kernel in Dom0.\n" + - "# If the options is commented perl-Bootloader uses his default arguments\n" + - "# for XEN kernel.\n" + - "#\n" - end - - if Arch.i386 || Arch.x86_64 || Arch.ia64 - WriteOptionToSysconfig( - inst_bootloader, - sys_agent, - path(".XEN_KERNEL_APPEND"), - xen_kernel_append, - comment - ) - end + WriteOptionToSysconfig( + inst_bootloader, + sys_agent, + path(".XEN_KERNEL_APPEND"), + xen_kernel_append, + comment + ) comment = "\n" + "## Path:\tSystem/Bootloader\n" + @@ -1508,15 +1450,13 @@ "# Usually it is empty or includes arguments like crashkernel for kdump etc.\n" + "#\n" - if Arch.i386 || Arch.x86_64 || Arch.ia64 - WriteOptionToSysconfig( - inst_bootloader, - sys_agent, - path(".XEN_APPEND"), - xen_append, - comment - ) - end + WriteOptionToSysconfig( + inst_bootloader, + sys_agent, + path(".XEN_APPEND"), + xen_append, + comment + ) comment = "\n" + "## Path:\tSystem/Bootloader\n" + @@ -1528,15 +1468,13 @@ "# If the options is commented or empty perl-Bootloader doesn't use it.\n" + "# Empty option could be cause of broken size of fonts etc.\n" + "#\n" - if Arch.i386 || Arch.x86_64 || Arch.ia64 - WriteOptionToSysconfig( - inst_bootloader, - sys_agent, - path(".XEN_VGA"), - xen_vga, - comment - ) - end + WriteOptionToSysconfig( + inst_bootloader, + sys_agent, + path(".XEN_VGA"), + xen_vga, + comment + ) comment = "\n" + "## Path:\tSystem/Bootloader\n" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.33/y2_checkin.state new/yast2-bootloader-3.1.34/y2_checkin.state --- old/yast2-bootloader-3.1.33/y2_checkin.state 2014-05-06 13:43:51.000000000 +0200 +++ new/yast2-bootloader-3.1.34/y2_checkin.state 1970-01-01 01:00:00.000000000 +0100 @@ -1,158 +0,0 @@ -# y2_checkin statefile format 1.0 -# records the merge state and history for merging changes from other branches -# to the branch of the current working directory -# URLs of other branches and the highest revisions we have looked at -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader 22587 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 26031 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41125 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 37794 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 - -# revisions seen: -# -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader 21937 21967 22006 22037 22040 22055 22100 22113 22239 22285 22312 22318 22488 22587 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 25537 25727 26031 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader 41091 41092 41125 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 31627 31731 33390 34876 35236 35340 35342 35344 35347 35356 35413 35417 35650 35829 35850 35916 35917 35999 36005 36006 36027 36059 36143 36175 36768 36888 36889 36890 36900 36960 36961 36964 37091 37172 37196 37377 37430 37448 37451 37616 37672 37673 37674 37675 37676 37677 37678 37761 37762 37794 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41157 - -# revisions postponed: -# -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader - -# source: -# merge states of the revisions -MERGE_STATE[21937]='not_merged' -MERGE_STATE[21967]='not_merged' -MERGE_STATE[22006]='not_merged' -MERGE_STATE[22037]='not_merged' -MERGE_STATE[22040]='not_merged' -MERGE_STATE[22055]='not_merged' -MERGE_STATE[22100]='not_merged' -MERGE_STATE[22113]='not_merged' -MERGE_STATE[22239]='not_merged' -MERGE_STATE[22285]='not_merged' -MERGE_STATE[22312]='not_merged' -MERGE_STATE[22318]='not_merged' -MERGE_STATE[22488]='not_merged' -MERGE_STATE[22587]='not_merged' -MERGE_STATE[25537]='not_merged' -MERGE_STATE[25727]='not_merged' -MERGE_STATE[26031]='not_merged' -MERGE_STATE[30669]='not_merged' -MERGE_STATE[31508]='not_merged' -MERGE_STATE[31536]='not_merged' -MERGE_STATE[31598]='not_merged' -MERGE_STATE[31627]='already_merged' -MERGE_STATE[31728]='not_merged' -MERGE_STATE[31731]='already_merged' -MERGE_STATE[31732]='not_merged' -MERGE_STATE[33390]='already_merged' -MERGE_STATE[34622]='not_merged' -MERGE_STATE[34876]='already_merged' -MERGE_STATE[35236]='already_merged' -MERGE_STATE[35340]='already_merged' -MERGE_STATE[35342]='already_merged' -MERGE_STATE[35344]='already_merged' -MERGE_STATE[35347]='already_merged' -MERGE_STATE[35356]='already_merged' -MERGE_STATE[35413]='already_merged' -MERGE_STATE[35417]='already_merged' -MERGE_STATE[35650]='merged' -MERGE_STATE[35829]='already_merged' -MERGE_STATE[35850]='already_merged' -MERGE_STATE[35916]='merged' -MERGE_STATE[35917]='already_merged' -MERGE_STATE[35999]='merged' -MERGE_STATE[36005]='already_merged' -MERGE_STATE[36006]='already_merged' -MERGE_STATE[36027]='merged' -MERGE_STATE[36059]='merged' -MERGE_STATE[36143]='already_merged' -MERGE_STATE[36175]='already_merged' -MERGE_STATE[36768]='already_merged' -MERGE_STATE[36888]='merged' -MERGE_STATE[36889]='merged' -MERGE_STATE[36890]='merged' -MERGE_STATE[36900]='merged' -MERGE_STATE[36960]='merged' -MERGE_STATE[36961]='merged' -MERGE_STATE[36964]='merged' -MERGE_STATE[37091]='merged' -MERGE_STATE[37172]='merged' -MERGE_STATE[37196]='merged' -MERGE_STATE[37377]='already_merged' -MERGE_STATE[37430]='merged' -MERGE_STATE[37448]='merged' -MERGE_STATE[37451]='merged' -MERGE_STATE[37616]='merged' -MERGE_STATE[37672]='merged' -MERGE_STATE[37673]='merged' -MERGE_STATE[37674]='merged' -MERGE_STATE[37675]='merged' -MERGE_STATE[37676]='merged' -MERGE_STATE[37677]='merged' -MERGE_STATE[37678]='merged' -MERGE_STATE[37761]='merged' -MERGE_STATE[37762]='merged' -MERGE_STATE[37794]='merged' -MERGE_STATE[41091]='not_merged' -MERGE_STATE[41092]='not_merged' -MERGE_STATE[41125]='not_merged' -MERGE_STATE[41157]='already_merged' - -# comments for postponed / not merged revisions -REV_COMMENT[41091]='This is change #41092 on branch http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader. ------------------------------------------------------------------------- -r41091 | odabrunz | 2007-09-25 19:35:47 +0200 (Tue, 25 Sep 2007) | 4 lines -Changed paths: - M /branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp - -- re-read bootloader config from system after the delayed run of - perl-Bootloader updates, then call FlagOnetimeBoot() based on - current setup (#328078) - ------------------------------------------------------------------------- -r41092 | odabrunz | 2007-09-25 19:49:07 +0200 (Tue, 25 Sep 2007) | 2 lines -Changed paths: - M /branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state - -- updated merge state - ------------------------------------------------------------------------- -These changes are not merged to branch http://svn.opensuse.org/svn/yast/trunk/bootloader, -because - - they were previously merged from the current branch' -REV_COMMENT[41092]='This is change #41092 on branch http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_3-Branch/bootloader. ------------------------------------------------------------------------- -r41091 | odabrunz | 2007-09-25 19:35:47 +0200 (Tue, 25 Sep 2007) | 4 lines -Changed paths: - M /branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp - -- re-read bootloader config from system after the delayed run of - perl-Bootloader updates, then call FlagOnetimeBoot() based on - current setup (#328078) - ------------------------------------------------------------------------- -r41092 | odabrunz | 2007-09-25 19:49:07 +0200 (Tue, 25 Sep 2007) | 2 lines -Changed paths: - M /branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state - -- updated merge state - ------------------------------------------------------------------------- -These changes are not merged to branch http://svn.opensuse.org/svn/yast/trunk/bootloader, -because - - they were previously merged from the current branch' -REV_COMMENT[41125]=' - these were previously merged from the current branch' - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org