]>
Commit | Line | Data |
---|---|---|
127f0269 ER |
1 | --- anaconda-11.0.5/yuminstall.py~ 2006-05-24 02:51:56.715042751 +0300 |
2 | +++ anaconda-11.0.5/yuminstall.py 2006-05-24 03:01:04.177356166 +0300 | |
3 | @@ -701,7 +701,7 @@ | |
4 | ||
5 | # FIXME: this is a bit of a hack. we shouldn't hard-code and | |
6 | # instead check by provides. but alas. | |
7 | - for k in ("kernel", "kernel-smp", "kernel-xen0"): | |
8 | + for k in ("kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0"): | |
9 | if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0: | |
10 | foundkernel = True | |
11 | ||
12 | @@ -736,8 +736,8 @@ | |
13 | ||
14 | if not foundkernel and (isys.smpAvailable() or isys.htavailable()): | |
15 | try: | |
16 | - ksmp = getBestKernelByArch("kernel-smp", self.ayum) | |
17 | - log.info("selected kernel-smp package for kernel") | |
18 | + ksmp = getBestKernelByArch("kernel-grsecurity-smp", self.ayum) | |
19 | + log.info("selected kernel-grsecurity-smp package for kernel") | |
20 | foundkernel = True | |
21 | except PackageSackError: | |
22 | ksmp = None | |
23 | @@ -1028,7 +1028,7 @@ | |
24 | kernelVersions = [] | |
25 | ||
26 | # nick is used to generate the lilo name | |
27 | - for (ktag, nick) in [ ('kernel-smp', 'smp'), | |
28 | + for (ktag, nick) in [ ('kernel-grsecurity-smp', 'smp'), | |
29 | ('kernel-xen0', 'xen0'), | |
30 | ('kernel-xenU', 'xenU') ]: | |
31 | tag = ktag.rsplit('-', 1)[1] |