- use util-linux virtual

[packages/anaconda.git] / anaconda-kernel.patch

diff --git a/anaconda-kernel.patch b/anaconda-kernel.patch
index 95968ee105986a4d506ebbebf0bbb0eb48e40a1e..6acfd188af0b0562d5b185ba1ed9baa80a96ad87 100644 (file)
--- a/anaconda-kernel.patch
+++ b/anaconda-kernel.patch
@@ -1,31 +1,10 @@
---- anaconda-11.0.5/yuminstall.py~     2006-05-24 02:51:56.715042751 +0300
-+++ anaconda-11.0.5/yuminstall.py      2006-05-24 03:01:04.177356166 +0300
-@@ -701,7 +701,7 @@
- 
+--- anaconda-11.2.0.24.org/yuminstall.py       2007-02-13 14:56:08.000000000 +0100
++++ anaconda-11.2.0.24/yuminstall.py   2007-02-20 19:12:05.894623000 +0100
+@@ -1009,6 +1009,7 @@
          # FIXME: this is a bit of a hack.  we shouldn't hard-code and
          # instead check by provides.  but alas.
--        for k in ("kernel", "kernel-smp", "kernel-xen0"):
-+        for k in ("kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0"):
-             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:            
-                 foundkernel = True
- 
-@@ -736,8 +736,8 @@
- 
-         if not foundkernel and (isys.smpAvailable() or isys.htavailable()):
-             try:
--                ksmp = getBestKernelByArch("kernel-smp", self.ayum)
--                log.info("selected kernel-smp package for kernel")
-+                ksmp = getBestKernelByArch("kernel-grsecurity-smp", self.ayum)
-+                log.info("selected kernel-grsecurity-smp package for kernel")
-                 foundkernel = True
-             except PackageSackError:
-                 ksmp = None
-@@ -1028,7 +1028,7 @@
-         kernelVersions = []
- 
-         # nick is used to generate the lilo name
--        for (ktag, nick) in [ ('kernel-smp', 'smp'),
-+        for (ktag, nick) in [ ('kernel-grsecurity-smp', 'smp'),
-                               ('kernel-xen0', 'xen0'),
-                               ('kernel-xenU', 'xenU') ]:
-             tag = ktag.rsplit('-', 1)[1]
+         for k in ("kernel", "kernel-smp", "kernel-xen0", "kernel-xen",
++                  "kernel-grsecurity", "kernel-grsecurity-smp",
+                   "kernel-PAE"):
+             if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0:
+                 self.selectModulePackages(anaconda, k)