Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anton Palgunov
mkimage-profiles
Commits
91075d00
Commit
91075d00
authored
Dec 30, 2016
by
Michael Shigorin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
syslinux: introduced BOOTVGA
...instead of hardwired 0x314 (which is rather wrong for modern kernels and hardware, just ran into that with yet another Matrox G200eW WPCM450).
parent
f06284b5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
3 deletions
+10
-3
README
features.in/syslinux/README
+2
-0
20install2.cfg
features.in/syslinux/cfg.in/20install2.cfg
+1
-1
30live.cfg
features.in/syslinux/cfg.in/30live.cfg
+1
-1
32live_rw.cfg
features.in/syslinux/cfg.in/32live_rw.cfg
+1
-1
config.mk
features.in/syslinux/config.mk
+1
-0
generate.mk
features.in/syslinux/generate.mk
+4
-0
No files found.
features.in/syslinux/README
View file @
91075d00
...
@@ -14,7 +14,9 @@
...
@@ -14,7 +14,9 @@
* use/syslinux/%.cfg -- подключение кусочков конфигурации.
* use/syslinux/%.cfg -- подключение кусочков конфигурации.
Переменные generate.mk:
Переменные generate.mk:
* BOOTARGS -- дополнительные аргументы загрузчику;
* BOOTLOADER -- isolinux (реализовано с оглядкой на syslinux/syslinux4);
* BOOTLOADER -- isolinux (реализовано с оглядкой на syslinux/syslinux4);
* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=);
* SYSLINUX_UI -- модуль интерфейса (если не указан, то внутренний prompt);
* SYSLINUX_UI -- модуль интерфейса (если не указан, то внутренний prompt);
* SYSLINUX_MODULES -- модули .com или .c32 (перечисляются без расширения);
* SYSLINUX_MODULES -- модули .com или .c32 (перечисляются без расширения);
* SYSLINUX_CFG -- дополнительные кусочки конфигурации (например, localboot).
* SYSLINUX_CFG -- дополнительные кусочки конфигурации (например, localboot).
...
...
features.in/syslinux/cfg.in/20install2.cfg
View file @
91075d00
label linux
label linux
menu label ^Install @relname@
menu label ^Install @relname@
kernel alt0/vmlinuz
kernel alt0/vmlinuz
append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=
0x314
@bootargs@
append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=
@bootvga@
@bootargs@
features.in/syslinux/cfg.in/30live.cfg
View file @
91075d00
label live
label live
menu label ^LiveCD (no hard disk needed)
menu label ^LiveCD (no hard disk needed)
kernel alt0/vmlinuz
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=
0x314
@bootargs@
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=
@bootvga@
@bootargs@
features.in/syslinux/cfg.in/32live_rw.cfg
View file @
91075d00
label session
label session
menu label LiveCD with ^sessions support
menu label LiveCD with ^sessions support
kernel alt0/vmlinuz
kernel alt0/vmlinuz
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=
0x314
@bootargs@
append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=
@bootvga@
@bootargs@
features.in/syslinux/config.mk
View file @
91075d00
...
@@ -3,6 +3,7 @@ use/syslinux: sub/stage1
...
@@ -3,6 +3,7 @@ use/syslinux: sub/stage1
@$(call add_feature)
@$(call add_feature)
@$(call add,STAGE1_PACKAGES,syslinux)
@$(call add,STAGE1_PACKAGES,syslinux)
@$(call try,META_SYSTEM_ID,SYSLINUX)
@$(call try,META_SYSTEM_ID,SYSLINUX)
@$(call try,BOOTVGA,0x314)
@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
# UI is overwritten
# UI is overwritten
...
...
features.in/syslinux/generate.mk
View file @
91075d00
...
@@ -85,6 +85,10 @@ bootargs: clean
...
@@ -85,6 +85,10 @@ bootargs: clean
sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \
sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \
fi; \
fi; \
sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg
sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg
@if [ -n "$(BOOTVGA)" ]; then \
sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTDIR)/*.cfg; \
fi; \
sed -i "s,@bootvga@,,;s,vga= ,," $(DSTDIR)/*.cfg
clean: copy
clean: copy
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
@if [ "$(SYSLINUX_UI)" = gfxboot ]; then \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment