>From c4aeff917b22f29e3a8397c652fd2b3f3c72d79a Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 3 Jan 2020 21:11:15 +0700 Subject: [PATCH 10/22] install2, live: add grub.cfg support --- features.in/install2/config.mk | 10 +++++----- features.in/live/config.mk | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/features.in/install2/config.mk b/features.in/install2/config.mk index 4c744dac80..71e6c4171b 100644 --- a/features.in/install2/config.mk +++ b/features.in/install2/config.mk @@ -3,7 +3,7 @@ +installer: use/install2/full; @: use/install2: use/stage2 sub/stage2@install2 use/metadata \ - use/cleanup/installer use/install2/autoinstall + use/cleanup/installer use/install2/autoinstall use/grub/install2.cfg @$(call add_feature) @$(call try,INSTALLER,altlinux-generic) # might be replaced later @$(call add,INSTALL2_PACKAGES,installer-distro-$$(INSTALLER)-stage2) @@ -84,12 +84,12 @@ use/install2/vnc: @$(call add,INSTALL2_PACKAGES,x11vnc xterm net-tools) # this one expects external vncviewer to come -use/install2/vnc/listen: \ - use/install2/vnc use/syslinux/install-vnc-listen.cfg; @: +use/install2/vnc/listen: use/install2/vnc \ + use/syslinux/install-vnc-listen.cfg use/grub/install-vnc-listen.cfg; @: # this one connects to a specified vncviewer --listen -use/install2/vnc/connect: \ - use/install2/vnc use/syslinux/install-vnc-connect.cfg; @: +use/install2/vnc/connect: use/install2/vnc \ + use/syslinux/install-vnc-connect.cfg use/grub/install-vnc-connect.cfg; @: # add both bootloader items to be *that* explicit ;-) use/install2/vnc/full: use/install2/vnc/listen use/install2/vnc/connect; @: diff --git a/features.in/live/config.mk b/features.in/live/config.mk index 7644e8591e..1278922ddd 100644 --- a/features.in/live/config.mk +++ b/features.in/live/config.mk @@ -12,7 +12,8 @@ _OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \ # copy stage2 as live # NB: starts to preconfigure but doesn't use/cleanup yet -use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services/lvm2-disable +use/live: use/stage2 sub/rootfs@live sub/stage2@live \ + use/services/lvm2-disable use/grub/live.cfg @$(call add_feature) @$(call add,CLEANUP_BASE_PACKAGES,'installer*') @$(call add,DEFAULT_SERVICES_ENABLE,$(_ON)) @@ -28,10 +29,9 @@ use/live/base: use/live/.base use/net use/deflogin/live # rw slice, see http://www.altlinux.org/make-initrd-propagator and #28289 ifeq (,$(EFI_BOOTLOADER)) -use/live/rw: use/live use/syslinux - @$(call add,SYSLINUX_CFG,live_rw) +use/live/rw: use/live use/syslinux/live_rw.cfg use/grub/live_rw.cfg; @: else -use/live/rw: use/live; @: +use/live/rw: use/live use/grub/live_rw.cfg; @: endif # graphical target (not enforcing xorg drivers or blobs) -- 2.24.1