[livecd-tools/f14/master] Need to commit the patch as well.

Bruno Wolff III bruno at fedoraproject.org
Tue Sep 14 02:17:17 UTC 2010


commit a873a727a97f759009c18ff9af415133654d4598
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Sep 13 21:12:23 2010 -0500

    Need to commit the patch as well.

 vesa.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/vesa.patch b/vesa.patch
new file mode 100644
index 0000000..8afcfd9
--- /dev/null
+++ b/vesa.patch
@@ -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,


More information about the scm-commits mailing list