From 645f95f0a83dff1c28d17194428c7567497ec730 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 14 Apr 2017 19:00:42 +0300 Subject: [PATCH] regular.mk: initial rescue-netbootxyz flavour This one has been split from regular rescue following discussion with Will Glynn; some hefty bits like UEFI support or an extra squashfs to check the image integrity aren't needed, so let's just build a slimmer ISO instead. Suggested-by: Will Glynn See-also: https://bugzilla.altlinux.org/33374 --- conf.d/regular.mk | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index eefdd301..8743e9fb 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -234,17 +234,24 @@ distro/regular-kde5: distro/.regular-desktop \ # which will change propagator's behaviour to probe additional # filesystems (ro but no loop) thus potentially writing to # an unrecovered filesystem's journal -distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \ - use/branding use/efi/refind use/efi/shell use/efi/memtest86 \ - use/hdt use/syslinux/ui/menu use/syslinux/timeout/600 \ - use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \ - use/firmware/qlogic use/mediacheck test/rescue/no-x11 \ - +wireless +sysvinit +mixin/regular-rescue: use/rescue use/isohybrid use/luks use/branding \ + use/syslinux/ui/menu use/syslinux/timeout/600 \ + use/firmware/qlogic test/rescue/no-x11 +sysvinit; @: + +distro/regular-rescue: distro/.regular-base mixin/regular-rescue \ + use/rescue/rw use/efi/refind use/efi/shell use/efi/memtest86 \ + use/hdt use/syslinux/rescue_fm.cfg use/syslinux/rescue_remote.cfg \ + use/mediacheck +wireless @$(call set,KFLAVOURS,un-def) @$(call add,RESCUE_PACKAGES,gpm livecd-net-eth) @$(call add,RESCUE_LISTS,$(call tags,base && (smartcard || bench))) @$(call add,RESCUE_LISTS,$(call tags,network security)) +distro/regular-rescue-netbootxyz: distro/.regular-bare mixin/regular-rescue + @$(call set,RELNAME,en.altlinux.org/rescue (netboot.xyz edition)) + @$(call set,META_VOL_ID,ALT Rescue) + @$(call set,META_APP_ID,$(ARCH)) + distro/regular-sysv-tde: distro/.regular-install-x11-full mixin/regular-tde @$(call add,THE_LISTS,$(call tags,base desktop)) @$(call add,THE_LISTS,$(call tags,regular tde))