mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-23 15:42:58 +00:00
Fixed: Boot menu OS name taken from build chroot instead of target system
This commit is contained in:
parent
2b779c2088
commit
f967c5201b
2 changed files with 24 additions and 1 deletions
22
livecd-tools-21.1.fixed.boot.menu.os.name.patch
Normal file
22
livecd-tools-21.1.fixed.boot.menu.os.name.patch
Normal file
|
@ -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
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
Summary: Tools for building live CDs
|
Summary: Tools for building live CDs
|
||||||
Name: livecd-tools
|
Name: livecd-tools
|
||||||
Version: 21.1
|
Version: 21.1
|
||||||
Release: 16
|
Release: 17
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System/Base
|
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
|
Patch15: livecd-tools-21.1.secureboot.unsigned.kernel.patch
|
||||||
Patch16: livecd-tools-21.1.exception.on.urpmi.fail.patch
|
Patch16: livecd-tools-21.1.exception.on.urpmi.fail.patch
|
||||||
Patch17: livecd-tools-21.1.efi.grub.cfg.echo.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: python-imgcreate = %{epoch}:%{version}-%{release}
|
||||||
Requires: mkisofs
|
Requires: mkisofs
|
||||||
|
|
Loading…
Add table
Reference in a new issue