Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49756 - in /trunk/bootloader/src: generic/section_edit_widgets.ycp generic/wizards.ycp grub/helps.ycp modules/BootGRUB.ycp modules/GfxMenu.ycp
  • From: juhliarik@xxxxxxxxxxxxxxxx
  • Date: Wed, 06 Aug 2008 10:52:38 -0000
  • Message-id: <20080806105238.4E8F727395@xxxxxxxxxxxxxxxx>
Author: juhliarik
Date: Wed Aug 6 12:52:37 2008
New Revision: 49756

URL: http://svn.opensuse.org/viewcvs/yast?rev=49756&view=rev
Log:
- added checkbox for enabling remaping of chainloader section
- added support for acoustic signal in gfxboot (fate #303481)

M bootloader/src/grub/helps.ycp
* added help text
M bootloader/src/modules/GfxMenu.ycp
* added function enableAcousticSignal()
M bootloader/src/modules/BootGRUB.ycp
M bootloader/src/generic/section_edit_widgets.ycp
M bootloader/src/generic/wizards.ycp
* added checkbox

Modified:
trunk/bootloader/src/generic/section_edit_widgets.ycp
trunk/bootloader/src/generic/wizards.ycp
trunk/bootloader/src/grub/helps.ycp
trunk/bootloader/src/modules/BootGRUB.ycp
trunk/bootloader/src/modules/GfxMenu.ycp

Modified: trunk/bootloader/src/generic/section_edit_widgets.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/section_edit_widgets.ycp?rev=49756&r1=49755&r2=49756&view=diff
==============================================================================
--- trunk/bootloader/src/generic/section_edit_widgets.ycp (original)
+++ trunk/bootloader/src/generic/section_edit_widgets.ycp Wed Aug 6 12:52:37
2008
@@ -45,7 +45,8 @@
// extract edit dialog discription for a specific type of section
map<string,any> SE_Options (string type) {
map<string,any> 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,

Modified: trunk/bootloader/src/generic/wizards.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/generic/wizards.ycp?rev=49756&r1=49755&r2=49756&view=diff
==============================================================================
--- trunk/bootloader/src/generic/wizards.ycp (original)
+++ trunk/bootloader/src/generic/wizards.ycp Wed Aug 6 12:52:37 2008
@@ -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,
]);

Modified: trunk/bootloader/src/grub/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/grub/helps.ycp?rev=49756&r1=49755&r2=49756&view=diff
==============================================================================
--- trunk/bootloader/src/grub/helps.ycp (original)
+++ trunk/bootloader/src/grub/helps.ycp Wed Aug 6 12:52:37 2008
@@ -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"),

Modified: trunk/bootloader/src/modules/BootGRUB.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=49756&r1=49755&r2=49756&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootGRUB.ycp (original)
+++ trunk/bootloader/src/modules/BootGRUB.ycp Wed Aug 6 12:52:37 2008
@@ -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();

Modified: trunk/bootloader/src/modules/GfxMenu.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/GfxMenu.ycp?rev=49756&r1=49755&r2=49756&view=diff
==============================================================================
--- trunk/bootloader/src/modules/GfxMenu.ycp (original)
+++ trunk/bootloader/src/modules/GfxMenu.ycp Wed Aug 6 12:52:37 2008
@@ -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;

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

< Previous Next >
This Thread
  • No further messages