From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 24 May 2006 21:15:05 +0000 (+0000)
Subject: - also possibly fix labels for boot loader
X-Git-Tag: auto/th/anaconda-11_4_1_200808292136-1~71
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=commitdiff_plain;h=fdb2063cf67a43b2c369dde8c950cb538e1f283a;ds=sidebyside

- also possibly fix labels for boot loader

Changed files:
    anaconda-kernel.patch -> 1.5
---

diff --git a/anaconda-kernel.patch b/anaconda-kernel.patch
index f22f16e..db1a93c 100644
--- a/anaconda-kernel.patch
+++ b/anaconda-kernel.patch
@@ -52,3 +52,23 @@
              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+")