Mailinglist Archive: opensuse-commit (1500 mails)
| < Previous | Next > |
commit yast2-bootloader
- From: root@xxxxxxx (h_root)
- Date: Wed, 8 Nov 2006 18:36:14 +0100 (CET)
- Message-id: <20061108173614.16B037F561@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Nov 8 18:36:14 CET 2006.
--------
--- yast2-bootloader/yast2-bootloader.changes 2006-11-07 18:30:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-11-08 18:20:15.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Nov 8 18:16:57 CET 2006 - od@xxxxxxx
+
+- changed some comments
+- move global_options, section_options and exports (new
+ perl-Bootloader interface) to BootCommon.ycp
+- pass proposal for grub to new perl-Bootloader interface (#213256)
+- 2.13.84
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.13.83.tar.bz2
New:
----
yast2-bootloader-2.13.84.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.5Qh2L3/_old 2006-11-08 18:34:41.000000000 +0100
+++ /var/tmp/diff_new_pack.5Qh2L3/_new 2006-11-08 18:34:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.13.83)
+# spec file for package yast2-bootloader (Version 2.13.84)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-bootloader
-Version: 2.13.83
+Version: 2.13.84
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.13.83.tar.bz2
+Source0: yast2-bootloader-2.13.84.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
PreReq: /bin/sed %fillup_prereq
@@ -60,7 +60,7 @@
Dan Meszaros
%prep
-%setup -n yast2-bootloader-2.13.83
+%setup -n yast2-bootloader-2.13.84
%build
%{prefix}/bin/y2tool y2autoconf
@@ -112,6 +112,12 @@
/usr/share/YaST2/clients/bootfloppy.ycp
%changelog -n yast2-bootloader
+* Wed Nov 08 2006 - od@xxxxxxx
+- changed some comments
+- move global_options, section_options and exports (new
+ perl-Bootloader interface) to BootCommon.ycp
+- pass proposal for grub to new perl-Bootloader interface (#213256)
+- 2.13.84
* Tue Nov 07 2006 - od@xxxxxxx
- removed unused variable
- changed and added some documentation in comments
++++++ yast2-bootloader-2.13.83.tar.bz2 -> yast2-bootloader-2.13.84.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/VERSION new/yast2-bootloader-2.13.84/VERSION
--- old/yast2-bootloader-2.13.83/VERSION 2006-11-07 18:25:43.000000000 +0100
+++ new/yast2-bootloader-2.13.84/VERSION 2006-11-08 18:16:48.000000000 +0100
@@ -1 +1 @@
-2.13.83
+2.13.84
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/generic/boot_loader_locations_widget.ycp new/yast2-bootloader-2.13.84/src/generic/boot_loader_locations_widget.ycp
--- old/yast2-bootloader-2.13.83/src/generic/boot_loader_locations_widget.ycp 2006-11-07 18:25:35.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/generic/boot_loader_locations_widget.ycp 2006-11-08 18:16:25.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: boot_loader_locations_widget.ycp 34141 2006-11-07 17:25:32Z odabrunz $
+ * $Id: boot_loader_locations_widget.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -38,7 +38,7 @@
map<string,any> BLL_options () {
if ( _bll_options == nil)
{
- _bll_options = filter( string key, any value, global_options, {
+ _bll_options = filter( string key, any value, BootCommon::global_options, {
return substring(key,0,5) == "boot_";
});
@@ -94,7 +94,7 @@
map<string,any> genericBootLoaderLocationWidget () {
map<string,any> options = BLL_options();
- list<string> val = splitstring((string)global_options["boot"]:"", ":");
+ list<string> val = splitstring((string)BootCommon::global_options["boot"]:"", ":");
string boottype = val[0]:"select";
map<string, any> gt_map = $[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/generic/dialogs.ycp new/yast2-bootloader-2.13.84/src/generic/dialogs.ycp
--- old/yast2-bootloader-2.13.83/src/generic/dialogs.ycp 2006-11-07 18:25:36.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/generic/dialogs.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: dialogs.ycp 34141 2006-11-07 17:25:32Z odabrunz $
+ * $Id: dialogs.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -48,24 +48,24 @@
global void importMetaData() {
- exports = BootCommon::GetMetaData ();
+ BootCommon::exports = BootCommon::GetMetaData ();
// Extract type descriptions from exports
- foreach(string key, any value, exports, {
+ foreach(string key, any value, BootCommon::exports, {
if (substring (key, 0, 1) == "%") {
list<string> s = splitstring(key,"%");
string hash = s[1]:"";
key = substring(key, 2 + size(hash));
if (hash == "global_options") {
- global_options[key] = value;
+ BootCommon::global_options[key] = value;
}
else if (hash == "section_options") {
- section_options[key] = value;
+ BootCommon::section_options[key] = value;
}
else {
- if ( !haskey(exports, hash) ) exports[hash] = $[];
- exports[hash, key] = value;
+ if ( !haskey(BootCommon::exports, hash) ) BootCommon::exports[hash] = $[];
+ BootCommon::exports[hash, key] = value;
}
}
else if (substring (key, 0, 1) == "#") {
@@ -73,12 +73,12 @@
string array = s[1]:"";
key = substring(key, 2 + size(array));
- if ( ! haskey(exports, array) ) exports[array] = [];
- exports[array, tointeger(key)] = value;
+ if ( ! haskey(BootCommon::exports, array) ) BootCommon::exports[array] = [];
+ BootCommon::exports[array, tointeger(key)] = value;
}
});
// delete all encoded option tags from exports
- exports = filter (string key, any value, exports, {
+ BootCommon::exports = filter (string key, any value, BootCommon::exports, {
string s = substring (key, 0, 1);
return (s != "%" && s != "#");
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/generic/global_options_widget.ycp new/yast2-bootloader-2.13.84/src/generic/global_options_widget.ycp
--- old/yast2-bootloader-2.13.83/src/generic/global_options_widget.ycp 2006-11-07 18:22:55.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/generic/global_options_widget.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: global_options_widget.ycp 34113 2006-11-07 09:00:46Z jplack $
+ * $Id: global_options_widget.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -32,7 +32,7 @@
map<string,any> GOW_options () {
if ( _gow_options == nil)
{
- _gow_options = filter( string key, any value, global_options, {
+ _gow_options = filter( string key, any value, BootCommon::global_options, {
return key != "boot" && key != "default" && substring(key,0,5) != "boot_";
});
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/generic/section_edit_widgets.ycp new/yast2-bootloader-2.13.84/src/generic/section_edit_widgets.ycp
--- old/yast2-bootloader-2.13.83/src/generic/section_edit_widgets.ycp 2006-10-16 18:52:32.000000000 +0200
+++ new/yast2-bootloader-2.13.84/src/generic/section_edit_widgets.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -12,7 +12,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: section_edit_widgets.ycp 33293 2006-10-09 17:11:36Z jplack $
+ * $Id: section_edit_widgets.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -32,7 +32,7 @@
global list<string> section_types () {
list<string> st_list = [];
- foreach( string key, any value, section_options, {
+ foreach( string key, any value, BootCommon::section_options, {
if (substring(key,0,5) == "type_")
st_list = add (st_list, substring(key,5) );
@@ -48,7 +48,7 @@
se_options = mapmap(
string key, any value,
- filter( string key, any value, section_options,
+ filter( string key, any value, BootCommon::section_options,
``( substring(key, 0, size(type)+1) == type + "_")
),
``( $[ substring(key, size(type)+1) : value ] )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/generic/section_type_widget.ycp new/yast2-bootloader-2.13.84/src/generic/section_type_widget.ycp
--- old/yast2-bootloader-2.13.83/src/generic/section_type_widget.ycp 2006-10-16 18:52:32.000000000 +0200
+++ new/yast2-bootloader-2.13.84/src/generic/section_type_widget.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: section_type_widget.ycp 33293 2006-10-09 17:11:36Z jplack $
+ * $Id: section_type_widget.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -37,7 +37,7 @@
{
_st_options = (map<string,any>)union(
$[ "type_clone":"bool:Clone Selected Section" ],
- filter( string key, any value, section_options, {
+ filter( string key, any value, BootCommon::section_options, {
return substring(key,0,5) == "type_";
})
);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/modules/BootCommon.ycp new/yast2-bootloader-2.13.84/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.13.83/src/modules/BootCommon.ycp 2006-11-07 18:25:36.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/modules/BootCommon.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack <jplack@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: BootCommon.ycp 34141 2006-11-07 17:25:32Z odabrunz $
+ * $Id: BootCommon.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -37,6 +37,21 @@
// General bootloader settings
/**
+ * map of global options and types for new perl-Bootloader interface
+ */
+global map<string,any> global_options = $[];
+
+/**
+ * map of section options and types for new perl-Bootloader interface
+ */
+global map<string,any> section_options = $[];
+
+/**
+ * map of other exported information for new perl-Bootloader interface
+ */
+global map<string,any> exports = $[];
+
+/**
* map of global options and values
*/
global map<string,string> globals = $[];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/modules/BootGRUB.ycp new/yast2-bootloader-2.13.84/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.13.83/src/modules/BootGRUB.ycp 2006-11-07 18:25:36.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/modules/BootGRUB.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -13,7 +13,7 @@
* Jiri Srain <jsrain@xxxxxxx>
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: BootGRUB.ycp 34141 2006-11-07 17:25:32Z odabrunz $
+ * $Id: BootGRUB.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -53,21 +53,6 @@
global boolean backup_to_bootsector = true;
-/**
- * map of global options and types
- */
-global map<string,any> global_options = $[];
-
-/**
- * map of section options and types
- */
-global map<string,any> section_options = $[];
-
-/**
- * map of other exported information
- */
-global map<string,any> exports = $[];
-
// includes
include "bootloader/grub/misc.ycp";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.84/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.13.83/src/modules/BootPOWERLILO.ycp 2006-11-07 18:25:36.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/modules/BootPOWERLILO.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack <jplack@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: BootPOWERLILO.ycp 34141 2006-11-07 17:25:32Z odabrunz $
+ * $Id: BootPOWERLILO.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -82,22 +82,6 @@
global list table_items = [];
global string boot_device = "";
-/**
- * map of global options and types
- */
-global map<string,any> global_options = $[];
-
-/**
- * map of section options and types
- */
-global map<string,any> section_options = $[];
-
-/**
- * map of other exported information
- */
-global map<string,any> exports = $[];
-
-
string board_type = nil;
@@ -214,8 +198,8 @@
// Example:
// "select:PReP or FAT partition::/dev/sda1:/dev/sda3:/dev/sdb1:/dev/sdd1" ->
// "select:PReP or FAT partition:/dev/sda3:/dev/sda1:/dev/sda3:/dev/sdb1:/dev/sdd1"
- string old_description = global_options[itemname]:"";
- global_options[itemname] =
+ string old_description = BootCommon::global_options[itemname]:"";
+ BootCommon::global_options[itemname] =
regexpsub( old_description, "^([^:]*:[^:]*:).*$", "\\1") +
defaultvalue +
regexpsub( old_description, "^[^:]*:[^:]*:[^:]*(:.*)$", "\\1");
@@ -319,7 +303,7 @@
y2milestone("Root partition is %1", BootCommon::RootPartitionDevice);
*/
- string arch = exports["arch"]:"chrp";
+ string arch = BootCommon::exports["arch"]:"chrp";
if ( arch == "chrp" ) {
/* FIXME: remove this code (it was a simple proposal)
// FIXME: really detect the boot partition (instead of leaving this to
@@ -400,7 +384,7 @@
"timeout" : "80",
];
- string arch = exports["arch"]:"chrp";
+ string arch = BootCommon::exports["arch"]:"chrp";
map<string, string> boot_map = $[];
y2milestone("RootPartDevice is %1",BootCommon::RootPartitionDevice);
@@ -767,7 +751,7 @@
string boot_loader_locations =
mergestring(
filter( string bll,
- maplist( string key, any value, global_options, {
+ maplist( string key, any value, BootCommon::global_options, {
return (substring(key,0,5) == "boot_")
? BootCommon::globals[key]:"" : "";
}),
@@ -1082,3 +1066,4 @@
* fill-column: 78
* End:
*/
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/ppc/helps.ycp new/yast2-bootloader-2.13.84/src/ppc/helps.ycp
--- old/yast2-bootloader-2.13.83/src/ppc/helps.ycp 2006-10-16 18:52:30.000000000 +0200
+++ new/yast2-bootloader-2.13.84/src/ppc/helps.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack <jplack@xxxxxxx>
*
- * $Id: helps.ycp 33293 2006-10-09 17:11:36Z jplack $
+ * $Id: helps.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
@@ -47,7 +47,7 @@
global map<string,string> ppc_descriptions = $[
- "boot" : ( exports["$arch"]:"" == "iseries" )
+ "boot" : ( BootCommon::exports["$arch"]:"" == "iseries" )
? _("iSeries Boot Image Location")
: _("PPC Boot Loader Location"),
"activate" : _("Change Boot Device in NV-RAM"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/routines/i386.ycp new/yast2-bootloader-2.13.84/src/routines/i386.ycp
--- old/yast2-bootloader-2.13.83/src/routines/i386.ycp 2006-02-13 04:52:14.000000000 +0100
+++ new/yast2-bootloader-2.13.84/src/routines/i386.ycp 2006-11-08 18:16:26.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: i386.ycp 27748 2006-02-08 15:15:11Z jplack $
+ * $Id: i386.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
{
@@ -143,7 +143,7 @@
{
DetectDisks ();
del_parts = getPartitionList (`deleted);
- // check whether edd is loaded
+ // check whether edd is loaded; if not: load it
string lsmod_command = "lsmod | grep edd";
y2milestone ("Running command %1", lsmod_command);
map lsmod_out = (map)SCR::Execute (.target.bash_output, lsmod_command);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.83/src/routines/lilolike.ycp new/yast2-bootloader-2.13.84/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.13.83/src/routines/lilolike.ycp 2006-09-27 01:51:39.000000000 +0200
+++ new/yast2-bootloader-2.13.84/src/routines/lilolike.ycp 2006-11-08 18:16:27.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: lilolike.ycp 33155 2006-09-26 23:51:36Z odabrunz $
+ * $Id: lilolike.ycp 34177 2006-11-08 17:16:21Z odabrunz $
*
*/
{
@@ -196,6 +196,18 @@
selected_location = "mbr"; // default to mbr
loader_device = BootCommon::mbrDisk;
}
+
+ // pass down proposal to the variables of the new perl-Bootloader code
+ if ( loader_device == BootPartitionDevice ) {
+ global_options["boot_boot"] = true;
+ } else if ( loader_device == RootPartitionDevice ) {
+ global_options["boot_root"] = true;
+ } else if ( loader_device == BootCommon::mbrDisk ) {
+ global_options["boot_mbr"] = true;
+ } else {
+ global_options["boot_custom"] = [ loader_device ];
+ }
+
y2milestone ("ConfigureLocation (%1 on %2)",
selected_location, loader_device);
// set active flag
@@ -211,6 +223,9 @@
// if not installing to MBR, always activate
activate = true;
}
+
+ global_options["activate"] = activate;
+
return selected_location;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |