Skip to content

M
mkimage-profiles
Commit c37775cd authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

regular.mk, server: timeout alignment for syslinux and grub

timeout for syslinux is measured in deciseconds, and for grub in seconds.
parent e8559049
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
conf.d/regular.mk
View file @ c37775cd
......@@ -229,7 +229,7 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \
distro/regular-builder: distro/.regular-bare mixin/regular-builder \
use/dev/builder/full use/stage2/kms +sysvinit +efi +power \
use/live/base use/live/rw use/live/repo/online use/live/textinstall \
use/isohybrid use/syslinux/timeout/30 use/grub/timeout/30 use/stage2/net-eth
use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30 use/stage2/net-eth
@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
distro/regular-server-samba4: distro/.regular-server-managed +systemd
......
features.in/server/config.mk
View file @ c37775cd
......@@ -2,7 +2,7 @@ use/server: sub/rootfs use/services
@$(call add_feature)
use/server/base: use/server use/firmware/server \
use/net-ssh use/syslinux/timeout/600 use/grub/timeout/600
use/net-ssh use/syslinux/timeout/600 use/grub/timeout/60
@$(call set,BOOTVGA,)
@$(call add,THE_LISTS,server-base)
@$(call add,THE_KMODULES,e1000e igb)
......
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