diff --git a/conf.d/test.mk b/conf.d/test.mk index c33830b7..f5a8ac08 100644 --- a/conf.d/test.mk +++ b/conf.d/test.mk @@ -25,6 +25,9 @@ distro/live-gns3: distro/live-icewm distro/server-systemd: distro/server-mini use/systemd @$(call set,KFLAVOURS,std-def) +distro/server-test: distro/server-mini + @$(call set,MENUITEM,TeSt-SeRVer) + # tiny network-only server-ovz installer (stage2 comes over net too) distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \ use/syslinux/ui/menu use/syslinux/localboot.cfg use/memtest diff --git a/features.in/syslinux/cfg.in/01gfxboot.cfg b/features.in/syslinux/cfg.in/01gfxboot.cfg index 327d3110..7ec03d39 100644 --- a/features.in/syslinux/cfg.in/01gfxboot.cfg +++ b/features.in/syslinux/cfg.in/01gfxboot.cfg @@ -1,3 +1,3 @@ ui gfxboot bootlogo message -menu title ALT Linux (@mkimage-profiles@) +menu title @menuitem@ prompt 0 diff --git a/features.in/syslinux/cfg.in/01menu.cfg b/features.in/syslinux/cfg.in/01menu.cfg index 0733ec57..192626b4 100644 --- a/features.in/syslinux/cfg.in/01menu.cfg +++ b/features.in/syslinux/cfg.in/01menu.cfg @@ -1,3 +1,3 @@ ui menu.c32 -menu title ALT Linux (@mkimage-profiles@) +menu title @menuitem@ prompt 0 diff --git a/features.in/syslinux/cfg.in/01prompt.cfg b/features.in/syslinux/cfg.in/01prompt.cfg index 2e9fcb76..e2cf1e76 100644 --- a/features.in/syslinux/cfg.in/01prompt.cfg +++ b/features.in/syslinux/cfg.in/01prompt.cfg @@ -1,2 +1,2 @@ -say ALT Linux (@mkimage-profiles@) +say @menuitem@ prompt 1 diff --git a/features.in/syslinux/cfg.in/01vesamenu.cfg b/features.in/syslinux/cfg.in/01vesamenu.cfg index 8301b75e..2525a074 100644 --- a/features.in/syslinux/cfg.in/01vesamenu.cfg +++ b/features.in/syslinux/cfg.in/01vesamenu.cfg @@ -1,3 +1,3 @@ ui vesamenu -menu title ALT Linux (@mkimage-profiles@) +menu title @menuitem@ prompt 0 diff --git a/features.in/syslinux/cfg.in/20install2.cfg b/features.in/syslinux/cfg.in/20install2.cfg index a68b791c..8947ce05 100644 --- a/features.in/syslinux/cfg.in/20install2.cfg +++ b/features.in/syslinux/cfg.in/20install2.cfg @@ -1,5 +1,5 @@ label linux - menu label ^Install @distro@ + menu label ^Install @menuitem@ kernel alt0/vmlinuz append initrd=alt0/full.cz changedisk fastboot showopts automatic=method:cdrom ramdisk_size=@altinst_size@ vga=0x314 @bootargs@ diff --git a/features.in/syslinux/cfg.in/20netinstall2.cfg b/features.in/syslinux/cfg.in/20netinstall2.cfg index 958ec733..d94bbbab 100644 --- a/features.in/syslinux/cfg.in/20netinstall2.cfg +++ b/features.in/syslinux/cfg.in/20netinstall2.cfg @@ -1,5 +1,5 @@ label netinst - menu label Install server-ovz via inter^net + menu label Install @menuitem@ via inter^net kernel alt0/vmlinuz append initrd=alt0/full.cz fastboot showopts automatic=method:http,network:dhcp,server:ftp.linux.kiev.ua,directory:/pub/Linux/ALT/people/mike/iso/mkimage-profiles/netinst/server-ovz/x86_64 quiet=1 ramdisk_size=131072 vga=0x314 ### hardwired parameters and strings should become dynamic someday diff --git a/features.in/syslinux/config.mk b/features.in/syslinux/config.mk index 75c7fdb1..de995478 100644 --- a/features.in/syslinux/config.mk +++ b/features.in/syslinux/config.mk @@ -3,7 +3,7 @@ use/syslinux: sub/stage1 @$(call add_feature) @$(call add,STAGE1_PACKAGES,syslinux) @$(call try,META_SYSTEM_ID,SYSLINUX) - + @$(call set,MENUITEM,ALT Linux $(IMAGE_NAME)) # UI is overwritten use/syslinux/ui/%: use/syslinux @$(call set,SYSLINUX_UI,$*) diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk index c1e87eb6..5f7c7077 100644 --- a/features.in/syslinux/generate.mk +++ b/features.in/syslinux/generate.mk @@ -52,6 +52,7 @@ all: debug timeout @sed -i 's,@mkimage-profiles@,$(IMAGE_NAME),' $(DSTDIR)/*.cfg @echo $(SYSLINUX_MODULES) > $(DSTDIR)/modules.list @echo $(SYSLINUX_FILES) > $(DSTDIR)/syslinux.list + @sed -i 's,@menuitem@,$(MENUITEM),' $(DSTDIR)/*.cfg # integerity check timeout: distro