rpms
/
livecd-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Need to commit the patch as well.

This commit is contained in:
Bruno Wolff III 2010-09-13 21:12:23 -05:00
parent 983c635c53
commit a873a727a9
1 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
vesa.patch Normal file
View File

@ -0,0 +1,66 @@
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 1e0f117..e4e0c2e 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -452,24 +452,12 @@ menu hiddenrow 5
template = """label %(short)s
menu label %(long)s
kernel vmlinuz%(index)s
- append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s
-
-
- label %(short)s
- menu label %(long)s %(basicvideo)s
- kernel vmlinuz%(index)s
append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s
"""
else:
template = """label %(short)s
menu label %(long)s
kernel mboot.c32
- append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s --- initrd%(index)s.img
-
-
- label %(short)s
- menu label %(long)s %(basicvideo)s
- kernel mboot.c32
append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s --- initrd%(index)s.img
"""
return template % args
@@ -504,7 +492,7 @@ menu hiddenrow 5
# Basic video driver
basic = "system with basic video driver"
- xdriver = "xdriver=vesa"
+ xdriver = "xdriver=vesa nomodeset"
# tell dracut not to ask for LUKS passwords or activate mdraid sets
@@ -519,14 +507,25 @@ menu hiddenrow 5
liveargs = kern_opts,
long = long,
short = "linux" + index,
- basicvideo = basic,
- xdriver = xdriver,
+ basicvideo = "",
+ xdriver = "",
extra = "",
index = index)
if default:
cfg += "menu default\n"
+ cfg += self.__get_image_stanza(is_xen, isDracut,
+ fslabel = self.fslabel,
+ isofstype = "auto",
+ liveargs = kern_opts,
+ long = long,
+ short = "linux" + index,
+ basicvideo = basic,
+ xdriver = xdriver,
+ extra = "",
+ index = index)
+
if checkisomd5:
cfg += self.__get_image_stanza(is_xen, isDracut,
fslabel = self.fslabel,