Author: jreidinger
Date: Thu Apr 9 15:05:51 2009
New Revision: 56737
URL: http://svn.opensuse.org/viewcvs/yast?rev=56737&view=rev
Log:
clean deprecated artifacts (especialy generic sequencer)
Modified:
trunk/bootloader/src/modules/BootELILO.ycp
trunk/bootloader/src/modules/BootGRUB.ycp
trunk/bootloader/src/modules/BootPOWERLILO.ycp
trunk/bootloader/src/modules/BootZIPL.ycp
trunk/bootloader/src/routines/lilolike.ycp
trunk/bootloader/src/routines/switcher.ycp
Modified: trunk/bootloader/src/modules/BootELILO.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.ycp?rev=56737&r1=56736&r2=56737&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootELILO.ycp (original)
+++ trunk/bootloader/src/modules/BootELILO.ycp Thu Apr 9 15:05:51 2009
@@ -789,12 +789,6 @@
}
-global symbol WizardSequenzer() {
- y2milestone("Call generic WizardSequenzer");
- return `generic_new;
-}
-
-
global map Dialogs () {
return $[
"loader" : EliloLoaderDetailsDialog,
@@ -832,7 +826,6 @@
"update" : Update,
"write" : Write,
"widgets" : Widgets,
- "wizard_sequencer" : WizardSequenzer,
"dialogs" : Dialogs,
"section_types" : elilo_section_types,
"flagbootdefaultonce" : FlagBootDefaultOnce,
Modified: trunk/bootloader/src/modules/BootGRUB.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=56737&r1=56736&r2=56737&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootGRUB.ycp (original)
+++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Apr 9 15:05:51 2009
@@ -40,10 +40,6 @@
* Shall proposal merge menus?
*/
global symbol merge_level = `main;
-/**
- * Insert saved MBR to bootloader menu?
- */
-global boolean insert_saved_mbr = false;
// variables for temporary data
@@ -52,10 +48,6 @@
*/
global list<string> disks_order = nil;
-// function prototypes
-
-global boolean backup_to_bootsector = true;
-
// includes
include "bootloader/grub/misc.ycp";
@@ -133,6 +125,7 @@
* Propose sections to bootloader menu
* modifies internal structures
*/
+ //FIXME really needs refactor, it is really huge function
global define void CreateSections () {
y2debug ("Creating GRUB sections from scratch");
list > out = [];
@@ -765,12 +758,6 @@
}
-global symbol WizardSequenzer() {
- y2milestone("Call generic WizardSequenzer");
- return `generic_new;
-}
-
-
global map Dialogs () {
return $[
"installation" : i386InstallDetailsDialog,
@@ -811,7 +798,6 @@
"update" : Update,
"write" : Write,
"widgets" : grubWidgets,
- "wizard_sequencer" : WizardSequenzer,
"dialogs" : Dialogs,
"section_types" : grub_section_types,
"flagonetimeboot" : FlagOnetimeBoot,
Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWERLILO.ycp?rev=56737&r1=56736&r2=56737&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original)
+++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Thu Apr 9 15:05:51 2009
@@ -1248,21 +1248,6 @@
}
-global symbol WizardSequenzer() {
-/*
-blMainSequence () {
- map functions = getFunctions (BootCommon::getLoaderType (false));
- symbol () toEval = (symbol ())functions["wizard_sequencer"]:nil;
- if (toEval != nil)
- return toEval ();
- else
- return `generic;
-*/
- y2milestone("Call generic WizardSequenzer");
- return `generic_new;
-}
-
-
global map Dialogs () {
// PPC definitly needs other text modules
return $[
@@ -1307,7 +1292,6 @@
"update" : Update,
"write" : Write,
"widgets" : ppcWidgets,
- "wizard_sequencer" : WizardSequenzer,
"dialogs" : Dialogs,
"section_types" : ppc_section_types,
"flagonetimeboot" : FlagOnetimeBoot,
Modified: trunk/bootloader/src/modules/BootZIPL.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootZIPL.ycp?rev=56737&r1=56736&r2=56737&view=diff
==============================================================================
--- trunk/bootloader/src/modules/BootZIPL.ycp (original)
+++ trunk/bootloader/src/modules/BootZIPL.ycp Thu Apr 9 15:05:51 2009
@@ -239,12 +239,6 @@
}
-global symbol WizardSequenzer() {
- y2milestone("Call generic WizardSequenzer");
- return `generic_new;
-}
-
-
global map Dialogs () {
return $[];
}
@@ -285,7 +279,6 @@
"update" : Update,
"write" : Write,
"widgets" : ziplWidgets,
- "wizard_sequencer" : WizardSequenzer,
"dialogs" : Dialogs,
"section_types" : zipl_section_types,
"flagonetimeboot" : FlagOnetimeBoot,
Modified: trunk/bootloader/src/routines/lilolike.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike.ycp?rev=56737&r1=56736&r2=56737&view=diff
==============================================================================
--- trunk/bootloader/src/routines/lilolike.ycp (original)
+++ trunk/bootloader/src/routines/lilolike.ycp Thu Apr 9 15:05:51 2009
@@ -584,7 +584,7 @@
// if "non-standard" section name and a used device is not
// available anymore, notify user
if (type != "linux" && type != "failsafe"
- && type != "memtest86" && type != "wildcard")
+ && type != "memtest86")
{
foreach (string n, s["__devs"]:[], {
if (! contains (parts, n))
@@ -1023,14 +1023,6 @@
BootCommon::sections = filter (map s, BootCommon::sections, {
string label = s["name"]:"";
- // do not touch the wildcard section
- if (regexpmatch (s["image"]:"", ".+\\-\\*"))
- {
- if (first == nil)
- first = label;
- return true;
- }
-
string type = s["original_name"]:"";
if (label == "")
{
@@ -1086,7 +1078,7 @@
global void UpdateAppend () {
sections = maplist (map s, sections, {
string type = s["original_name"]:"";
- if ((type == "linux" || type == "wildcard" || type == "global")
+ if ((type == "linux" || type == "global")
&& s["append"]:nil != nil
&& Stage::initial ())
{
Modified: trunk/bootloader/src/routines/switcher.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/switcher.ycp?rev=56737&r1=56736&r2=56737&view=diff
==============================================================================
--- trunk/bootloader/src/routines/switcher.ycp (original)
+++ trunk/bootloader/src/routines/switcher.ycp Thu Apr 9 15:05:51 2009
@@ -178,20 +178,6 @@
}
/**
- * Get the main sequence for the specified bootloader
- * @return symbol the result of the sequence, or `generic to run generic
- * sequence instead
- */
-global symbol blMainSequence () {
- map functions = getFunctions (BootCommon::getLoaderType (false));
- symbol () toEval = (symbol ())functions["wizard_sequencer"]:nil;
- if (toEval != nil)
- return toEval ();
- else
- return `generic;
-}
-
-/**
* Get the loader-specific dialogs
* @return a map of loader-specific dialogs
*/
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
