mirror of
https://abf.rosa.ru/djam/livecd-tools.git
synced 2025-02-24 08:02:58 +00:00
48506e264e
```
Traceback (most recent call last):
File "/usr/bin/livecd-creator", line 258, in <module>
sys.exit(main())
File "/usr/bin/livecd-creator", line 232, in main
creator.configure()
File "/usr/lib/python3.8/site-packages/imgcreate/creator.py", line 802, in configure
self._create_bootconfig()
File "/usr/lib/python3.8/site-packages/imgcreate/live.py", line 259, in _create_bootconfig
self._configure_bootloader(self.__ensure_isodir())
File "/usr/lib/python3.8/site-packages/imgcreate/live.py", line 852, in _configure_bootloader
self._configure_efi_bootloader(isodir)
File "/usr/lib/python3.8/site-packages/imgcreate/live.py", line 838, in _configure_efi_bootloader
cfg += self.__get_efi_image_stanzas(isodir, self.name)
File "/usr/lib/python3.8/site-packages/imgcreate/live.py", line 815, in __get_efi_image_stanzas
long = "Start " + long,
TypeError: can only concatenate str (not "bytes") to str
```
57 lines
2.3 KiB
Diff
57 lines
2.3 KiB
Diff
From cf8fde7dd772cbe13cf232098314d04416f8a3de Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
|
|
Date: Thu, 28 May 2020 14:51:06 +0300
|
|
Subject: [PATCH] Add start up in basic graphics mode without plymouth, move
|
|
booting from local drive to end of menu and make it not default
|
|
|
|
---
|
|
imgcreate/live.py | 20 ++++++++------------
|
|
1 file changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
index 181353c..6226440 100644
|
|
--- a/imgcreate/live.py
|
|
+++ b/imgcreate/live.py
|
|
@@ -747,7 +747,7 @@ menu end
|
|
|
|
def __get_basic_efi_config(self, **args):
|
|
return """
|
|
-set default="1"
|
|
+set default="0"
|
|
|
|
function load_video {
|
|
insmod efi_gop
|
|
@@ -809,23 +809,19 @@ search --no-floppy --set=root -l '%(isolabel)s'
|
|
# we don't support xen kernels
|
|
if os.path.exists("%s/EFI/BOOT/xen%d.gz" %(isodir, index)):
|
|
continue
|
|
- cfg += """menuentry 'Boot from local drive' {
|
|
- reboot
|
|
-}
|
|
-"""
|
|
+
|
|
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
|
|
liveargs = kernel_options,
|
|
long = "Start " + self.product,
|
|
extra = "rhgb splash=silent logo.nologo", index = index)
|
|
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
|
|
liveargs = kernel_options,
|
|
- long = "Install " + self.product,
|
|
- extra = "install rhgb splash=silent logo.nologo", index = index)
|
|
- cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
|
|
- liveargs = kernel_options,
|
|
- long = "Install " + self.product + " in basic graphics mode",
|
|
- extra = "install nomodeset plymouth.enable=0", index = index)
|
|
-
|
|
+ long = "Start " + self.product + "in basic graphics mode",
|
|
+ extra = "nomodeset plymouth.enable=0", index = index)
|
|
+ cfg += """menuentry 'Boot from local drive' {
|
|
+ reboot
|
|
+}
|
|
+"""
|
|
break
|
|
|
|
return cfg
|
|
--
|
|
2.25.1
|
|
|