SOURCES: python-booty-menu.lst.patch (NEW) - revert redhat's attem...

[glen]

Author: glen                         Date: Wed May 24 20:55:54 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- revert redhat's attempt to rename menu.lst to grub.conf. PLD isn't patched
  for that, and grub doesn't like symlink at all.

---- Files affected:
SOURCES:
   python-booty-menu.lst.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/python-booty-menu.lst.patch
diff -u /dev/null SOURCES/python-booty-menu.lst.patch:1.1
--- /dev/null	Wed May 24 22:55:54 2006
+++ SOURCES/python-booty-menu.lst.patch	Wed May 24 22:55:49 2006
@@ -0,0 +1,69 @@
+--- booty-0.71/bootloaderInfo.py	2006-03-14 23:18:45.000000000 +0200
++++ booty-0.71.pld/bootloaderInfo.py	2006-05-24 23:53:01.340281681 +0300
+@@ -696,7 +696,7 @@
+ 
+         # XXX old config file should be read here for upgrade
+ 
+-        cf = '/boot/grub/grub.conf'
++        cf = '/boot/grub/menu.lst'
+         self.perms = 0600
+         if os.access (instRoot + cf, os.R_OK):
+             self.perms = os.stat(instRoot + cf)[0] & 0777
+@@ -853,7 +853,7 @@
+             usedDevs[device] = 1
+ 
+         f.close()
+-        os.chmod(instRoot + "/boot/grub/grub.conf", self.perms)
++        os.chmod(instRoot + "/boot/grub/menu.lst", self.perms)
+ 
+         try:
+             # make symlink for menu.lst (default config file name)
+@@ -869,7 +869,7 @@
+             if os.access (instRoot + "/etc/grub.conf", os.R_OK):
+                 os.rename(instRoot + "/etc/grub.conf",
+                           instRoot + "/etc/grub.conf.rpmsave")
+-            os.symlink("../boot/grub/grub.conf", instRoot + "/etc/grub.conf")
++            os.symlink("../boot/grub/menu.lst", instRoot + "/etc/grub.conf")
+         except:
+             pass
+        
+@@ -1050,7 +1050,7 @@
+ 
+         theDev = None
+         for (fn, stanza) in [ ("/etc/sysconfig/grub", "boot="),
+-                              ("/boot/grub/grub.conf", "#boot=") ]:
++                              ("/boot/grub/menu.lst", "#boot=") ]:
+             try:
+                 f = open(instRoot + fn, "r")
+             except:
+@@ -1172,7 +1172,7 @@
+             for device in cdrw:
+                 torem.append("%s=ide-scsi" %(device,))
+                 
+-            for fn in ("/etc/lilo.conf", "/boot/grub/grub.conf",
++            for fn in ("/etc/lilo.conf", "/boot/grub/menu.lst",
+                        "/etc/lilo.conf.anaconda"):
+                 if not os.path.exists(instRoot + fn):
+                     continue
+--- booty-0.71/booty.py	2005-06-29 22:36:39.000000000 +0300
++++ booty-0.71.pld/booty.py	2006-05-24 23:50:52.627395309 +0300
+@@ -106,7 +106,7 @@
+ 
+ 
+     if not filename:
+-        filename = "/boot/grub/grub.conf"
++        filename = "/boot/grub/menu.lst"
+     
+ 
+     defaultImage = getGrubDefault()
+--- booty-0.71/checkbootloader.py	2005-06-29 22:36:39.000000000 +0300
++++ booty-0.71.pld/checkbootloader.py	2006-05-24 23:51:02.397614410 +0300
+@@ -18,7 +18,7 @@
+ import os
+ import string
+ 
+-grubConfigFile = "/boot/grub/grub.conf"
++grubConfigFile = "/boot/grub/menu.lst"
+ liloConfigFile = "/etc/lilo.conf"
+ yabootConfigFile = "/etc/yaboot.conf"
+ siloConfigFile = "/etc/silo.conf"
================================================================