| 1 |
slords |
1.1 |
--- booty-0.80.4/bootloaderInfo.py.ia64-vmm 2007-07-18 14:42:07.000000000 -0400 |
| 2 |
|
|
+++ booty-0.80.4/bootloaderInfo.py 2007-07-18 16:09:44.000000000 -0400 |
| 3 |
|
|
@@ -21,6 +21,7 @@ import crypt |
| 4 |
|
|
import random |
| 5 |
|
|
import shutil |
| 6 |
|
|
import string |
| 7 |
|
|
+import re |
| 8 |
|
|
|
| 9 |
|
|
from lilo import LiloConfigFile |
| 10 |
|
|
import rhpl |
| 11 |
|
|
@@ -323,6 +324,11 @@ class bootloaderInfo: |
| 12 |
|
|
|
| 13 |
|
|
initrd = booty.makeInitrd (kernelTag, instRoot) |
| 14 |
|
|
|
| 15 |
|
|
+ if version.endswith("xen0") or (version.endswith("xen") and not os.path.exists("/proc/xen")): |
| 16 |
|
|
+ hvFile = "%sxen.gz-%s" % (self.kernelLocation, |
| 17 |
|
|
+ re.sub(r'xen0?', '', version)) |
| 18 |
|
|
+ sl.addEntry("vmm", hvFile) |
| 19 |
|
|
+ |
| 20 |
|
|
sl.addEntry("label", label) |
| 21 |
|
|
if os.access (instRoot + initrd, os.R_OK): |
| 22 |
|
|
sl.addEntry("initrd", "%sinitrd%s.img" %(self.kernelLocation, |
| 23 |
|
|
@@ -341,8 +347,11 @@ class bootloaderInfo: |
| 24 |
|
|
append = "root=%s" %(realroot,) |
| 25 |
|
|
|
| 26 |
|
|
if len(append) > 0: |
| 27 |
|
|
- sl.addEntry('append', '"%s"' % (append,)) |
| 28 |
|
|
- |
| 29 |
|
|
+ if sl.getEntry("vmm") and (" "+append+" ").find(" -- ") == -1: |
| 30 |
|
|
+ sl.addEntry('append', '"-- %s"' %(append,)) |
| 31 |
|
|
+ else: |
| 32 |
|
|
+ sl.addEntry('append', '"%s"' %(append,)) |
| 33 |
|
|
+ |
| 34 |
|
|
lilo.addImage (sl) |
| 35 |
|
|
|
| 36 |
|
|
for (label, longlabel, device) in chainList: |
| 37 |
|
|
@@ -806,20 +815,14 @@ class x86BootloaderInfo(bootloaderInfo): |
| 38 |
|
|
# hypervisor case |
| 39 |
|
|
sermap = { "ttyS0": "com1", "ttyS1": "com2", |
| 40 |
|
|
"ttyS2": "com3", "ttyS3": "com4" } |
| 41 |
|
|
+ hvs = "" |
| 42 |
|
|
if self.serial and sermap.has_key(self.serialDevice) and \ |
| 43 |
|
|
self.serialOptions: |
| 44 |
|
|
- hvs = "%s=%s" %(sermap[self.serialDevice], |
| 45 |
|
|
+ hvs = " %s=%s" %(sermap[self.serialDevice], |
| 46 |
|
|
self.serialOptions) |
| 47 |
|
|
- else: |
| 48 |
|
|
- hvs = "" |
| 49 |
|
|
- if version.endswith("xen0"): |
| 50 |
|
|
- hvFile = "%sxen.gz-%s %s" %(cfPath, |
| 51 |
|
|
- version.replace("xen0", ""), |
| 52 |
|
|
- hvs) |
| 53 |
|
|
- else: |
| 54 |
|
|
- hvFile = "%sxen.gz-%s %s" %(cfPath, |
| 55 |
|
|
- version.replace("xen", ""), |
| 56 |
|
|
- hvs) |
| 57 |
|
|
+ hvFile = "%sxen.gz-%s%s" % (cfPath, |
| 58 |
|
|
+ re.sub(r'xen0?', '', version), |
| 59 |
|
|
+ hvs) |
| 60 |
|
|
f.write('\tkernel %s\n' %(hvFile,)) |
| 61 |
|
|
f.write('\tmodule %s ro%s' %(kernelFile, realroot)) |
| 62 |
|
|
if self.args.get(): |
Parent Directory
| 
Revision Log
| 
Revision Graph
