Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Fri Feb 5 14:21:49 CET 2010. -------- --- yast2-bootloader/yast2-bootloader.changes 2010-01-12 13:35:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-02-04 11:32:39.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Jan 28 16:08:30 CET 2010 - juhliarik@suse.cz + +- added commnets for using options in /etc/sysconfig/bootloader + (bnc#511319) +- 2.19.1 + +------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.19.0.tar.bz2 New: ---- yast2-bootloader-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.m6wXZH/_old 2010-02-05 14:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.m6wXZH/_new 2010-02-05 14:21:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.19.0) +# spec file for package yast2-bootloader (Version 2.19.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-bootloader -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.19.0.tar.bz2 +Source0: yast2-bootloader-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -61,7 +61,7 @@ This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.19.0 +%setup -n yast2-bootloader-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-bootloader-2.19.0.tar.bz2 -> yast2-bootloader-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default 2009-02-17 13:41:52.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default 2010-01-28 15:10:12.000000000 +0100 @@ -11,7 +11,6 @@ LOADER_TYPE="" - ## Path: System/Bootloader ## Description: Bootloader configuration ## Type: string @@ -22,3 +21,5 @@ # # LOADER_LOCATION="" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default~ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default~ --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default~ 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default~ 2010-01-28 15:10:12.000000000 +0100 @@ -0,0 +1,24 @@ +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +# +LOADER_TYPE="" + + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# Location of boot loader. +# For making the change effect run bootloader configuration tool +# +# +LOADER_LOCATION="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386 new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386 --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386 2009-02-17 13:41:52.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386 2010-02-02 16:53:46.000000000 +0100 @@ -21,4 +21,3 @@ # # LOADER_LOCATION="" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386~ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386~ --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386~ 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386~ 2010-02-02 16:53:46.000000000 +0100 @@ -0,0 +1,107 @@ +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: list(grub,lilo,none) +## Default: grub +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +# +LOADER_TYPE="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: list(floppy,mbr,root,boot,custom,none) +## Default: mbr +# +# Location of boot loader. +# For making the change effect run bootloader configuration tool +# +# +LOADER_LOCATION="" + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: "splash=silent quiet showotps" +# +# Arguments for kernel which is used like default boot section. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +# +DEFAULT_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# VGA option for kernel which is used like default boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +# +# * DEFAULT_VGA="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe" +# +# Argumets for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +# +# * FAILSAFE_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# VGA option for kernel which is used like failsafe boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +# +# * FAILSAFE_VGA="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: "splash=silent quiet showotps" +## Example: "resume=/dev/sda2 splash=silent quiet showotps" +# +# Argumets for XEN kernel in Dom0. +# If the options is commented perl-Bootloader uses his default arguments +# for XEN kernel. +# Note: "resume" is swap partition +# +# * XEN_KERNEL_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# Arguments for XEN hypervisor +# Usually it is empty or includes arguments like crashkernel for kdump etc. +# +# * XEN_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# VGA option for XEN kernel. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +# +# * XEN_VGA="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/src/routines/misc.ycp new/yast2-bootloader-2.19.1/src/routines/misc.ycp --- old/yast2-bootloader-2.19.0/src/routines/misc.ycp 2009-10-13 15:49:10.000000000 +0200 +++ new/yast2-bootloader-2.19.1/src/routines/misc.ycp 2010-02-03 18:40:24.000000000 +0100 @@ -38,6 +38,7 @@ import "Installation"; import "FileUtils"; import "String"; + import "FileUtils"; // bootloader attributes handling functions @@ -1337,6 +1338,65 @@ return ret; } +/** bnc#511319 Add information about /etc/sysconfig/bootloader to configuration file. + * Write option with value and comment to + * sysconfig file + * + * @param boolean true if called from client inst_bootloader + * @param path to config file (.sysconfig.bootloader) + * @param path option (.DEFAULT_APPEND) + * @param string value of otion + * @param string comment of option + * @return true on success + */ + +define boolean WriteOptionToSysconfig(boolean inst, path file_path, path option, string value, string comment) +{ + boolean ret = false; + + if ((!inst) &&(!FileUtils::Exists("/etc/sysconfig/bootloader"))) + { + y2milestone("Skip writting configuration to /etc/sysconfig/bootloader -> file missing"); + return ret; + } + path file_path_option = add (file_path, option); + boolean comment_exist = SCR::Read(add(file_path_option, .comment)) == nil; + + // write value of option + ret = SCR::Write(file_path_option, value); + + // write comment of option if it is necessary + if (!comment_exist ) + { + ret = ret && SCR::Write(add(file_path_option, .comment), comment); + } + SCR::Write(file_path, nil); + return ret; +} + +/** bnc#511319 Add information about /etc/sysconfig/bootloader to configuration file. + * Create /etc/sysconfig/bootloader it is configuration + * file for bootloader + * + * @param boolean true if it is called from client inst_bootlaoder + * @return boolean true on success + */ + +define boolean CreateBLSysconfigFile(boolean inst) +{ + if (inst) + { + if (!FileUtils::CheckAndCreatePath(Installation::destdir +"/etc/sysconfig")) + { + WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); + WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + } + //string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; + return true; + } + return true; +} + /** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader * Function write/update info in /etc/sysconfig/bootloader * @param booloean true if it called from inst_bootloader.ycp @@ -1439,35 +1499,229 @@ if (inst_bootloader) { - WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); - WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + sys_agent = add(.target, sys_agent); string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; - SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini( + SCR::RegisterAgent (sys_agent, `ag_ini( `SysConfigFile(target_sysconfig_path))); - sys_agent = add(.target, sys_agent); - } + CreateBLSysconfigFile(inst_bootloader); - SCR::Write (add(sys_agent,.LOADER_TYPE), lt); - SCR::Write (add(sys_agent,.DEFAULT_APPEND), default_append); - SCR::Write (add(sys_agent,.DEFAULT_VGA), default_vga); - SCR::Write (add(sys_agent,.FAILSAFE_APPEND), failsafe_append); - SCR::Write (add(sys_agent,.FAILSAFE_VGA), failsafe_vga); - SCR::Write (add(sys_agent,.XEN_KERNEL_APPEND), xen_kernel_append); - SCR::Write (add(sys_agent,.XEN_APPEND), xen_append); - SCR::Write (add(sys_agent,.XEN_VGA), xen_vga); - if (addon_name != "") - SCR::Write (add(sys_agent,.RT_NAME), addon_name); + string comment = ""; + comment= "\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tlist(grub,lilo,none) +## Default:\tgrub +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +#\n"; + if (!Arch::i386() && !Arch::x86_64()) + { + comment= "\n ## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +#\n"; + } + + WriteOptionToSysconfig(inst_bootloader, sys_agent, .LOADER_TYPE, lt, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"splash=silent quiet showotps\" +# +# Arguments for kernel which is used like default boot section. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; - if (addon_vga != "") - SCR::Write (add(sys_agent,.RT_VGA), addon_vga); + if (!Arch::i386() && !Arch::x86_64()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for kernel which is used like default boot section. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + + } + WriteOptionToSysconfig(inst_bootloader, sys_agent, .DEFAULT_APPEND, default_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for kernel which is used like default boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .DEFAULT_VGA, default_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe\" +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; - if (addon_append != "") - SCR::Write (add(sys_agent,.RT_APPEND), addon_append); + if (Arch::x86_64()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe\" +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; - SCR::Write (sys_agent, nil); + } + if (Arch::ia64()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"nohalt noresume powersaved=off x11failsafe\" +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + + } + + if (Arch::s390()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + + } + + WriteOptionToSysconfig(inst_bootloader, sys_agent, .FAILSAFE_APPEND, failsafe_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for kernel which is used like failsafe boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .FAILSAFE_VGA, failsafe_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"splash=silent quiet showotps\" +# +# Arguments for XEN kernel in Dom0. +# If the options is commented perl-Bootloader uses his default arguments +# for XEN kernel. +#\n"; + + if (Arch::ia64 ()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"splash=silent quiet\" +# +# Arguments for XEN kernel in Dom0. +# If the options is commented perl-Bootloader uses his default arguments +# for XEN kernel. +#\n"; + + } + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .XEN_KERNEL_APPEND, xen_kernel_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for XEN hypervisor +# Usually it is empty or includes arguments like crashkernel for kdump etc. +#\n"; + + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .XEN_APPEND, xen_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for XEN kernel. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .XEN_VGA, xen_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Title of RealTime kernel in bootloader configuration file. +#\n"; + if (addon_name != "") + WriteOptionToSysconfig(inst_bootloader, sys_agent, .RT_NAME, addon_name, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for RealTime kernel. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + if (addon_vga != "") + WriteOptionToSysconfig(inst_bootloader, sys_agent, .RT_VGA, addon_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for RealTime kernel. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + if (addon_append != "") + WriteOptionToSysconfig(inst_bootloader, sys_agent, .RT_APPEND, addon_append, comment); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/VERSION new/yast2-bootloader-2.19.1/VERSION --- old/yast2-bootloader-2.19.0/VERSION 2010-01-12 13:10:19.000000000 +0100 +++ new/yast2-bootloader-2.19.1/VERSION 2010-01-28 16:09:31.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org