grub: Use META_VOL_ID for @distro@ instead RELNAME if available

In menu you need the name of the distributiv. If not set, then we will be as before. Also corrected the selection of phrases for translation. Suggested-by: zerg@ See-also: ALT bug 39611, 39612.

grub: Use META_VOL_ID for @distro@ instead RELNAME if available
5c1239c9 · Anton Midyukov · 2a875c70 · 5c1239c9 · 5c1239c9 · 5c1239c9
Commit 5c1239c9 authored Jan 27, 2021 by Anton Midyukov
4 changed files
--- a/features.in/grub/cfg.in/20install2.cfg
+++ b/features.in/grub/cfg.in/20install2.cfg

 default='linux'

-menuentry $"Install @relname@" --hotkey 'i' --id 'linux' {
+menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
  echo $"Loading Linux vmlinuz$KFLAVOUR ..."
  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ @efi_bootargs@ lang=$lang
  echo $"Loading initial ramdisk ..."

--- a/features.in/grub/cfg.in/25install-vnc-connect.cfg
+++ b/features.in/grub/cfg.in/25install-vnc-connect.cfg

-menuentry $"VNC install @relname@ (edit to set server IP address)" --id 'vncconnect' {
+menuentry $"VNC install "'@distro@'$" (edit to set server IP address)" --id 'vncconnect' {
  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@ @efi_bootargs@ headless no_alt_virt_keyboard vncconnect=IP lang=$lang
  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
 }
--- a/features.in/grub/cfg.in/25install-vnc-listen.cfg
+++ b/features.in/grub/cfg.in/25install-vnc-listen.cfg

-menuentry $"VNC install @relname@ (edit to set password and connect here)" --id 'vncpasswd' {
+menuentry $"VNC install "'@distro@'$" (edit to set password and connect here)" --id 'vncpasswd' {
  linux@linux_suffix@ @boot_path@/vmlinuz$KFLAVOUR changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts @bootargs@  @efi_bootargs@ headless no_alt_virt_keyboard vncpassword=VNCPWD lang=$lang
  initrd@linux_suffix@ @boot_path@/full$KFLAVOUR.cz
 }

--- a/features.in/grub/generate.mk
+++ b/features.in/grub/generate.mk
@@ -51,7 +51,6 @@ all: debug timeout
 	@echo $(GRUB_FILES) > $(DSTDIR)/grub.list
 	@sed -i \
 		-e 's,@mkimage-profiles@,$(IMAGE_NAME),' \
-		-e 's,@relname@,$(RELNAME),g' \
 		$(DSTCFGS)

 # integerity check
@@ -64,10 +63,10 @@ timeout: distro
 	sed -i "s,@timeout@,$$TIMEOUT," $(DSTCFGS)

 distro: bootargs
-	@if [ -n "$(META_VOL_SET)" ]; then \
-		DISTRO="$(META_VOL_SET)"; \
+	@if [ -n "$(META_VOL_ID)" ]; then \
+		DISTRO="$(META_VOL_ID)"; \
 	else \
-		DISTRO="ALT"; \
+		DISTRO="$(RELNAME)"; \
 	fi; \
 	sed -i "s,@distro@,$$DISTRO," $(DSTCFGS)