Skip to content

M
mkimage-profiles
Commit cbfc3db8 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

syslinux: honour META_VOL_SET for boot menu

This trots along the TODO item on text branding and hopefully helps Michael Radyuk (torabora) with his feature request to tweak the installer's "Install ALT Linux" label; as an example, Simply will now offer to "Install Simply Linux".
parent 43d62dd9
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 2 deletions
features.in/slinux/config.mk
View file @ cbfc3db8
...@@ -13,6 +13,7 @@ use/slinux: use/x11/xfce use/x11/gdm2.20 ...@@ -13,6 +13,7 @@ use/slinux: use/x11/xfce use/x11/gdm2.20
@$(call add,THE_LISTS,slinux/network) @$(call add,THE_LISTS,slinux/network)
@$(call add,THE_LISTS,slinux/xfce) @$(call add,THE_LISTS,slinux/xfce)
@$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_LISTS,$(call tags,base l10n))
@$(call set,META_VOL_SET,Simply Linux)
use/slinux/full: use/isohybrid use/slinux use/systemd \ use/slinux/full: use/isohybrid use/slinux use/systemd \
use/firmware/wireless use/branding/complete \ use/firmware/wireless use/branding/complete \
......
features.in/syslinux/cfg.in/20install2.cfg
View file @ cbfc3db8
label linux label linux
menu label ^Install ALT Linux menu label ^Install @distro@
kernel alt0/vmlinuz kernel alt0/vmlinuz
append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@ append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@
......
features.in/syslinux/generate.mk
View file @ cbfc3db8
...@@ -54,7 +54,7 @@ all: debug timeout ...@@ -54,7 +54,7 @@ all: debug timeout
@echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list @echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list
# integerity check # integerity check
timeout: bootargs timeout: distro
@if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \ @if [ "$(SYSLINUX_TIMEOUT)" -ge 0 ] 2>/dev/null; then \
TIMEOUT="$(SYSLINUX_TIMEOUT)"; \ TIMEOUT="$(SYSLINUX_TIMEOUT)"; \
else \ else \
...@@ -62,6 +62,14 @@ timeout: bootargs ...@@ -62,6 +62,14 @@ timeout: bootargs
fi; \ fi; \
sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg sed -i "s,@timeout@,$$TIMEOUT," $(DSTDIR)/*.cfg
distro: bootargs
@if [ -n "$(META_VOL_SET)" ]; then \
DISTRO="$(META_VOL_SET)"; \
else \
DISTRO="ALT Linux"; \
fi; \
sed -i "s,@distro@,$$DISTRO," $(DSTDIR)/*.cfg
# pass over additional parameters, if any # pass over additional parameters, if any
bootargs: clean bootargs: clean
@if [ -n "$(STAGE2_BOOTARGS)" ]; then \ @if [ -n "$(STAGE2_BOOTARGS)" ]; then \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment