Mailinglist Archive: yast-commit (129 mails)

[jreidinger@xxxxxxxxxxxxxxxxx]

Author: jreidinger
Date: Fri Dec 31 13:23:44 2010
New Revision: 63049

URL: http://svn.opensuse.org/viewcvs/yast?rev=63049&view=rev
Log:
fix last fix :)

Modified:
    branches/SuSE-SLE-10-SP4-Branch/bootloader/src/modules/BootELILO.ycp

Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/modules/BootELILO.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootloader/src/modules/BootELILO.ycp?rev=63049&r1=63048&r2=63049&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/modules/BootELILO.ycp 
(original)
+++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/modules/BootELILO.ycp Fri 
Dec 31 13:23:44 2010
@@ -341,14 +341,10 @@
     {
       if (Mode::autoinst ())
       {
-        y2milestone ("merging defaults to missing keys in globals");
-           // Merge default globals where not yet set
-        BootCommon::globals = (map<string, string>) union(
-               StandardGlobals(),
-          BootCommon::globals
-        );
-        }
-      else {
+        y2milestone ("merging defaults to missing keys in sections");
+      }
+      else
+      {
              BootCommon::FixSections (BootELILO::CreateSections);
       }
     }
@@ -357,6 +353,18 @@
     {
         CreateGlobals ();
     }
+    else
+    {
+      if (Mode::autoinst ())
+      {
+        y2milestone ("merging defaults to missing keys in globals");
+           // Merge default globals where not yet set
+        BootCommon::globals = (map<string, string>) union(
+               StandardGlobals(),
+          BootCommon::globals
+        );
+        }
+    }
 
     if (BootCommon::globals["boot_efilabel"]:nil == nil ||
        BootCommon::globals["boot_efilabel"]:nil == "")

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