X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=anaconda-kernel.patch;h=db1a93c97c5128a768bd4a517c983183b527244e;hb=38519d28e87104a12a52f8b446ab1df008ede891;hp=cf50e606f262afbbe1c6d84dd3a106748747cc67;hpb=b18863cd1c0e7994670ed8a0e2fc284fbf4f36d6;p=packages%2Fanaconda.git

diff --git a/anaconda-kernel.patch b/anaconda-kernel.patch
index cf50e60..db1a93c 100644
--- a/anaconda-kernel.patch
+++ b/anaconda-kernel.patch
@@ -1,5 +1,5 @@
---- anaconda-11.0.5/yuminstall.py	2006-05-24 03:01:04.177356166 +0300
-+++ anaconda-11.0.5/yuminstall.py	2006-05-24 03:11:56.912047364 +0300
+--- anaconda-11.0.5/yuminstall.py	2006-05-24 18:09:49.619010315 +0300
++++ anaconda-11.0.5/yuminstall.py	2006-05-25 00:11:54.385696897 +0300
 @@ -697,11 +697,11 @@
              return pkgs[0]
  
@@ -25,6 +25,15 @@
                  foundkernel = True
              except PackageSackError:
                  ksmp = None
+@@ -750,7 +750,7 @@
+                     self.selectPackage("kernel-smp-devel")
+             
+         if not foundkernel:
+-            log.info("selected kernel package for kernel")
++            log.info("selected kernel-grsecurity package for kernel")
+             self.ayum.install(po=kpkg)
+             if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0:
+                 log.debug("selecting kernel-devel")
 @@ -1028,7 +1028,7 @@
          kernelVersions = []
  
@@ -34,3 +43,32 @@
                                ('kernel-xen0', 'xen0'),
                                ('kernel-xenU', 'xenU') ]:
              tag = ktag.rsplit('-', 1)[1]
+@@ -1036,7 +1036,7 @@
+                 version = ( tsmbr.version + '-' + tsmbr.release + tag)
+                 kernelVersions.append((version, nick))
+ 
+-        for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel'):
++        for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel-grsecurity'):
+             version = ( tsmbr.version + '-' + tsmbr.release)
+             kernelVersions.append((version, 'up'))
+ 
+--- anaconda-11.0.5/bootloader.py~	2006-01-31 18:34:46.000000000 +0200
++++ anaconda-11.0.5/bootloader.py	2006-05-25 00:14:22.269017091 +0300
+@@ -145,7 +145,7 @@
+         return
+ 
+     plainLabelUsed = 0
+-    defkern = "kernel"
++    defkern = "kernel-grsecurity"
+     for (version, nick) in backend.kernelVersionList():
+ 	if plainLabelUsed:
+             kernelList.append(("%s-%s" %(kernelLabel, nick),
+@@ -156,7 +156,7 @@
+             if nick in ("hypervisor", "guest"): # XXX: *sigh* inconsistent
+                 defkern = "kernel-xen-%s" %(nick,)
+             elif nick != "up":
+-                defkern = "kernel-%s" %(nick,)
++                defkern = "kernel-grsecurity-%s" %(nick,)
+ 	    plainLabelUsed = 1
+ 
+     f = open(instRoot + "/etc/sysconfig/kernel", "w+")