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