SOURCES: python-booty-menu.lst.patch - fix more occurences

[patrys]

Author: patrys                       Date: Mon Dec  1 21:44:08 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix more occurences

---- Files affected:
SOURCES:
   python-booty-menu.lst.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/python-booty-menu.lst.patch
diff -u SOURCES/python-booty-menu.lst.patch:1.3 SOURCES/python-booty-menu.lst.patch:1.4
--- SOURCES/python-booty-menu.lst.patch:1.3	Tue Nov 18 00:26:32 2008
+++ SOURCES/python-booty-menu.lst.patch	Mon Dec  1 22:44:03 2008
@@ -1,6 +1,6 @@
---- booty-0.93/bootloaderInfo.py~	2007-12-14 15:25:30.000000000 +0100
-+++ booty-0.93/bootloaderInfo.py	2007-12-14 15:27:46.301475773 +0100
-@@ -710,7 +710,7 @@
+--- booty-0.93.old/bootloaderInfo.py	2008-12-01 22:36:37.518050625 +0100
++++ booty-0.93/bootloaderInfo.py	2008-12-01 22:40:57.694050368 +0100
+@@ -708,7 +708,7 @@
  
          # XXX old config file should be read here for upgrade
  
@@ -9,7 +9,16 @@
          self.perms = 0600
          if os.access (instRoot + cf, os.R_OK):
              self.perms = os.stat(instRoot + cf)[0] & 0777
-@@ -867,7 +867,7 @@
+@@ -730,7 +730,7 @@
+             
+         f = open(instRoot + cf, "w+")
+ 
+-        f.write("# grub.conf generated by anaconda\n")
++        f.write("# menu.lst generated by anaconda\n")
+         f.write("#\n")
+         f.write("# Note that you do not have to rerun grub "
+                 "after making changes to this file\n")
+@@ -863,14 +863,14 @@
              usedDevs[device] = 1
  
          f.close()
@@ -17,16 +26,20 @@
 +        os.chmod(instRoot + "/boot/grub/menu.lst", self.perms)
  
          try:
-             # make symlink for menu.lst (default config file name)
-@@ -870,7 +870,6 @@
-             if os.access (instRoot + "/boot/grub/menu.lst", os.R_OK):
-                 os.rename(instRoot + "/boot/grub/menu.lst",
-                           instRoot + "/boot/grub/menu.lst.rpmsave")
+-            # make symlink for menu.lst (default config file name)
+-            if os.access (instRoot + "/boot/grub/menu.lst", os.R_OK):
+-                os.rename(instRoot + "/boot/grub/menu.lst",
+-                          instRoot + "/boot/grub/menu.lst.rpmsave")
 -            os.symlink("./grub.conf", instRoot + "/boot/grub/menu.lst")
++            # make symlink for grub.conf (default config file name)
++            if os.access (instRoot + "/boot/grub/grub.conf", os.R_OK):
++                os.rename(instRoot + "/boot/grub/grub.conf",
++                          instRoot + "/boot/grub/grub.conf.rpmsave")
++            os.symlink("./menu.lst", instRoot + "/boot/grub/grub.conf")
          except:
              pass
  
-@@ -883,7 +883,7 @@
+@@ -879,7 +879,7 @@
              if os.access (instRoot + "/etc/grub.conf", os.R_OK):
                  os.rename(instRoot + "/etc/grub.conf",
                            instRoot + "/etc/grub.conf.rpmsave")
@@ -35,7 +48,7 @@
          except:
              pass
         
-@@ -947,7 +947,7 @@
+@@ -943,7 +943,7 @@
              if target == "partition":
                  stage1Target = self.grubbyPartitionName(gtPart)
  
@@ -44,7 +57,16 @@
                  (args, grubPath, stage1Target, grubPath, bPart, grubPath)
              cmds.append(cmd)
              
-@@ -1065,7 +1065,7 @@
+@@ -1052,7 +1052,7 @@
+         return config
+ 
+     # this is a hackish function that depends on the way anaconda writes
+-    # out the grub.conf with a #boot= comment
++    # out the menu.lst with a #boot= comment
+     # XXX this falls into the category of self.doUpgradeOnly
+     def upgradeGrub(self, instRoot, fsset, bl, langs, kernelList, chainList,
+                     defaultDev, justConfigFile):
+@@ -1061,7 +1061,7 @@
  
          theDev = None
          for (fn, stanza) in [ ("/etc/sysconfig/grub", "boot="),
@@ -53,7 +75,7 @@
              try:
                  f = open(instRoot + fn, "r")
              except:
-@@ -1138,7 +1138,7 @@
+@@ -1134,7 +1134,7 @@
                      break
                      
              args = "--stage2=/boot/grub/stage2 "
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-booty-menu.lst.patch?r1=1.3&r2=1.4&f=u