Mailinglist Archive: yast-commit (883 mails)

[juhliarik@xxxxxxxxxxxxxxxx]

Author: juhliarik
Date: Thu Jul 16 17:27:43 2009
New Revision: 58096

URL: http://svn.opensuse.org/viewcvs/yast?rev=58096&view=rev
Log:
added several fixes

Modified:
    branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION
    branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes
    branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl
    branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp
    branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp
    branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp
    branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp
    branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/VERSION Thu Jul 16 17:27:43 2009
@@ -1 +1 @@
-2.13.161
+2.13.162

Modified: 
branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/package/yast2-bootloader.changes 
Thu Jul 16 17:27:43 2009
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Jul 16 12:52:56 CEST 2009 - juhliarik@xxxxxxx
+
+- update checking of MBR and bootloader proposal (bnc#517293)
+- added fix for calling /sbin/lilo (bnc#466427)
+- added fix for update if xen is installed (bnc#278739)
+- 2.13.162 
+
+-------------------------------------------------------------------
 Mon Jun 29 16:45:48 CEST 2009 - juhliarik@xxxxxxx
 
 - update support of UEFI on x86-64 (fate#306032)

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/scripts/examine_mbr.pl Thu Jul 
16 17:27:43 2009
@@ -23,7 +23,7 @@
 if (substr($MBR, 320, 126) =~ 
     m,invalid partition table.*no operating system,i) {
   print "Generic MBR\n";
-  exit 0;
+  exit 1;
 }
 
 if (substr($MBR, 346, 100) =~ m,GRUB .Geom.Hard Disk.Read. Error,) {
@@ -36,5 +36,17 @@
   exit 1;
 }
 
+if (substr($MBR, 12, 500) =~ m,NTLDR is missing,) {
+  print "Windows bootloader stage1\n";
+  exit 0;
+}
+
+if (substr($MBR, 0, 440) =~ 
+    m,invalid partition table.*Error loading operating system,i) {
+  print "Vista MBR\n";
+  exit 0;
+}
+
+
 print "unknown\n";
 exit 1;

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp (original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/grub/misc.ycp Thu Jul 16 
17:27:43 2009
@@ -548,7 +548,7 @@
     // NOTE: selected_location is a temporary local variable now; the global
     // variable is not used for grub anymore
     symbol selected_location = `mbr;             // default to mbr
-
+    boolean windows_mbr = false;
     // check whether the /boot partition
     //  - is primary:                          is_logical  -> false
     //  - is on the first disk (with the MBR):  boot_partition_is_on_mbr_disk 
-> true
@@ -635,6 +635,11 @@
        y2milestone ("MBR examining script returned %1", out);
        integer exit = out["exit"]:0;
        BootCommon::globals["generic_mbr"] = ((exit != 0) && (! keep_mbr)) ? 
"true" : "false";
+       if (exit == 0)
+       {
+               y2milestone("It should be Windows MBR...");
+               windows_mbr = true;
+       }
     }
     else if (size (underlying_boot_partition_devices) > 1)
     {
@@ -686,7 +691,8 @@
        // boot Linux)
        // kokso: fix the problem with proposing installation generic boot code 
to "/" or "/boot"
        // kokso: if boot device is on logical partition
-        if (is_logical && (extended != nil) && 
(BootCommon::globals["generic_mbr"]:"" == "true"))
+        if (is_logical && (extended != nil) && 
(BootCommon::globals["generic_mbr"]:"" == "true" ||
+       windows_mbr))
            selected_location = `extended;
        BootCommon::globals["activate"] = "true";
        SetBootloaderDevice(selected_location);

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootCommon.ycp Thu 
Jul 16 17:27:43 2009
@@ -425,7 +425,7 @@
 global boolean UsingXenPae() {
     if (Mode::test())
        return true;
-    if (Mode::normal())
+    if (Mode::normal() || Mode::update())
         return Pkg::IsProvided ("kernel-xenpae");
     return Pkg::IsSelected ("kernel-xenpae");
 }

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/BootLILO.ycp Thu Jul 
16 17:27:43 2009
@@ -271,7 +271,8 @@
                             BootCommon::BootPartitionDevice))
              {
                y2milestone ("Creating backup copy to bootsector");
-               SCR::Execute (.target.bash, sformat ("/sbin/lilo -b %1",
+               // add fix for calling lilo (bnc#466427)
+               SCR::Execute (.target.bash, sformat ("/sbin/lilo -P ignore -b 
%1",
                              BootCommon::BootPartitionDevice));
              }
        }
@@ -297,8 +298,9 @@
   */
 global define boolean FlagOnetimeBoot (string section)
 {
+    // add fix for calling lilo (bnc#466427)
     map result = (map)SCR::Execute (.target.bash_output,
-                                   sformat ("/sbin/lilo -R \"%1\"", section));
+                                   sformat ("/sbin/lilo -P ignore -R \"%1\"", 
section));
     y2milestone ("lilo returned %1", result);
     return (result["exit"]:-1 == 0);
 }

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/Bootloader.ycp Thu 
Jul 16 17:27:43 2009
@@ -1082,7 +1082,8 @@
          /*
           * This is extreme boolshit, Bootloader::Library has to be called
           */
-           string bl_command = "/sbin/lilo >> /var/log/YaST2/y2log_bootloader 
2>&1";
+           // add fix for calling lilo (bnc#466427)
+           string bl_command = "/sbin/lilo -P ignore >> 
/var/log/YaST2/y2log_bootloader 2>&1";
            boolean command_ret = 0 == SCR::Execute (.target.bash, bl_command);
            if (! command_ret)
            {

Modified: branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp?rev=58096&r1=58095&r2=58096&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp 
(original)
+++ branches/SuSE-SLE-10-SP3-Branch/bootloader/src/modules/GfxMenu.ycp Thu Jul 
16 17:27:43 2009
@@ -427,7 +427,8 @@
 
     if (loader == "lilo")
     {
-       map out = (map)SCR::Execute (.target.bash_output, "/sbin/lilo");
+       // add fix for calling lilo (bnc#466427)
+       map out = (map)SCR::Execute (.target.bash_output, "/sbin/lilo -P 
ignore");
        if (out["exit"]:0 != 0)
        {
            y2error ("Output of /sbin/lilo: %1", out);

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