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

timeout for syslinux is measured in deciseconds, and for grub in seconds.

regular.mk, server: timeout alignment for syslinux and grub
c37775cd · Anton Midyukov · e8559049 · c37775cd · c37775cd
Commit c37775cd authored Jun 03, 2020 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

regular.mk conf.d/regular.mk +1 -1

config.mk features.in/server/config.mk +1 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -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

--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -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)