Djam/livecd-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/livecd-tools.git synced 2025-02-24 08:02:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4 from betcher_/livecd-tools:rosa2021.1

Browse source 
Изменения по предложениям Владимира (keleg)
This commit is contained in:
keleg 2021-09-25 11:48:27 +00:00
commit 2ea14d906b
7 changed files with 132 additions and 342 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

297
0013-ROSA-theme-and-config-of-bootloaders.patch
View file

@ -1,297 +0,0 @@
From ff2a9a617a73e316979ac15883062c9bc2b46ebc Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Thu, 28 May 2020 14:40:47 +0300
Subject: [PATCH] ROSA theme and config of bootloaders
* ROSA theme for syslinux
* ROSA theme for grub2
* add start up in basic graphics mode without plymouth
* move booting from local drive to end of menu and make it not default
* remove ISO title from autoboot to workaround syslinux bug: when that line is too long, every second a new line is printed instead of rewriting the existing line (https://bugzilla.rosalinux.ru/show_bug.cgi?id=11492)
Based on:
* livecd-tools-21.1.efi.grub.cfg.patch
* livecd-tools-21.1.urpmi.patch
---
imgcreate/live.py | 137 ++++++++++++++++++++++++++--------------------
1 file changed, 77 insertions(+), 60 deletions(-)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 9447640..98cdbf7 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -434,12 +434,12 @@ class x86LiveImageCreator(LiveImageCreatorBase):
def __copy_syslinux_background(self, isodest):
background_path = self._instroot + \
- "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg"
+ "/usr/share/gfxboot/themes/Rosa-EE/splash.jpg"
if not os.path.exists(background_path):
- # fallback to F13 location
+ # fallback to default Fedora/RH location
background_path = self._instroot + \
- "/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg"
+ "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg"
if not os.path.exists(background_path):
return False
@@ -493,30 +493,27 @@ class x86LiveImageCreator(LiveImageCreatorBase):
default %(menu)s
timeout %(timeout)d
menu background %(background)s
-menu autoboot Starting %(title)s in # second{,s}. Press any key to interrupt.
+menu autoboot Starting in # second{,s}. Press any key to interrupt.
-menu clear
+#menu clear
menu title %(title)s
-menu vshift 8
-menu rows 18
-menu margin 8
+#menu vshift 8
+#menu rows 18
+#menu margin 8
#menu hidden
-menu helpmsgrow 15
-menu tabmsgrow 13
-
-menu color border * #00000000 #00000000 none
-menu color sel 0 #ffffffff #00000000 none
-menu color title 0 #ff7ba3d0 #00000000 none
-menu color tabmsg 0 #ff3a6496 #00000000 none
-menu color unsel 0 #84b8ffff #00000000 none
-menu color hotsel 0 #84b8ffff #00000000 none
-menu color hotkey 0 #ffffffff #00000000 none
-menu color help 0 #ffffffff #00000000 none
-menu color scrollbar 0 #ffffffff #ff355594 none
-menu color timeout 0 #ffffffff #00000000 none
-menu color timeout_msg 0 #ffffffff #00000000 none
-menu color cmdmark 0 #84b8ffff #00000000 none
-menu color cmdline 0 #ffffffff #00000000 none
+#menu helpmsgrow 15
+#menu tabmsgrow 13
+
+menu color border 0 #ffffffff #00000000
+menu color sel 7 #ffffffff #ff000000
+menu color title 0 #ffffffff #00000000
+menu color tabmsg 0 #ffffffff #00000000
+menu color unsel 0 #ffffffff #00000000
+menu color hotsel 0 #ff000000 #ffffffff
+menu color hotkey 7 #ffffffff #ff000000
+menu color timeout_msg 0 #ffffffff #00000000
+menu color timeout 0 #ffffffff #00000000
+menu color cmdline 0 #ffffffff #00000000
menu tabmsg Press Tab for full configuration options on menu items.
menu separator
@@ -597,7 +594,7 @@ menu separator
liveargs = kern_opts,
long = "Start " + long + " in ^basic graphics mode.",
short = "basic" + index,
- extra = "nomodeset",
+ extra = "nomodeset xdriver=vesa nokmsboot plymouth.enable=0",
help = "Try this option out if you're having trouble starting.",
index = index))
@@ -721,8 +718,10 @@ menu end
# XXX gcdia32.efi does not exist yet in ROSA
("/boot/efi/EFI/*/gcdia32.efi", "/EFI/BOOT/grubia32.efi", False),
("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
+ ("/boot/grub2/themes/rosa/*", "/EFI/BOOT/themes/rosa/", True),
]
makedirs(isodir+"/EFI/BOOT/fonts/")
+ makedirs(isodir+"/EFI/BOOT/themes/rosa/")
for src, dest, required in files:
src_glob = glob.glob(self._instroot+src)
if not src_glob:
@@ -736,28 +735,38 @@ menu end
def __get_basic_efi_config(self, **args):
return """
-set default="1"
+set default="0"
function load_video {
insmod efi_gop
insmod efi_uga
- insmod video_bochs
- insmod video_cirrus
- insmod all_video
}
load_video
set gfxpayload=keep
insmod gzio
insmod part_gpt
+insmod part_msdos
insmod ext2
+insmod iso9660
+
+set gfxmode=1024x768,1024x600,800x600,640x480
+insmod gfxterm
+insmod gettext
+terminal_output gfxterm
+insmod gfxmenu
+loadfont /EFI/BOOT/themes/rosa/dejavu_sans_bold_14.pf2
+loadfont /EFI/BOOT/themes/rosa/dejavu_sans_mono_11.pf2
+loadfont /EFI/BOOT/themes/rosa/terminal_font_11.pf2
+insmod png
+set theme=/EFI/BOOT/themes/rosa/theme.txt
+export theme
+background_image -m stretch /EFI/BOOT/themes/rosa/terminal_background.png
set timeout=%(timeout)d
-### END /etc/grub.d/00_header ###
search --no-floppy --set=root -l '%(isolabel)s'
-### BEGIN /etc/grub.d/10_linux ###
""" %args
def __get_efi_image_stanza(self, **args):
@@ -765,7 +774,7 @@ search --no-floppy --set=root -l '%(isolabel)s'
args["rootlabel"] = "live:LABEL=%(fslabel)s" % args
else:
args["rootlabel"] = "CDLABEL=%(fslabel)s" % args
- return """menuentry '%(long)s' --class fedora --class gnu-linux --class gnu --class os {
+ return """menuentry '%(long)s' --class rosa --class gnu-linux --class gnu --class os {
linuxefi /isolinux/vmlinuz%(index)s root=%(rootlabel)s %(liveargs)s %(extra)s
initrdefi /isolinux/initrd%(index)s.img
}
@@ -783,25 +792,24 @@ 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 += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
long = "Start " + self.product,
- extra = "", index = index)
+ extra = "rhgb splash=silent logo.nologo", index = index)
+ cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
+ liveargs = kernel_options,
+ long = "Start " + self.product + " in basic graphics mode",
+ extra = "nomodeset plymouth.enable=0", index = index)
if checkisomd5:
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
long = "Test this media & start " + self.product,
extra = "rd.live.check",
index = index)
- cfg += """
-submenu 'Troubleshooting -->' {
-"""
- cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
- liveargs = kernel_options,
- long = "Start " + self.product + " in basic graphics mode",
- extra = "nomodeset", index = index)
-
- cfg+= """}
+ cfg += """menuentry 'Boot from local drive' {
+ reboot
+}
"""
break
@@ -832,8 +840,6 @@ submenu 'Troubleshooting -->' {
# add macboot data
subprocess.call(["mkefiboot", "-a", isodir + "/EFI/BOOT",
isodir + "/isolinux/macboot.img", "-l", self.product,
- "-n", "/usr/share/pixmaps/bootloader/fedora-media.vol",
- "-i", "/usr/share/pixmaps/bootloader/fedora.icns",
"-p", self.product])
def _configure_bootloader(self, isodir):
@@ -1103,8 +1109,10 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
files = [("/boot/efi/EFI/*/shim%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
("/usr/share/grub2-efi/grubcd.efi", "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
+ ("/boot/grub2/themes/rosa/*", "/EFI/BOOT/themes/rosa/", True),
]
makedirs(isodir+"/EFI/BOOT/fonts/")
+ makedirs(isodir+"/EFI/BOOT/themes/rosa/")
for src, dest, required in files:
src_glob = glob.glob(self._instroot+src)
if not src_glob:
@@ -1117,29 +1125,40 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
return fail
def __get_basic_efi_config(self, **args):
+ # code is uselessly (?) duplicated, https://github.com/livecd-tools/livecd-tools/issues/195
return """
-set default="1"
+set default="0"
function load_video {
insmod efi_gop
insmod efi_uga
- insmod video_bochs
- insmod video_cirrus
- insmod all_video
}
load_video
set gfxpayload=keep
insmod gzio
insmod part_gpt
+insmod part_msdos
insmod ext2
+insmod iso9660
+
+set gfxmode=1024x768,1024x600,800x600,640x480
+insmod gfxterm
+insmod gettext
+terminal_output gfxterm
+insmod gfxmenu
+loadfont /EFI/BOOT/themes/rosa/dejavu_sans_bold_14.pf2
+loadfont /EFI/BOOT/themes/rosa/dejavu_sans_mono_11.pf2
+loadfont /EFI/BOOT/themes/rosa/terminal_font_11.pf2
+insmod png
+set theme=/EFI/BOOT/themes/rosa/theme.txt
+export theme
+background_image -m stretch /EFI/BOOT/themes/rosa/terminal_background.png
set timeout=%(timeout)d
-### END /etc/grub.d/00_header ###
search --no-floppy --set=root -l '%(isolabel)s'
-### BEGIN /etc/grub.d/10_linux ###
""" %args
def __get_efi_image_stanza(self, **args):
@@ -1164,22 +1183,20 @@ search --no-floppy --set=root -l '%(isolabel)s'
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
long = "Start " + self.product,
- extra = "", index = index)
+ extra = "rhgb splash=silent logo.nologo", index = index)
+ cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
+ liveargs = kernel_options,
+ long = "Start " + self.product + " in basic graphics mode",
+ extra = "nomodeset plymouth.enable=0", index = index)
if checkisomd5:
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
long = "Test this media & start " + self.product,
extra = "rd.live.check",
index = index)
- cfg += """
-submenu 'Troubleshooting -->' {
-"""
- cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
- liveargs = kernel_options,
- long = "Start " + self.product + " in basic graphics mode",
- extra = "nomodeset", index = index)
-
- cfg+= """}
+ cfg += """menuentry 'Boot from local drive' {
+ reboot
+}
"""
break
--
2.31.1

25
es_ES.po Normal file
View file

@ -0,0 +1,25 @@
msgid ""
msgstr ""
"Last-Translator: Betkher Alexandr <a.betkher@rosalinux.ru>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"Language-Team: \n"
"X-Generator: Poedit 2.2.3\n"
msgid "Start "
msgstr "Ejecuta "
msgid "Start & install "
msgstr "Iniciar e instalar "
msgid "Reboot"
msgstr "Reiniciar"
msgid "Install "
msgstr "Instalar "

2
fr_FR.po
View file

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Last-Translator: Betlher Alexandr <a.betkher@rosalinux.ru>\n"
"Language: ru\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

111
grub2-everywhere.diff
View file

@ -1,5 +1,5 @@
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 9447640..9faae12 100644
index 9447640..bae29b4 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -234,8 +234,7 @@ class LiveImageCreatorBase(LoopImageCreator):
@ -36,7 +36,7 @@ index 9447640..9faae12 100644
options += ["-rational-rock", "-joliet", "-volid", self.fslabel]
return options
@@ -398,61 +394,94 @@ class x86LiveImageCreator(LiveImageCreatorBase):
@@ -398,61 +394,96 @@ class x86LiveImageCreator(LiveImageCreatorBase):
def _get_isolinux_stanzas(self, isodir):
return ""
@ -101,8 +101,10 @@ index 9447640..9faae12 100644
+for langstr in "en_US=English" %s ; do
+ regexp -s 2:langname -s 1:langcode '(.*)=(.*)' "$langstr"
+ menuentry "${langname}" "$langcode" {
+ lang="$2"
+ lang=$2
+ lang_utf="${2}.UTF-8"
+ export lang
+ export lang_utf
+ configfile ${prefix}/grub.cfg
+}
+done
@ -182,7 +184,7 @@ index 9447640..9faae12 100644
isDracut = False
if os.path.exists(self._instroot + "/usr/bin/dracut"):
@@ -461,17 +490,17 @@ class x86LiveImageCreator(LiveImageCreatorBase):
@@ -461,17 +492,17 @@ class x86LiveImageCreator(LiveImageCreatorBase):
# FIXME: Implement a better check for how the initramfs is named...
if os.path.exists(bootdir + "/initramfs-" + version + ".img"):
shutil.copyfile(bootdir + "/initramfs-" + version + ".img",
@ -203,7 +205,7 @@ index 9447640..9faae12 100644
is_xen = True
return (is_xen, isDracut)
@@ -488,136 +517,16 @@ class x86LiveImageCreator(LiveImageCreatorBase):
@@ -488,209 +519,38 @@ class x86LiveImageCreator(LiveImageCreatorBase):
return False
@ -240,13 +242,13 @@ index 9447640..9faae12 100644
-menu tabmsg Press Tab for full configuration options on menu items.
-menu separator
-""" % args
-
- def __get_image_stanza(self, is_xen, isDracut, **args):
- if isDracut:
- args["rootlabel"] = "live:CDLABEL=%(fslabel)s" % args
- else:
- args["rootlabel"] = "CDLABEL=%(fslabel)s" % args
-
- if not is_xen:
- template = """label %(short)s
- menu label %(long)s
@ -338,11 +340,40 @@ index 9447640..9faae12 100644
index = str(int(index) + 1)
- return (linux, basic, check)
+ # def __get_memtest_stanza(self, isodir):
+ # memtest = glob.glob(self._instroot + "/boot/memtest86*")
+ # if not memtest:
+ # return ""
- def __get_memtest_stanza(self, isodir):
- memtest = glob.glob(self._instroot + "/boot/memtest86*")
- if not memtest:
- return ""
+ # shutil.copyfile(memtest[0], isodir + "/isolinux/memtest")
- shutil.copyfile(memtest[0], isodir + "/isolinux/memtest")
-
def __get_memtest_stanza(self, isodir):
memtest = glob.glob(self._instroot + "/boot/memtest86*")
if not memtest:
@@ -640,57 +549,6 @@ menu separator
- return """label memtest
- menu label Run a ^memory test.
- text help
- If your system is having issues, an problem with your
- system's memory may be the cause. Use this utility to
- see if the memory is working correctly.
- endtext
- kernel memtest
-"""
+ # return """label memtest
+ # menu label Run a ^memory test.
+ # text help
+ # If your system is having issues, an problem with your
+ # system's memory may be the cause. Use this utility to
+ # see if the memory is working correctly.
+ # endtext
+ # kernel memtest
+# """
def __get_local_stanza(self, isodir):
return """label local
menu label Boot from ^local drive
localboot 0xffff
"""
@ -400,7 +431,7 @@ index 9447640..9faae12 100644
@property
def efiarch(self):
if not self._efiarch:
@@ -716,13 +574,16 @@ menu end
@@ -716,13 +576,16 @@ menu end
files = [("/boot/efi/EFI/*/shim%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
# XXX grubcd.efi probably should contain EFI arch in its name to make 32 bit EFI possible on x86_64 (?)
# Or will 32 bit shim be able to load 64 bit grub?
@ -418,7 +449,7 @@ index 9447640..9faae12 100644
for src, dest, required in files:
src_glob = glob.glob(self._instroot+src)
if not src_glob:
@@ -736,28 +597,67 @@ menu end
@@ -736,28 +599,69 @@ menu end
def __get_basic_efi_config(self, **args):
return """
@ -459,6 +490,7 @@ index 9447640..9faae12 100644
+set additional=$"Additional:"
+set backToMain=$"Back to main menu"
+set loading=$"Loading "
+set backToLang=$"Back to lang menu"
+
+export start
+export startInstall
@ -471,6 +503,7 @@ index 9447640..9faae12 100644
+export additional
+export backToMain
+export loading
+export backToLang
+
+terminal_output gfxterm
+insmod gfxmenu
@ -493,7 +526,7 @@ index 9447640..9faae12 100644
""" %args
def __get_efi_image_stanza(self, **args):
@@ -765,11 +665,40 @@ search --no-floppy --set=root -l '%(isolabel)s'
@@ -765,11 +669,41 @@ search --no-floppy --set=root -l '%(isolabel)s'
args["rootlabel"] = "live:LABEL=%(fslabel)s" % args
else:
args["rootlabel"] = "CDLABEL=%(fslabel)s" % args
@ -501,7 +534,7 @@ index 9447640..9faae12 100644
- linuxefi /isolinux/vmlinuz%(index)s root=%(rootlabel)s %(liveargs)s %(extra)s
- initrdefi /isolinux/initrd%(index)s.img
+ return """menuentry "%(long)s" --class rosa --class gnu-linux --class gnu --class os {
+ linux /vmlinuz%(index)s root=%(rootlabel)s %(liveargs)s %(extra)s lang=$lang
+ linux /vmlinuz%(index)s root=%(rootlabel)s %(liveargs)s %(extra)s lang=$lang inst.lang=$lang_utf
+ echo "$loading /vmlinuz%(index)s..."
+ initrd /initrd%(index)s.img
+ echo "$loading /initrd%(index)s.img..."
@ -523,8 +556,9 @@ index 9447640..9faae12 100644
+ print(f"Msgfmt for {po} file - Failed")
+ avaliable_locales = list(map(lambda locale: locale.split('.')[0],
+ os.listdir(isodir + '/EFI/BOOT/locale')))
+ known_locales = [ "ru_RU=Russian", "it_IT=Italian",
+ "de_DE=German", "fr_FR=French" ]
+ known_locales = [ "ru_RU=Русский", "it_IT=italiano",
+ "de_DE=Deutsch ", "fr_FR=Français",
+ "pt_PT=Português", "es_ES=Español" ]
+ locales_str = ''
+ for l in known_locales:
+ for a in avaliable_locales:
@ -537,7 +571,7 @@ index 9447640..9faae12 100644
def __get_efi_image_stanzas(self, isodir, name):
# FIXME: this only supports one kernel right now...
@@ -783,32 +712,66 @@ search --no-floppy --set=root -l '%(isolabel)s'
@@ -783,32 +717,67 @@ 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
@ -550,11 +584,6 @@ index 9447640..9faae12 100644
+ extra = "rhgb splash=silent logo.nologo", index = index)
+
+
+ cfg += """menuentry "Language: $lang " --hotkey 'f2' --id 'lang' {
+ configfile ${prefix}/lang.cfg
+}
+
+"""
+
+ cfg += r"""submenu "$additional " --id additional {
+"""
@ -570,16 +599,16 @@ index 9447640..9faae12 100644
-submenu 'Troubleshooting -->' {
-"""
+ index = index)
+
+ #cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
+ # liveargs = kernel_options,
+ # long = "$start " + self.product + " $basicMode",
+ # extra = "nomodeset plymouth.enable=0 noapic acpi=off loglevel=5 vga=788", index = index)
+
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
- long = "Start " + self.product + " in basic graphics mode",
- extra = "nomodeset", index = index)
+ long = "$start " + self.product + " $basicMode",
+ extra = "nomodeset plymouth.enable=0 noapic acpi=off loglevel=5", index = index)
+
+ cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
+ liveargs = kernel_options,
+ long = "$installer " + self.product,
+ extra = "systemd.unit=anaconda.target ", index = index)
+
@ -592,7 +621,8 @@ index 9447640..9faae12 100644
+ cfg += """menuentry "$reboot" {
+ reboot
+}
+
- cfg+= """}
+if test "$bootis" == 'UEFI:' ; then
+menuentry "$rebootToEfi" {
+ fwsetup
@ -601,12 +631,17 @@ index 9447640..9faae12 100644
+menuentry "$backToMain" {
+ configfile ${prefix}/grub.cfg
+}
- cfg+= """}
+
+}
"""
break
-
- break
+ cfg += """menuentry "$backToLang " --hotkey 'f2' --id 'lang' {
+ configfile ${prefix}/lang.cfg
+}
+"""
+
+ break
return cfg
def _configure_efi_bootloader(self, isodir):
@ -615,7 +650,7 @@ index 9447640..9faae12 100644
if self.__copy_efi_files(isodir):
shutil.rmtree(isodir + "/EFI")
logging.warning("Failed to copy EFI files, no EFI Support will be included.")
@@ -828,17 +791,13 @@ submenu 'Troubleshooting -->' {
@@ -828,17 +797,13 @@ submenu 'Troubleshooting -->' {
isodir + "/EFI/BOOT/BOOT.EFI")
def _generate_efiboot(self, isodir):
@ -637,7 +672,7 @@ index 9447640..9faae12 100644
class ppcLiveImageCreator(LiveImageCreatorBase):
def _get_xorrisofs_options(self, isodir):
@@ -962,15 +921,15 @@ timeout=%(timeout)d
@@ -962,15 +927,15 @@ timeout=%(timeout)d
default=linux
image=/ppc/ppc64/vmlinuz
@ -660,7 +695,7 @@ index 9447640..9faae12 100644
""" % args
f = open(isodir + "/etc/yaboot.conf", "w")
@@ -1103,8 +1062,10 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
@@ -1103,8 +1068,10 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
files = [("/boot/efi/EFI/*/shim%s.efi" % (self.efiarch.lower(),), "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,), True),
("/usr/share/grub2-efi/grubcd.efi", "/EFI/BOOT/grub%s.efi" % (self.efiarch.lower(),), True),
("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/", True),
@ -671,7 +706,7 @@ index 9447640..9faae12 100644
for src, dest, required in files:
src_glob = glob.glob(self._instroot+src)
if not src_glob:
@@ -1117,36 +1078,47 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
@@ -1117,36 +1084,47 @@ class aarch64LiveImageCreator(LiveImageCreatorBase):
return fail
def __get_basic_efi_config(self, **args):
@ -727,7 +762,7 @@ index 9447640..9faae12 100644
}
""" %args
@@ -1164,22 +1136,20 @@ search --no-floppy --set=root -l '%(isolabel)s'
@@ -1164,22 +1142,20 @@ search --no-floppy --set=root -l '%(isolabel)s'
cfg += self.__get_efi_image_stanza(fslabel = self.fslabel,
liveargs = kernel_options,
long = "Start " + self.product,

9
livecd-tools.spec
View file

@ -21,6 +21,8 @@ Source2: it_IT.po
Source3: fr_FR.po
Source4: de_DE.po
Source5: ru_RU.po
Source6: es_ES.po
Source7: pt_PT.po
# Git tree with patches: https://github.com/mikhailnov/livecd-tools/tree/rosa-v28.2
@ -77,16 +79,13 @@ Requires: parted
Requires: util-linux
Requires: dosfstools
Requires: e2fsprogs
%ifarch %{ix86} %{x86_64} aarch64
%ifarch aarch64
Requires: mkefiboot
%endif
Requires: rsync
%ifarch %{ix86} %{x86_64} ppc ppc64
Requires: hfsplus-tools
%endif
%ifarch %{ix86} %{x86_64}
Requires: syslinux
%endif
%ifarch ppc
Requires: yaboot
%endif
@ -154,7 +153,7 @@ patch -p1 < %{SOURCE1}
%make_install PYTHON=python3
mkdir -p %{buildroot}%{_datadir}/%{name}/grub2/locales
for po in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} ; do
for po in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do
msgfmt $po -o %{buildroot}%{_datadir}/%{name}/grub2/locales/"$(echo $(basename $po) |sed 's/.po$/.mo/')"
done

25
pt_PT.po Normal file
View file

@ -0,0 +1,25 @@
msgid ""
msgstr ""
"Last-Translator: Betkher Alexandr <a.betkher@rosalinux.ru>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
"Language-Team: \n"
"X-Generator: Poedit 2.2.3\n"
msgid "Start "
msgstr "Iniciar "
msgid "Start & install "
msgstr "Iniciar e instalar "
msgid "Reboot"
msgstr "reinício"
msgid "Install "
msgstr "instalar "

5
ru_RU.po
View file

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Last-Translator: Betkher Alexandr <a.betkher@rosalinux.ru>\n"
"Language: de\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -46,3 +46,6 @@ msgstr "Назад в главное меню"
msgid "Loading "
msgstr "Загружается "
msgid "Back to lang menu"
msgstr "Назад к выбору языка"