Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Wed Nov 8 23:38:28 CET 2006.
--------
--- yast2-bootloader/yast2-bootloader.changes 2006-11-08 18:20:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-11-08 21:02:42.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Nov 8 20:49:52 CET 2006 - od@suse.de
+
+- moved change_widget_default_value() to BootCommon.ycp
+- use change_widget_default_value() to work around "select" widget
+ default value bug
+- logging variables filled by grub proposal
+- using correct variable (globals) for new perl-Bootloader
+ interface (#213256)
+- 2.13.85
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.13.84.tar.bz2
New:
----
yast2-bootloader-2.13.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.r6fESf/_old 2006-11-08 23:37:56.000000000 +0100
+++ /var/tmp/diff_new_pack.r6fESf/_new 2006-11-08 23:37:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.13.84)
+# spec file for package yast2-bootloader (Version 2.13.85)
#
# 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.84
+Version: 2.13.85
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.13.84.tar.bz2
+Source0: yast2-bootloader-2.13.85.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.84
+%setup -n yast2-bootloader-2.13.85
%build
%{prefix}/bin/y2tool y2autoconf
@@ -113,6 +113,14 @@
%changelog -n yast2-bootloader
* Wed Nov 08 2006 - od@suse.de
+- moved change_widget_default_value() to BootCommon.ycp
+- use change_widget_default_value() to work around "select" widget
+ default value bug
+- logging variables filled by grub proposal
+- using correct variable (globals) for new perl-Bootloader
+ interface (#213256)
+- 2.13.85
+* Wed Nov 08 2006 - od@suse.de
- changed some comments
- move global_options, section_options and exports (new
perl-Bootloader interface) to BootCommon.ycp
++++++ yast2-bootloader-2.13.84.tar.bz2 -> yast2-bootloader-2.13.85.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.84/VERSION new/yast2-bootloader-2.13.85/VERSION
--- old/yast2-bootloader-2.13.84/VERSION 2006-11-08 18:16:48.000000000 +0100
+++ new/yast2-bootloader-2.13.85/VERSION 2006-11-08 20:56:38.000000000 +0100
@@ -1 +1 @@
-2.13.84
+2.13.85
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.84/src/modules/BootCommon.ycp new/yast2-bootloader-2.13.85/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.13.84/src/modules/BootCommon.ycp 2006-11-08 18:16:26.000000000 +0100
+++ new/yast2-bootloader-2.13.85/src/modules/BootCommon.ycp 2006-11-08 20:49:17.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootCommon.ycp 34177 2006-11-08 17:16:21Z odabrunz $
+ * $Id: BootCommon.ycp 34185 2006-11-08 19:49:14Z odabrunz $
*
*/
@@ -310,6 +310,29 @@
global define list<string> Summary ();
global define boolean UsingXenPae();
+
+//
+// FIXME: the select and selectdevice seem to be broken: the default value of
+// the widget description string needs to be patched with the current value of
+// the widget
+//
+global void change_widget_default_value (string itemname, string defaultvalue) {
+ // Put defaultvalue as default value into widget description item like
+ // "boot_{chrp,prep,iseries,...}_custom" or "boot_custom".
+ // Examples:
+ // "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"
+ //
+ // "selectdevice:Custom Boot Partition::/dev/sda3" ->
+ // "selectdevice:Custom Boot Partition:/dev/sda3:/dev/sda3"
+ string old_description = global_options[itemname]:"";
+ global_options[itemname] =
+ regexpsub( old_description, "^([^:]*:[^:]*:).*$", "\\1") +
+ defaultvalue +
+ regexpsub( old_description, "^[^:]*:[^:]*:[^:]*(:.*)$", "\\1");
+}
+
+
/*
* help message and dscription definitions
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.84/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.85/src/modules/BootPOWERLILO.ycp
--- old/yast2-bootloader-2.13.84/src/modules/BootPOWERLILO.ycp 2006-11-08 18:16:26.000000000 +0100
+++ new/yast2-bootloader-2.13.85/src/modules/BootPOWERLILO.ycp 2006-11-08 20:49:17.000000000 +0100
@@ -15,7 +15,7 @@
* Joachim Plack
* Olaf Dabrunz
*
- * $Id: BootPOWERLILO.ycp 34177 2006-11-08 17:16:21Z odabrunz $
+ * $Id: BootPOWERLILO.ycp 34185 2006-11-08 19:49:14Z odabrunz $
*
*/
@@ -192,20 +192,6 @@
return ret;
}
-void change_widget_default_value (string itemname, string defaultvalue) {
- // Put defaultvalue as default value into widget description item like
- // "boot_{chrp,prep,iseries,...}_custom".
- // 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 = BootCommon::global_options[itemname]:"";
- BootCommon::global_options[itemname] =
- regexpsub( old_description, "^([^:]*:[^:]*:).*$", "\\1") +
- defaultvalue +
- regexpsub( old_description, "^[^:]*:[^:]*:[^:]*(:.*)$", "\\1");
-}
-
-
/**
* Choose a boot partition on pmac
* type == Apple_HFS|Apple_Bootstrap && size < 20 cyl
@@ -316,19 +302,19 @@
*/
BootCommon::BootPartitionDevice = prep_boot_partition;
// also set as default value in widget
- change_widget_default_value("boot_chrp_custom", prep_boot_partition);
+ BootCommon::change_widget_default_value("boot_chrp_custom", prep_boot_partition);
}
else if ( arch == "prep" ) {
BootCommon::BootPartitionDevice = prep_boot_partition;
- change_widget_default_value("boot_prep_custom", prep_boot_partition);
+ BootCommon::change_widget_default_value("boot_prep_custom", prep_boot_partition);
}
else if ( arch == "iseries" ) {
BootCommon::BootPartitionDevice = prep_boot_partition;
- change_widget_default_value("boot_iseries_custom", prep_boot_partition);
+ BootCommon::change_widget_default_value("boot_iseries_custom", prep_boot_partition);
}
else if ( arch == "pmac" ) {
BootCommon::BootPartitionDevice = GoodPmacBootPartition();
- change_widget_default_value("boot_pmac_custom", BootCommon::BootPartitionDevice);
+ BootCommon::change_widget_default_value("boot_pmac_custom", BootCommon::BootPartitionDevice);
}
// These need to be set, for POWERLILO probably only to interface with
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.84/src/routines/lilolike.ycp new/yast2-bootloader-2.13.85/src/routines/lilolike.ycp
--- old/yast2-bootloader-2.13.84/src/routines/lilolike.ycp 2006-11-08 18:16:27.000000000 +0100
+++ new/yast2-bootloader-2.13.85/src/routines/lilolike.ycp 2006-11-08 20:49:17.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: lilolike.ycp 34177 2006-11-08 17:16:21Z odabrunz $
+ * $Id: lilolike.ycp 34185 2006-11-08 19:49:14Z odabrunz $
*
*/
{
@@ -197,19 +197,33 @@
loader_device = BootCommon::mbrDisk;
}
+ y2milestone ("ConfigureLocation (%1 on %2)",
+ selected_location, loader_device);
+
// pass down proposal to the variables of the new perl-Bootloader code
+ globals["boot_boot"] = sformat("%1", false);
+ globals["boot_root"] = sformat("%1", false);
+ globals["boot_mbr"] = sformat("%1", false);
+ globals = filter(string k, string v,
+ globals, ``("boot_custom" != k)
+ );
+ change_widget_default_value("boot_custom", "");
+
if ( loader_device == BootPartitionDevice ) {
- global_options["boot_boot"] = true;
+ globals["boot_boot"] = sformat("%1", true);
} else if ( loader_device == RootPartitionDevice ) {
- global_options["boot_root"] = true;
+ globals["boot_root"] = sformat("%1", true);
} else if ( loader_device == BootCommon::mbrDisk ) {
- global_options["boot_mbr"] = true;
+ globals["boot_mbr"] = sformat("%1", true);
} else {
- global_options["boot_custom"] = [ loader_device ];
+ globals["boot_custom"] = loader_device;
+ change_widget_default_value("boot_custom", loader_device);
}
- y2milestone ("ConfigureLocation (%1 on %2)",
- selected_location, loader_device);
+ y2milestone ("ConfigureLocation boot_boot=%1 boot_root=%2 boot_mbr=%3 boot_custom=%4)",
+ globals["boot_boot"]:"", globals["boot_root"]:"",
+ globals["boot_mbr"]:"", globals["boot_custom"]:"");
+
// set active flag
if (selected_location == "mbr")
{
@@ -224,7 +238,8 @@
activate = true;
}
- global_options["activate"] = activate;
+ globals["activate"] = sformat("%1", activate);
+ y2milestone ("ConfigureLocation activate=%1", activate);
return selected_location;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org