]>
Commit | Line | Data |
---|---|---|
5e879406 ER |
1 | --- anaconda-11.0.5/yuminstall.py 2006-05-24 18:09:49.619010315 +0300 |
2 | +++ anaconda-11.0.5/yuminstall.py 2006-05-25 00:11:54.385696897 +0300 | |
b18863cd ER |
3 | @@ -697,11 +697,11 @@ |
4 | return pkgs[0] | |
5 | ||
6 | foundkernel = False | |
7 | - kpkg = getBestKernelByArch("kernel", self.ayum) | |
8 | + kpkg = getBestKernelByArch("kernel-grsecurity", self.ayum) | |
127f0269 ER |
9 | |
10 | # FIXME: this is a bit of a hack. we shouldn't hard-code and | |
11 | # instead check by provides. but alas. | |
12 | - for k in ("kernel", "kernel-smp", "kernel-xen0"): | |
13 | + for k in ("kernel-grsecurity", "kernel-grsecurity-smp", "kernel-xen0"): | |
14 | if len(self.ayum.tsInfo.matchNaevr(name=k)) > 0: | |
15 | foundkernel = True | |
16 | ||
17 | @@ -736,8 +736,8 @@ | |
18 | ||
19 | if not foundkernel and (isys.smpAvailable() or isys.htavailable()): | |
20 | try: | |
21 | - ksmp = getBestKernelByArch("kernel-smp", self.ayum) | |
22 | - log.info("selected kernel-smp package for kernel") | |
23 | + ksmp = getBestKernelByArch("kernel-grsecurity-smp", self.ayum) | |
24 | + log.info("selected kernel-grsecurity-smp package for kernel") | |
25 | foundkernel = True | |
26 | except PackageSackError: | |
27 | ksmp = None | |
5017673a ER |
28 | @@ -750,7 +750,7 @@ |
29 | self.selectPackage("kernel-smp-devel") | |
30 | ||
31 | if not foundkernel: | |
32 | - log.info("selected kernel package for kernel") | |
33 | + log.info("selected kernel-grsecurity package for kernel") | |
34 | self.ayum.install(po=kpkg) | |
35 | if len(self.ayum.tsInfo.matchNaevr(name="gcc")) > 0: | |
36 | log.debug("selecting kernel-devel") | |
127f0269 ER |
37 | @@ -1028,7 +1028,7 @@ |
38 | kernelVersions = [] | |
39 | ||
40 | # nick is used to generate the lilo name | |
41 | - for (ktag, nick) in [ ('kernel-smp', 'smp'), | |
42 | + for (ktag, nick) in [ ('kernel-grsecurity-smp', 'smp'), | |
43 | ('kernel-xen0', 'xen0'), | |
44 | ('kernel-xenU', 'xenU') ]: | |
45 | tag = ktag.rsplit('-', 1)[1] | |
5e879406 ER |
46 | @@ -1036,7 +1036,7 @@ |
47 | version = ( tsmbr.version + '-' + tsmbr.release + tag) | |
48 | kernelVersions.append((version, nick)) | |
49 | ||
50 | - for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel'): | |
51 | + for tsmbr in self.ayum.tsInfo.matchNaevr(name='kernel-grsecurity'): | |
52 | version = ( tsmbr.version + '-' + tsmbr.release) | |
53 | kernelVersions.append((version, 'up')) | |
54 | ||
fdb2063c ER |
55 | --- anaconda-11.0.5/bootloader.py~ 2006-01-31 18:34:46.000000000 +0200 |
56 | +++ anaconda-11.0.5/bootloader.py 2006-05-25 00:14:22.269017091 +0300 | |
57 | @@ -145,7 +145,7 @@ | |
58 | return | |
59 | ||
60 | plainLabelUsed = 0 | |
61 | - defkern = "kernel" | |
62 | + defkern = "kernel-grsecurity" | |
63 | for (version, nick) in backend.kernelVersionList(): | |
64 | if plainLabelUsed: | |
65 | kernelList.append(("%s-%s" %(kernelLabel, nick), | |
66 | @@ -156,7 +156,7 @@ | |
67 | if nick in ("hypervisor", "guest"): # XXX: *sigh* inconsistent | |
68 | defkern = "kernel-xen-%s" %(nick,) | |
69 | elif nick != "up": | |
70 | - defkern = "kernel-%s" %(nick,) | |
71 | + defkern = "kernel-grsecurity-%s" %(nick,) | |
72 | plainLabelUsed = 1 | |
73 | ||
74 | f = open(instRoot + "/etc/sysconfig/kernel", "w+") |