From f967c5201b31813ff93a3addacd0ab815ed96689 Mon Sep 17 00:00:00 2001
From: Konstantin Vlasov <konstantin.vlasov@rosalab.ru>
Date: Thu, 19 Mar 2015 15:01:22 +0300
Subject: [PATCH] Fixed: Boot menu OS name taken from build chroot instead of
 target system

---
 ...d-tools-21.1.fixed.boot.menu.os.name.patch | 22 +++++++++++++++++++
 livecd-tools.spec                             |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 livecd-tools-21.1.fixed.boot.menu.os.name.patch

diff --git a/livecd-tools-21.1.fixed.boot.menu.os.name.patch b/livecd-tools-21.1.fixed.boot.menu.os.name.patch
new file mode 100644
index 0000000..d1fd1b8
--- /dev/null
+++ b/livecd-tools-21.1.fixed.boot.menu.os.name.patch
@@ -0,0 +1,22 @@
+diff --git a/imgcreate/live.py b/imgcreate/live.py
+index 3613239..abd732a 100644
+--- a/imgcreate/live.py
++++ b/imgcreate/live.py
+@@ -587,7 +587,7 @@ menu separator
+                 long = "%s (%s)" % ("ROSA Desktop", kernel)
+ 
+             if os.path.exists(self._instroot + "/etc/system-release"):
+-                long = subprocess.check_output("echo -n `sed 's, release .*$,,g' /etc/system-release`", shell=True)
++                long = subprocess.check_output("echo -n `sed 's, release .*$,,g' " + self._instroot + "/etc/system-release`", shell=True)
+                 logging.warn('using LSB info for syslinux names')
+ 
+             # tell dracut not to ask for LUKS passwords or activate mdraid sets
+@@ -817,7 +817,7 @@ search --no-floppy --set=root -l '%(isolabel)s'
+         cfg = ""
+ 
+         if os.path.exists(self._instroot + "/etc/system-release"):
+-            long = subprocess.check_output("echo -n `sed 's, release .*$,,g' /etc/system-release`", shell=True)
++            long = subprocess.check_output("echo -n `sed 's, release .*$,,g' " + self._instroot + "/etc/system-release`", shell=True)
+         else:
+             long = self.product
+ 
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 313aa80..79bc412 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -5,7 +5,7 @@
 Summary: Tools for building live CDs
 Name: livecd-tools
 Version: 21.1
-Release: 16
+Release: 17
 Epoch: 1
 License: GPLv2
 Group: System/Base
@@ -31,6 +31,7 @@ Patch14: livecd-tools-21.1.shim.efi.renamed.patch
 Patch15: livecd-tools-21.1.secureboot.unsigned.kernel.patch
 Patch16: livecd-tools-21.1.exception.on.urpmi.fail.patch
 Patch17: livecd-tools-21.1.efi.grub.cfg.echo.patch
+Patch18: livecd-tools-21.1.fixed.boot.menu.os.name.patch
 
 Requires: python-imgcreate = %{epoch}:%{version}-%{release}
 Requires: mkisofs