From 102aa3851d73cc8aa1a88dbdaf9830b719b60853 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 4 Nov 2011 15:15:09 +0200 Subject: [PATCH] syslinux *.cfg: replace banner Back then I didn't come up with anything smarter than "mkimage-profiles 2.0" (with my tongue in a cheek), but as m-p has grown up to 0.4 it's time to fix this. When done properly, all of the string should be brandable (with some sane default value inheriting from image name), but let's do it at least bit by bit. --- features.in/syslinux/README | 3 ++- features.in/syslinux/cfg.in/00gfxboot.cfg | 2 +- features.in/syslinux/cfg.in/00menu.cfg | 2 +- features.in/syslinux/cfg.in/00prompt.cfg | 2 +- features.in/syslinux/cfg.in/00vesamenu.cfg | 2 +- features.in/syslinux/generate.mk | 4 +++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/features.in/syslinux/README b/features.in/syslinux/README index 6923974b..43ed331d 100644 --- a/features.in/syslinux/README +++ b/features.in/syslinux/README @@ -23,4 +23,5 @@ TODO: может потребоваться обобщение механизма генерации с учётом многоуровневых меню и включаемых файлов (которыми лучше не злоупотреблять -из соображений скорости инициализации загрузчика). +из соображений скорости инициализации загрузчика); требуется обеспечить +брендирование заголовков. diff --git a/features.in/syslinux/cfg.in/00gfxboot.cfg b/features.in/syslinux/cfg.in/00gfxboot.cfg index 9d33acf2..327d3110 100644 --- a/features.in/syslinux/cfg.in/00gfxboot.cfg +++ b/features.in/syslinux/cfg.in/00gfxboot.cfg @@ -1,3 +1,3 @@ ui gfxboot bootlogo message -menu title mkimage-profiles 2.0 +menu title ALT Linux (@mkimage-profiles@) prompt 0 diff --git a/features.in/syslinux/cfg.in/00menu.cfg b/features.in/syslinux/cfg.in/00menu.cfg index 702e7ee8..0733ec57 100644 --- a/features.in/syslinux/cfg.in/00menu.cfg +++ b/features.in/syslinux/cfg.in/00menu.cfg @@ -1,3 +1,3 @@ ui menu.c32 -menu title mkimage-profiles 2.0 +menu title ALT Linux (@mkimage-profiles@) prompt 0 diff --git a/features.in/syslinux/cfg.in/00prompt.cfg b/features.in/syslinux/cfg.in/00prompt.cfg index bea660b3..2e9fcb76 100644 --- a/features.in/syslinux/cfg.in/00prompt.cfg +++ b/features.in/syslinux/cfg.in/00prompt.cfg @@ -1,2 +1,2 @@ -say mkimage-profiles 2.0 +say ALT Linux (@mkimage-profiles@) prompt 1 diff --git a/features.in/syslinux/cfg.in/00vesamenu.cfg b/features.in/syslinux/cfg.in/00vesamenu.cfg index 9f2b2d6c..8301b75e 100644 --- a/features.in/syslinux/cfg.in/00vesamenu.cfg +++ b/features.in/syslinux/cfg.in/00vesamenu.cfg @@ -1,3 +1,3 @@ ui vesamenu -menu title mkimage-profiles 2.0 +menu title ALT Linux (@mkimage-profiles@) prompt 0 diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk index a458ef38..ede97d12 100644 --- a/features.in/syslinux/generate.mk +++ b/features.in/syslinux/generate.mk @@ -45,9 +45,11 @@ cfg = $(wildcard cfg.in/??$(1).cfg) # # arguments get evaluated before recipe body execution thus prep all: prep debug - cp -pLt $(DSTDIR) -- $(sort \ + @cp -pLt $(DSTDIR) -- $(sort \ $(foreach C,$(SYSLINUX_CFG),$(call cfg,$(C))) \ $(foreach M,$(SYSLINUX_MODULES),$(call cfg,$(M)))) + @### proper text branding should be implemented + @sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg @echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list @echo $(SYSLINUX_FILES) > $(DSTDIR)/files.list @echo $(BOOTLOADER) > $(DSTDIR)/bootloader