Mailinglist Archive: opensuse-commit (1192 mails)

< Previous Next >
commit yast2-bootloader
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 06 Aug 2008 01:59:52 +0200
  • Message-id: <20080805235952.91626678178@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-bootloader
checked in at Wed Aug 6 01:59:52 CEST 2008.


--------
--- yast2-bootloader/yast2-bootloader.changes 2008-08-04 14:04:20.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes
2008-08-05 12:45:33.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 5 12:05:04 CEST 2008 - juhliarik@xxxxxxx
+
+- added/enabled support for ordering disks in device.map for GRUB
+ (fate ##303964)
+- 2.17.9
+
+-------------------------------------------------------------------



Old:
----
yast2-bootloader-2.17.8.tar.bz2

New:
----
yast2-bootloader-2.17.9.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.S18878/_old 2008-08-06 01:59:47.000000000 +0200
+++ /var/tmp/diff_new_pack.S18878/_new 2008-08-06 01:59:47.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-bootloader (Version 2.17.8)
+# spec file for package yast2-bootloader (Version 2.17.9)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

@@ -12,12 +19,12 @@


Name: yast2-bootloader
-Version: 2.17.8
+Version: 2.17.9
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.8.tar.bz2
+Source0: yast2-bootloader-2.17.9.tar.bz2
Prefix: /usr
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
# to eliminate a cyclic dependency in autobuild:
@@ -54,7 +61,7 @@
Daniel Fiser

%prep
-%setup -n yast2-bootloader-2.17.8
+%setup -n yast2-bootloader-2.17.9

%build
%{prefix}/bin/y2tool y2autoconf
@@ -99,6 +106,10 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Tue Aug 05 2008 juhliarik@xxxxxxx
+- added/enabled support for ordering disks in device.map for GRUB
+ (fate ##303964)
+- 2.17.9
* Mon Aug 04 2008 juhliarik@xxxxxxx
- added support for reducing devices from device.map to 8 devices
(fate #303548)

++++++ yast2-bootloader-2.17.8.tar.bz2 -> yast2-bootloader-2.17.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-bootloader-2.17.8/src/generic/device_map_edit_widget.ycp
new/yast2-bootloader-2.17.9/src/generic/device_map_edit_widget.ycp
--- old/yast2-bootloader-2.17.8/src/generic/device_map_edit_widget.ycp
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-bootloader-2.17.9/src/generic/device_map_edit_widget.ycp
2008-08-05 10:34:33.000000000 +0200
@@ -0,0 +1,184 @@
+/**
+ * File:
+ * include/bootloader/routines/dialogs.ycp
+ *
+ * Module:
+ * Bootloader installation and configuration
+ *
+ * Summary:
+ * Dialogs for configuraion i386-specific functions
+ *
+ * Authors:
+ * Jiri Srain <jsrain@xxxxxxx>
+ *
+ * $Id: dialogs_i386.ycp 47885 2008-05-26 16:34:24Z juhliarik $
+ *
+ */
+
+
+{
+textdomain "bootloader";
+
+
+import "Label";
+import "Wizard";
+import "CWM";
+import "BootCommon";
+import "Stage";
+
+include "bootloader/routines/helps_i386.ycp";
+
+
+/**
+ * Run dialog to adjust installation on i386 and AMD64
+ * @return symbol for wizard sequencer
+ */
+symbol i386InstallDetailsDialog () {
+ term contents = `HBox (`HStretch (), `VBox (
+ `VStretch (),
+ // frame
+ `Frame (_("Disk Order"),
+ `HBox (`HSpacing (2), `VBox (
+ `VSpacing (1),
+ `SelectionBox (`id (`disks),
+ `opt (`notify, `immediate),
+ // selectionn box label
+ _("D&isks"), []),
+ Mode::config ()
+ ? `HBox (
+ `HStretch (),
+ `PushButton (`id (`add), `opt (`key_F3),
Label::AddButton ()),
+ `PushButton (`id (`delete), `opt(`key_F5),
Label::DeleteButton ()),
+ `HStretch ()
+ )
+ : `HBox (),
+ `VSpacing (1)
+ ),
+ `HSquash (
+ `VBox (
+ `VStretch (),
+ `PushButton (`id (`up), `opt (`hstretch), _("&Up")),
+ `PushButton (`id (`down), `opt (`hstretch), _("&Down")),
+ `VStretch ()
+ )
+ ),
+ `HSpacing (2)
+ )
+ ),
+ `VStretch ()
+
+ ), `HStretch ());
+
+ Wizard::SetContentsButtons (
+ // dialog caption
+ _("Boot Loader Device Map"),
+ contents,
+ i386DeviceMapEditHelp(),
+ Label::BackButton (),
+ Label::OKButton ());
+
+ list<string> disks_order = BootCommon::DisksOrder ();
+
+ UI::ChangeWidget (`id (`disks), `Items, disks_order);
+ UI::ChangeWidget (`id (`disks), `CurrentItem, disks_order[0]:"");
+
+ any ret = nil;
+ while (ret == nil)
+ {
+ string current = (string)UI::QueryWidget (`id (`disks), `CurrentItem);
+ integer pos = 0;
+ while (pos < size (disks_order) && disks_order[pos]:"" != current)
+ pos = pos + 1;
+ UI::ChangeWidget (`id (`up), `Enabled,
+ pos > 0 && pos < size (disks_order));
+ UI::ChangeWidget (`id (`down), `Enabled, pos < size (disks_order) - 1);
+
+ ret = UI::UserInput ();
+ boolean order_changed = false;
+
+ if (ret == `add)
+ {
+ term popup = `VBox (`VSpacing (1),
+ // textentry header
+ `InputField (`id (`devname), `opt (`hstretch), _("&Device")),
+ `VSpacing (1),
+ `HBox (`HStretch (),
+ `PushButton (`id (`ok), `opt (`key_F10, `default),
+ Label::OKButton ()),
+ `HStretch (),
+ `PushButton (`id (`cancel), `opt (`key_F8),
+ Label::CancelButton ()),
+ `HStretch ()
+ ),
+ `VSpacing (1)
+ );
+ UI::OpenDialog (popup);
+ symbol pushed = (symbol)UI::UserInput ();
+ string new_dev = (string)
+ UI::QueryWidget (`id (`devname), `Value);
+ UI::CloseDialog ();
+ if (pushed == `ok)
+ {
+ disks_order = add (disks_order, new_dev);
+ order_changed = true;
+ current = new_dev;
+ }
+ }
+ else if (ret == `delete)
+ {
+ disks_order = filter (string d, disks_order, {
+ return d != current;
+ });
+ order_changed = true;
+ current = disks_order[0]:nil;
+ }
+ else if (ret == `up)
+ {
+ disks_order = (list<string>)
+ BootCommon::swapItems (disks_order, pos, pos - 1);
+ order_changed = true;
+ }
+ else if (ret == `down)
+ {
+ disks_order = (list<string>)
+ BootCommon::swapItems (disks_order, pos, pos + 1);
+ order_changed = true;
+ }
+
+ if (ret == `cancel)
+ ret = `abort;
+ if (ret != `next && ret != `abort && ret != `back)
+ {
+ if (order_changed)
+ {
+ UI::ChangeWidget (`id (`disks), `Items, disks_order);
+ UI::ChangeWidget (`id (`disks), `CurrentItem, current);
+ }
+ ret = nil;
+ }
+ }
+ if (ret == `next)
+ {
+ integer index = 0;
+ BootCommon::device_mapping = filter (string k, string v,
+ BootCommon::device_mapping,
+ {
+ return substring (v, 0, 2) != "hd";
+ });
+ BootCommon::mbrDisk = disks_order[0]:"";
+ BootCommon::device_mapping = (map<string,string>)union (
+ BootCommon::device_mapping,
+ listmap (string d, disks_order, {
+ string hex_index = substring (tohexstring (index), 2);
+ index = index + 1;
+ return $[ d : sformat ("hd%1", hex_index) ];
+ })
+ );
+
+ }
+ return (symbol)ret;
+}
+
+
+
+} // EOF
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/src/generic/Makefile.am
new/yast2-bootloader-2.17.9/src/generic/Makefile.am
--- old/yast2-bootloader-2.17.8/src/generic/Makefile.am 2008-07-21
16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.9/src/generic/Makefile.am 2008-08-05
09:59:21.000000000 +0200
@@ -14,7 +14,8 @@
section_widgets.ycp \
sections_widget.ycp \
widget_funcs.ycp \
- wizards.ycp
+ wizards.ycp \
+ device_map_edit_widget.ycp

EXTRA_DIST = \
$(ynclude_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/src/generic/Makefile.in
new/yast2-bootloader-2.17.9/src/generic/Makefile.in
--- old/yast2-bootloader-2.17.8/src/generic/Makefile.in 2008-07-21
18:26:00.000000000 +0200
+++ new/yast2-bootloader-2.17.9/src/generic/Makefile.in 2008-08-05
09:59:31.000000000 +0200
@@ -215,7 +215,8 @@
section_widgets.ycp \
sections_widget.ycp \
widget_funcs.ycp \
- wizards.ycp
+ wizards.ycp \
+ device_map_edit_widget.ycp

EXTRA_DIST = \
$(ynclude_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/src/grub/helps.ycp
new/yast2-bootloader-2.17.9/src/grub/helps.ycp
--- old/yast2-bootloader-2.17.8/src/grub/helps.ycp 2008-07-21
16:04:50.000000000 +0200
+++ new/yast2-bootloader-2.17.9/src/grub/helps.ycp 2008-08-05
10:23:31.000000000 +0200
@@ -126,7 +126,7 @@


global map<string,string> grub_descriptions = $[
- "boot" : _("Boot Loader Locations"),
+ "boot" : _("Boot Loader Locations"),
"activate" : _("Set active Flag in Partition Table for
Boot Partition"),
"timeout" : _("Timeout in Seconds"),
"default" : _("Default Boot Section"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/src/modules/BootCommon.ycp
new/yast2-bootloader-2.17.9/src/modules/BootCommon.ycp
--- old/yast2-bootloader-2.17.8/src/modules/BootCommon.ycp 2008-08-01
17:20:31.000000000 +0200
+++ new/yast2-bootloader-2.17.9/src/modules/BootCommon.ycp 2008-08-05
12:04:46.000000000 +0200
@@ -15,7 +15,7 @@
* Joachim Plack <jplack@xxxxxxx>
* Olaf Dabrunz <od@xxxxxxx>
*
- * $Id: BootCommon.ycp 49588 2008-08-01 15:20:30Z juhliarik $
+ * $Id: BootCommon.ycp 49686 2008-08-05 10:04:46Z juhliarik $
*
*/

@@ -1025,15 +1025,11 @@
y2milestone ("It is XEN domU and the bootloader should be installed");

}
- if (loader_type == "grub" && Storage::UseLilo())
+ if (loader_type == "grub")
{
- loader_type = "lilo";
prefer_lilo = true;
}
- else
- {
- prefer_lilo = false;
- }
+

loader_type = SupportedLoader (loader_type);
y2milestone ("Detected bootloader %1", loader_type);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/src/modules/BootGRUB.ycp
new/yast2-bootloader-2.17.9/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.17.8/src/modules/BootGRUB.ycp 2008-08-04
13:34:56.000000000 +0200
+++ new/yast2-bootloader-2.17.9/src/modules/BootGRUB.ycp 2008-08-05
12:04:46.000000000 +0200
@@ -15,7 +15,7 @@
* Olaf Dabrunz <od@xxxxxxx>
* Philipp Thomas <pth@xxxxxxx>
*
- * $Id: BootGRUB.ycp 49630 2008-08-04 11:34:56Z juhliarik $
+ * $Id: BootGRUB.ycp 49686 2008-08-05 10:04:46Z juhliarik $
*
*/

@@ -61,6 +61,7 @@
include "bootloader/grub/misc.ycp";
include "bootloader/routines/popups.ycp";
include "bootloader/grub/helps.ycp";
+include "bootloader/generic/device_map_edit_widget.ycp";
include "bootloader/generic/dialogs.ycp";


@@ -759,6 +760,7 @@

global map<string,symbol()> Dialogs () {
return $[
+ "installation" : i386InstallDetailsDialog,
"loader" : genericBootLoaderOptionsDialog,
];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/src/routines/helps_i386.ycp
new/yast2-bootloader-2.17.9/src/routines/helps_i386.ycp
--- old/yast2-bootloader-2.17.8/src/routines/helps_i386.ycp 2008-07-21
16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.9/src/routines/helps_i386.ycp 2008-08-05
12:04:46.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: helps_i386.ycp 27748 2006-02-08 15:15:11Z jplack $
+ * $Id: helps_i386.ycp 49686 2008-08-05 10:04:46Z juhliarik $
*
*/

@@ -56,6 +56,20 @@
: "");
}

+string i386DeviceMapEditHelp ()
+{
+ // help text 1/5
+ return _("<p><big><b>Disks Order</b></big><br>
+To specify the order of the disks according to the order in BIOS, use
+the <b>Up</b> and <b>Down</b> buttons to reorder the disks.</p>")
+ + (Mode::config ()
+ // help text 2/5, optional (only for autoinstallation)
+ ? _("<p>To add a disk, push <b>Add</b>.
+ To remove a disk, push <b>Remove</b>.</p>")
+ : "");
+}
+
+
/**
* Get help
* @return string help text
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-bootloader-2.17.8/VERSION
new/yast2-bootloader-2.17.9/VERSION
--- old/yast2-bootloader-2.17.8/VERSION 2008-08-04 13:31:24.000000000 +0200
+++ new/yast2-bootloader-2.17.9/VERSION 2008-08-05 12:05:56.000000000 +0200
@@ -1 +1 @@
-2.17.8
+2.17.9


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >