Hello community,
here is the log from the commit of package yast2-bootloader
checked in at Thu Aug 7 01:39:32 CEST 2008.
--------
--- yast2-bootloader/yast2-bootloader.changes 2008-08-05 12:45:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-08-06 16:19:59.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Aug 6 15:42:28 CEST 2008 - juhliarik@suse.cz
+
+- added better detection of NFS boot device (bnc #408912)
+- added better detection of EVMS - do not install bootloader
+ (fate #305007)
+- 2.17.11
+
+-------------------------------------------------------------------
+Wed Aug 6 12:55:17 CEST 2008 - juhliarik@suse.cz
+
+- added support for acoustic signals (fate #303481)
+- added checkbox for enabling remapping in chainloader section
+- 2.17.10
+
+-------------------------------------------------------------------
Old:
----
yast2-bootloader-2.17.9.tar.bz2
New:
----
yast2-bootloader-2.17.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.p18600/_old 2008-08-07 01:37:16.000000000 +0200
+++ /var/tmp/diff_new_pack.p18600/_new 2008-08-07 01:37:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bootloader (Version 2.17.9)
+# spec file for package yast2-bootloader (Version 2.17.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-bootloader
-Version: 2.17.9
+Version: 2.17.11
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bootloader-2.17.9.tar.bz2
+Source0: yast2-bootloader-2.17.11.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:
@@ -61,7 +61,7 @@
Daniel Fiser
%prep
-%setup -n yast2-bootloader-2.17.9
+%setup -n yast2-bootloader-2.17.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,15 @@
/var/adm/fillup-templates/*
/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc
%changelog
+* Wed Aug 06 2008 juhliarik@suse.cz
+- added better detection of NFS boot device (bnc #408912)
+- added better detection of EVMS - do not install bootloader
+ (fate #305007)
+- 2.17.11
+* Wed Aug 06 2008 juhliarik@suse.cz
+- added support for acoustic signals (fate #303481)
+- added checkbox for enabling remapping in chainloader section
+- 2.17.10
* Tue Aug 05 2008 juhliarik@suse.cz
- added/enabled support for ordering disks in device.map for GRUB
(fate ##303964)
++++++ yast2-bootloader-2.17.9.tar.bz2 -> yast2-bootloader-2.17.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.17.11/src/clients/bootloader_proposal.ycp
--- old/yast2-bootloader-2.17.9/src/clients/bootloader_proposal.ycp 2008-08-01 17:20:31.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/clients/bootloader_proposal.ycp 2008-08-06 16:05:59.000000000 +0200
@@ -1,7 +1,7 @@
/**
* Module: bootloader_proposal.ycp
*
- * $Id: bootloader_proposal.ycp 49588 2008-08-01 15:20:30Z juhliarik $
+ * $Id: bootloader_proposal.ycp 49778 2008-08-06 14:05:58Z juhliarik $
*
* Author: Klaus Kaempf
*
@@ -124,22 +124,16 @@
//F#300779 - Install diskless client (NFS-root)
//kokso: bootloader will not be installed
-
- map dev = $[];
- if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
- dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
- else
- dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
-
- if (dev["disk"]:"" == "/dev/nfs")
+ string device = BootCommon::getBootDisk();
+ if (device == "/dev/nfs")
{
-
+
y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed.");
- y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
+ y2milestone("Type of BootPartitionDevice: %1", device);
return ret;
}
- y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:"");
+ y2milestone("Type of BootPartitionDevice: %1", device);
//F#300779 - end
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/config/bootloader.rnc new/yast2-bootloader-2.17.11/src/config/bootloader.rnc
--- old/yast2-bootloader-2.17.9/src/config/bootloader.rnc 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/config/bootloader.rnc 2008-08-06 14:08:57.000000000 +0200
@@ -90,6 +90,9 @@
element xen {text}? &
element xen_append {text}? &
element noverifyroot { "true" | "false" }? &
+ element makeactive { "true" | "false" }? &
+ element remap { "true" | "false" }? &
+ element configfile {text}? &
element image {text}?
}
kernel_parameters = element kernel_parameters { text }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/generic/section_edit_widgets.ycp new/yast2-bootloader-2.17.11/src/generic/section_edit_widgets.ycp
--- old/yast2-bootloader-2.17.9/src/generic/section_edit_widgets.ycp 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/generic/section_edit_widgets.ycp 2008-08-06 12:52:38.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Joachim Plack
*
- * $Id: section_edit_widgets.ycp 35202 2007-01-10 14:24:41Z jplack $
+ * $Id: section_edit_widgets.ycp 49756 2008-08-06 10:52:37Z juhliarik $
*
*/
@@ -45,7 +45,8 @@
// extract edit dialog discription for a specific type of section
map SE_Options (string type) {
map se_options = nil;
-
+ // HACK: add checkbox for mapping chainloader section to the first disk in order
+ BootCommon::section_options["other_remap"]="bool:Remap section to the first disk in device map:false";
se_options = mapmap(
string key, any value,
filter( string key, any value, BootCommon::section_options,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/generic/wizards.ycp new/yast2-bootloader-2.17.11/src/generic/wizards.ycp
--- old/yast2-bootloader-2.17.9/src/generic/wizards.ycp 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/generic/wizards.ycp 2008-08-06 12:52:38.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Joachim Plack
*
- * $Id: wizards.ycp 35127 2007-01-05 17:49:18Z jplack $
+ * $Id: wizards.ycp 49756 2008-08-06 10:52:37Z juhliarik $
*
*/
@@ -89,7 +89,7 @@
"contents" : contents,
"caption" : _("Boot Loader Settings: Section Management"),
"back_button" : Label::BackButton (),
- "abort_button" : Label::AbortButton (),
+ "abort_button" : Label::CancelButton (),
"next_button" : Label::OKButton (),
"fallback_functions" : section_handlers,
]);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/grub/helps.ycp new/yast2-bootloader-2.17.11/src/grub/helps.ycp
--- old/yast2-bootloader-2.17.9/src/grub/helps.ycp 2008-08-05 10:23:31.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/grub/helps.ycp 2008-08-06 10:49:01.000000000 +0200
@@ -122,6 +122,8 @@
_("<p><b>Partition of Menu File</b></p>"),
"menu_configfile" :
_("<p><b>Menu Description File<b></p>"),
+ "other_remap" :
+ _("<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"),
];
@@ -157,6 +159,7 @@
"other_noverifyroot" : _("Do not verify Filesystem before Booting"),
"other_makeactive" : _("Activate this Partition when selected for Boot"),
"other_blockoffset" : _("Block Offset for Chainloading"),
+ "other_remap" : _("Map Section to the First Disk in Device Map"),
"type_xen" : _("Xen Section"),
"xen_xen" : _("Hypervisor"),
"xen_xen_append" : _("Additional Xen Hypervisor Parameters"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/modules/BootGRUB.ycp new/yast2-bootloader-2.17.11/src/modules/BootGRUB.ycp
--- old/yast2-bootloader-2.17.9/src/modules/BootGRUB.ycp 2008-08-05 12:04:46.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/modules/BootGRUB.ycp 2008-08-06 12:52:38.000000000 +0200
@@ -15,7 +15,7 @@
* Olaf Dabrunz
* Philipp Thomas
*
- * $Id: BootGRUB.ycp 49686 2008-08-05 10:04:46Z juhliarik $
+ * $Id: BootGRUB.ycp 49756 2008-08-06 10:52:37Z juhliarik $
*
*/
@@ -609,6 +609,10 @@
// if that points to a section that does not exist anymore
BootCommon::FixGlobals ();
}
+
+ // check if windows is on second disk and add remap if it is necessary
+ // FATE #301994: Correct device mapping in case windows is installed on the second HD
+ BootCommon::sections = checkWindowsSection(BootCommon::sections);
y2milestone ("Proposed sections: %1", BootCommon::sections);
y2milestone ("Proposed globals: %1", BootCommon::globals);
@@ -625,10 +629,6 @@
*/
global boolean Save (boolean clean, boolean init, boolean flush)
{
- // check if windows is on second disk and add remap if it is necessary
- // FATE #301994: Correct device mapping in case windows is installed on the second HD
- BootCommon::sections = checkWindowsSection(BootCommon::sections);
-
// reduce device map to 8 devices
// FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13
ReduceDeviceMapTo8();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.11/src/modules/Bootloader.ycp
--- old/yast2-bootloader-2.17.9/src/modules/Bootloader.ycp 2008-08-01 17:20:31.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/modules/Bootloader.ycp 2008-08-06 15:42:22.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: Bootloader.ycp 49588 2008-08-01 15:20:30Z juhliarik $
+ * $Id: Bootloader.ycp 49775 2008-08-06 13:42:22Z juhliarik $
*
*/
@@ -293,12 +293,8 @@
// F#300779 - Install diskless client (NFS-root)
// kokso: additional warning that root partition is nfs type -> bootloader will not be installed
- map dev = $[];
- if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
- dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
- else
- dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
- if (dev["disk"]:"" == "/dev/nfs")
+ string device = BootCommon::getBootDisk();
+ if (device == "/dev/nfs")
{
ret = add (ret, _("The boot partition is of type NFS. Bootloader cannot be installed."));
@@ -537,13 +533,9 @@
//F#300779 - Install diskless client (NFS-root)
//kokso: bootloader will not be installed
+ string device = BootCommon::getBootDisk();
- map dev = $[];
- if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
- dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
- else
- dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
- if (dev["disk"]:"" == "/dev/nfs")
+ if (device == "/dev/nfs")
{
y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed.");
return ret;
@@ -679,13 +671,9 @@
// F#300779 - Install diskless client (NFS-root)
// kokso: bootloader will not be installed
+ string device = BootCommon::getBootDisk();
- map dev = $[];
- if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
- dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
- else
- dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
- if (dev["disk"]:"" == "/dev/nfs")
+ if (device == "/dev/nfs")
{
y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed.");
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/modules/GfxMenu.ycp new/yast2-bootloader-2.17.11/src/modules/GfxMenu.ycp
--- old/yast2-bootloader-2.17.9/src/modules/GfxMenu.ycp 2008-07-21 16:04:51.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/modules/GfxMenu.ycp 2008-08-06 12:52:38.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: GfxMenu.ycp 45547 2008-03-18 10:05:37Z jsrain $
+ * $Id: GfxMenu.ycp 49756 2008-08-06 10:52:37Z juhliarik $
*
*/
@@ -284,6 +284,21 @@
return ret;
}
+
+
+/** FATE #303481: Acoustic signal for bootloader when booting from installation medium
+ * Function enables acoustic signals for bootloader
+ *
+ */
+
+define void enableAcousticSignal()
+{
+ y2milestone("Enable acoustic signals for boot menu");
+ string command = "gfxboot --change-config boot::beep=1";
+ map ret = (map)SCR::Execute (.target.bash_output, command);
+ y2milestone ("Result of command: %1 result: %2",command, ret);
+}
+
/**
* Update graphical bootloader to contain translations for section labels in
* the currently selected installation language (set in
@@ -294,6 +309,10 @@
*/
global define boolean UpdateGfxMenuContents (string loader) {
y2milestone ("Updating GFX boot menu");
+
+ // FATE #303481 enable acoustic signals for bootloader
+ enableAcousticSignal();
+
// if the boot menu does not exist, return without updating it
if (SCR::Read (.target.size, "/boot/message") == -1)
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/routines/dialogs.ycp new/yast2-bootloader-2.17.11/src/routines/dialogs.ycp
--- old/yast2-bootloader-2.17.9/src/routines/dialogs.ycp 2008-08-05 11:55:46.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/routines/dialogs.ycp 2008-08-06 15:42:22.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: dialogs.ycp 48673 2008-06-27 16:57:57Z juhliarik $
+ * $Id: dialogs.ycp 49775 2008-08-06 13:42:22Z juhliarik $
*
*/
@@ -27,8 +27,6 @@
import "Wizard";
import "Bootloader";
import "Stage";
-//F#300779 - Install diskless client (NFS-root)
-import "Storage";
include "bootloader/routines/popups.ycp";
include "bootloader/routines/section_widgets.ycp";
@@ -91,13 +89,9 @@
//F#300779 - Install diskless client (NFS-root)
//kokso: additional warning that root partition is nfs type -> bootloader will not be installed
+ string device = BootCommon::getBootDisk();
- map dev = $[];
- if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil))
- dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice);
- else
- dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice);
- if ((dev["disk"]:"" == "/dev/nfs") && (Mode::installation()))
+ if ((device == "/dev/nfs") && (Mode::installation()))
{
Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed."));
y2milestone("dialogs::MainDialog() -> Boot partition is nfs type, bootloader will not be installed.");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/routines/misc.ycp new/yast2-bootloader-2.17.11/src/routines/misc.ycp
--- old/yast2-bootloader-2.17.9/src/routines/misc.ycp 2008-08-01 17:20:31.000000000 +0200
+++ new/yast2-bootloader-2.17.11/src/routines/misc.ycp 2008-08-06 15:42:22.000000000 +0200
@@ -12,7 +12,7 @@
* Jiri Srain
* Olaf Dabrunz
*
- * $Id: misc.ycp 49588 2008-08-01 15:20:30Z juhliarik $
+ * $Id: misc.ycp 49775 2008-08-06 13:42:22Z juhliarik $
*
* WARNING:
* To be included to BootCommon.ycp only, requires function
@@ -41,6 +41,7 @@
global map Md2Partitions (string md_device);
global void DetectDisks ();
+ global string getBootPartition();
/**
* return printable name of bootloader
@@ -1558,7 +1559,7 @@
}
// EVMS
// FIXME: type detection by name deprecated
- else if (search (BootPartitionDevice, "/dev/evms/") == 0)
+ else if (search (getBootPartition(), "/dev/evms/") == 0)
{
y2milestone ("Cannot install bootloader on EVMS");
return false;
@@ -1701,13 +1702,14 @@
}
-/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13
- * Function select boot device - disk
- *
- * @return string name of boot device - disk
+/**
+ * Function return boot device it means
+ * return boot partition or root partition if boot partition deosn't exist
+ * function return "" if boot partition or root partition is not defined (autoyast)
+ * @return string name of boot device (partition)
*/
-global string getBootDisk()
+global string getBootPartition()
{
string boot_device = "";
if (BootCommon::BootPartitionDevice != "")
@@ -1715,6 +1717,19 @@
else if (BootCommon::RootPartitionDevice != "")
boot_device = BootCommon::RootPartitionDevice;
+ return boot_device;
+}
+
+/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13
+ * Function select boot device - disk
+ *
+ * @return string name of boot device - disk
+ */
+
+global string getBootDisk()
+{
+ string boot_device = getBootPartition();
+
if (boot_device == "")
{
y2milestone("BootPartitionDevice and RootPartitionDevice are empty");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/VERSION new/yast2-bootloader-2.17.11/VERSION
--- old/yast2-bootloader-2.17.9/VERSION 2008-08-05 12:05:56.000000000 +0200
+++ new/yast2-bootloader-2.17.11/VERSION 2008-08-06 16:01:59.000000000 +0200
@@ -1 +1 @@
-2.17.9
+2.17.11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org