[livecd-tools] Backport a fix for the basic video boot menu item

Bruno Wolff III bruno at fedoraproject.org
Tue Sep 14 03:41:38 UTC 2010


commit d7edf70b650e4dd9fe914d8f51b0f5361de8ebb2
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Sep 13 22:36:28 2010 -0500

    Backport a fix for the basic video boot menu item

 livecd-tools.spec |    7 ++++++-
 menulabel.patch   |   13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 4b753e2..e85fe8b 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 034
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/livecd
@@ -17,6 +17,7 @@ URL: http://git.fedorahosted.org/git/livecd
 Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
 Patch0: vesa.patch
 Patch1: regex.patch
+Patch2: menulabel.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: python-imgcreate = %{version}-%{release}
 Requires: mkisofs
@@ -62,6 +63,7 @@ like live image or appliances.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make
@@ -94,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Mon Sep 13 2010 Bruno Wolff III <bruno at wolff.to> - 034-5
+- Backport basic video menu label fix
+
 * Mon Sep 13 2010 Bruno Wolff III <bruno at wolff.to> - 034-4
 - Backport missing parts of the regex fix patch
 
diff --git a/menulabel.patch b/menulabel.patch
new file mode 100644
index 0000000..c921403
--- /dev/null
+++ b/menulabel.patch
@@ -0,0 +1,13 @@
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index e4e0c2e..9153e10 100644
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -519,7 +519,7 @@ menu hiddenrow 5
+                                            fslabel = self.fslabel,
+                                            isofstype = "auto",
+                                            liveargs = kern_opts,
+-                                           long = long,
++                                           long = long + " (Basic Video)",
+                                            short = "linux" + index,
+                                            basicvideo = basic,
+                                            xdriver = xdriver,


More information about the scm-commits mailing list