Hello community,
here is the log from the commit of package yast2-bootloader for openSUSE:Factory
checked in at Tue Aug 4 12:17:21 CEST 2009.
--------
--- yast2-bootloader/yast2-bootloader.changes 2009-07-27 16:53:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2009-07-31 11:58:54.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Jul 31 11:55:40 CEST 2009 - aschnell@suse.de
+
+- adapted to changes in yast2-storage
+- 2.18.12
+
+-------------------------------------------------------------------
+Tue Jul 28 13:21:34 CEST 2009 - juhliarik@suse.cz
+
+- added support for luks_root also to xen sections with kernel-xen
+
+-------------------------------------------------------------------
+Tue Jul 28 10:29:13 CEST 2009 - juhliarik@suse.cz
+
+- reorganize UI widgets in GRUB global options
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-bootloader-2.18.11.tar.bz2
New:
----
yast2-bootloader-2.18.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.Ejx9WV/_old 2009-08-04 12:16:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Ejx9WV/_new 2009-08-04 12:16:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.18.11)
+# spec file for package yast2-bootloader (Version 2.18.12)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,14 +19,14 @@
Name: yast2-bootloader
-Version: 2.18.11
+Version: 2.18.12
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.18.11.tar.bz2
+Source0: yast2-bootloader-2.18.12.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
-BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite
+BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage >= 2.18.18 yast2-testsuite
# to eliminate a cyclic dependency in autobuild:
#!BuildIgnore: autoyast2-installation
PreReq: /bin/sed %fillup_prereq
@@ -36,7 +36,7 @@
Requires: yast2-pkg-bindings >= 2.17.25
Requires: perl-Bootloader >= 0.5.0
Requires: yast2-core >= 2.18.7
-Requires: yast2-storage parted perl-Compress-Zlib limal-perl
+Requires: yast2-storage >= 2.18.18 parted perl-Compress-Zlib limal-perl
BuildRequires: yast2 >= 2.18.14
BuildRequires: yast2-packager >= 2.17.24
BuildRequires: yast2-pkg-bindings >= 2.17.25
@@ -61,7 +61,7 @@
This package contains the YaST2 component for bootloader configuration.
%prep
-%setup -n yast2-bootloader-2.18.11
+%setup -n yast2-bootloader-2.18.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -107,4 +107,5 @@
/usr/share/YaST2/scrconf/*.scr
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
+
%changelog
++++++ yast2-bootloader-2.18.11.tar.bz2 -> yast2-bootloader-2.18.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/VERSION new/yast2-bootloader-2.18.12/VERSION
--- old/yast2-bootloader-2.18.11/VERSION 2009-07-27 15:49:29.000000000 +0200
+++ new/yast2-bootloader-2.18.12/VERSION 2009-07-31 11:56:01.000000000 +0200
@@ -1 +1 @@
-2.18.11
+2.18.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/configure new/yast2-bootloader-2.18.12/configure
--- old/yast2-bootloader-2.18.11/configure 2009-07-08 16:56:57.000000000 +0200
+++ new/yast2-bootloader-2.18.12/configure 2009-07-31 11:58:24.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-bootloader 2.18.8.
+# Generated by GNU Autoconf 2.63 for yast2-bootloader 2.18.12.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-bootloader'
PACKAGE_TARNAME='yast2-bootloader'
-PACKAGE_VERSION='2.18.8'
-PACKAGE_STRING='yast2-bootloader 2.18.8'
+PACKAGE_VERSION='2.18.12'
+PACKAGE_STRING='yast2-bootloader 2.18.12'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1537,7 +1537,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-bootloader 2.18.8 to adapt to many kinds of systems.
+\`configure' configures yast2-bootloader 2.18.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1609,7 +1609,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-bootloader 2.18.8:";;
+ short | recursive ) echo "Configuration of yast2-bootloader 2.18.12:";;
esac
cat <<\_ACEOF
@@ -1719,7 +1719,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-bootloader configure 2.18.8
+yast2-bootloader configure 2.18.12
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1733,7 +1733,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-bootloader $as_me 2.18.8, which was
+It was created by yast2-bootloader $as_me 2.18.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2580,7 +2580,7 @@
# Define the identity of the package.
PACKAGE='yast2-bootloader'
- VERSION='2.18.8'
+ VERSION='2.18.12'
cat >>confdefs.h <<_ACEOF
@@ -2804,7 +2804,7 @@
-VERSION="2.18.8"
+VERSION="2.18.12"
RPMNAME="yast2-bootloader"
MAINTAINER="Jozef Uhliarik "
@@ -17247,7 +17247,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-bootloader $as_me 2.18.8, which was
+This file was extended by yast2-bootloader $as_me 2.18.12, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17310,7 +17310,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-bootloader config.status 2.18.8
+yast2-bootloader config.status 2.18.12
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/configure.in new/yast2-bootloader-2.18.12/configure.in
--- old/yast2-bootloader-2.18.11/configure.in 2009-07-08 16:56:37.000000000 +0200
+++ new/yast2-bootloader-2.18.12/configure.in 2009-07-31 11:58:15.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bootloader
dnl
-dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bootloader, 2.18.8, http://bugs.opensuse.org/, yast2-bootloader)
+AC_INIT(yast2-bootloader, 2.18.12, http://bugs.opensuse.org/, yast2-bootloader)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.8"
+VERSION="2.18.12"
RPMNAME="yast2-bootloader"
MAINTAINER="Jozef Uhliarik "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/clients/bootloader_preupdate.ycp new/yast2-bootloader-2.18.12/src/clients/bootloader_preupdate.ycp
--- old/yast2-bootloader-2.18.11/src/clients/bootloader_preupdate.ycp 2009-07-08 15:34:31.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/clients/bootloader_preupdate.ycp 2009-07-31 10:55:45.000000000 +0200
@@ -26,7 +26,7 @@
import "Mode";
import "Arch";
import "BootGRUB";
-import "Storage";
+import "StorageUpdate";
y2milestone ("starting bootloader_preupdate");
@@ -114,7 +114,7 @@
}
y2milestone("Calling storage update");
- Storage::Update (Installation::installedVersion, Installation::updateVersion);
+ StorageUpdate::Update (Installation::installedVersion, Installation::updateVersion);
}
if (ret == `back)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/grub/dialogs.ycp new/yast2-bootloader-2.18.12/src/grub/dialogs.ycp
--- old/yast2-bootloader-2.18.11/src/grub/dialogs.ycp 2009-04-07 14:27:12.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/grub/dialogs.ycp 2009-07-28 11:51:17.000000000 +0200
@@ -67,25 +67,31 @@
`HSpacing(2),
`VBox(
`Left("activate"),
- `Left("debug"),
`Left("generic_mbr"),
- `Left("trusted_grub"),
- `Left("hiddenmenu"),
+ `HBox(
+ `VBox(`Left("debug"),
+ `Left("hiddenmenu")
+ ),
+ `HSpacing(2),
+ `VBox(`Left("trusted_grub"),
+ `Left("acoustic_signals")
+ )
+ ),
`Left("gfxmenu"),
`Left(`HSquash("timeout"))
),
`HStretch()
)
),
- `VSpacing(1),
+ //`VSpacing(1),
`Left("password"),
- `VSpacing(1),
+ //`VSpacing(1),
`Left("console"),
`VStretch ()
),
`HSpacing (2));
- list<string> widget_names = ["activate","debug","generic_mbr",
+ list<string> widget_names = ["activate","debug","generic_mbr", "acoustic_signals",
"trusted_grub","hiddenmenu","gfxmenu","timeout", "console","password"];
string caption = _("Boot Loader Options");
return CWM::ShowAndRun ($[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/grub/helps.ycp new/yast2-bootloader-2.18.12/src/grub/helps.ycp
--- old/yast2-bootloader-2.18.11/src/grub/helps.ycp 2009-07-27 15:38:08.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/grub/helps.ycp 2009-07-27 17:59:49.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack
*
- * $Id: helps.ycp 57697 2009-06-23 08:46:19Z juhliarik $
+ * $Id: helps.ycp 58175 2009-07-27 14:52:21Z juhliarik $
*
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/grub/options.ycp new/yast2-bootloader-2.18.12/src/grub/options.ycp
--- old/yast2-bootloader-2.18.11/src/grub/options.ycp 2009-07-27 15:36:25.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/grub/options.ycp 2009-07-28 11:51:17.000000000 +0200
@@ -32,10 +32,6 @@
boolean value = BootCommon::globals["trusted_grub"]:"false" != "true";
UI::ChangeWidget(`id(`gfxinput),`Enabled, value);
UI::ChangeWidget(`id(`gfxinput),`Value,BootCommon::globals[widget]:"");
- if (GfxMenu::enable_sound_signals)
- UI::ChangeWidget(`id(`enable_acoustic_signals),`Value, true);
- else
- UI::ChangeWidget(`id(`enable_acoustic_signals),`Value, false);
}
void StoreGfx(string widget, map event){
@@ -45,8 +41,6 @@
} else {
BootCommon::global_options[widget] = result;
}
-
- GfxMenu::enable_sound_signals = (boolean) UI::QueryWidget(`id(`enable_acoustic_signals),`Value);
}
symbol HandleGfx(string widget, map event){
@@ -65,7 +59,7 @@
"widget" : `custom,
"custom_widget" :
`VBox(
- `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
+ //`Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
`HBox(`Left(`InputField(`id(`gfxinput),`opt(`hstretch), grub_descriptions["gfxmenu"]:"gfxmenu")),
`VBox(
`Left(`Label("")),
@@ -81,6 +75,28 @@
];
}
+
+void InitAcousticSignals(string widget){
+ if (GfxMenu::enable_sound_signals)
+ UI::ChangeWidget(`id(widget),`Value, true);
+ else
+ UI::ChangeWidget(`id(widget),`Value, false);
+}
+
+void StoreAcousticSignals(string widget, map event){
+ GfxMenu::enable_sound_signals = (boolean) UI::QueryWidget(`id(widget),`Value);
+}
+
+map AcousticSignals(){
+ return $[
+ "widget" : `checkbox,
+ "label" : _("Enable Acoustic &Signals"),
+ "init" : InitAcousticSignals,
+ "store" : StoreAcousticSignals,
+ "help" : grub_help_messages["enable_acoustic_signals"]:""
+ ];
+}
+
symbol HandleTrusted (string widget, map event){
boolean value = (boolean)UI::QueryWidget(`id(widget),`Value);
UI::ChangeWidget(`id(`gfxinput),`Enabled,!value);
@@ -205,10 +221,12 @@
`CheckBoxFrame (`id (`use_pas),
_("Prot&ect Boot Loader with Password"),true,
`HBox (
+ `HSpacing(2),
// text entry
- `Password (`id (`pw1), _("&Password")),
+ `Password (`id (`pw1), `opt(`hstretch), _("&Password")),
// text entry
- `Password (`id (`pw2), _("Re&type Password")),
+ `HSpacing(2),
+ `Password (`id (`pw2),`opt(`hstretch), _("Re&type Password")),
`HStretch()
)
)
@@ -303,6 +321,7 @@
"gfxmenu" : GfxWidget(),
"password" : PasswordWidget(),
"console" : ConsoleWidget(),
+ "acoustic_signals" : AcousticSignals(),
];
return (map >)union(grub_specific,CommonOptions());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/modules/BootGRUB.ycp new/yast2-bootloader-2.18.12/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.18.11/src/modules/BootGRUB.ycp 2009-07-27 15:16:37.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/modules/BootGRUB.ycp 2009-07-27 17:59:49.000000000 +0200
@@ -15,7 +15,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 58126 2009-07-22 11:39:44Z juhliarik $
+ * $Id: BootGRUB.ycp 58175 2009-07-27 14:52:21Z juhliarik $
*
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/modules/GfxMenu.ycp new/yast2-bootloader-2.18.12/src/modules/GfxMenu.ycp
--- old/yast2-bootloader-2.18.11/src/modules/GfxMenu.ycp 2009-07-27 15:29:32.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/modules/GfxMenu.ycp 2009-07-27 17:59:49.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: GfxMenu.ycp 53194 2008-11-12 11:41:14Z juhliarik $
+ * $Id: GfxMenu.ycp 58175 2009-07-27 14:52:21Z juhliarik $
*
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.18.11/src/routines/misc.ycp new/yast2-bootloader-2.18.12/src/routines/misc.ycp
--- old/yast2-bootloader-2.18.11/src/routines/misc.ycp 2009-07-24 17:05:52.000000000 +0200
+++ new/yast2-bootloader-2.18.12/src/routines/misc.ycp 2009-07-28 17:26:23.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 58153 2009-07-24 15:05:51Z juhliarik $
+ * $Id: misc.ycp 58189 2009-07-28 11:22:53Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -1862,7 +1862,7 @@
map updated_section = $[];
foreach ( map s, bl_sections,
{
- if (s["type"]:nil == "image")
+ if ((s["type"]:nil == "image") || (s["type"]:nil == "xen"))
{
updated_section = s;
updated_section["append"] = add_delete_luks_root(s,tm);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org