From c85cec1a930b15b6c2376a830324c364de63d7f0 Mon Sep 17 00:00:00 2001 From: Evgeny Sinelnikov Date: Tue, 6 Apr 2021 04:19:34 +0400 Subject: [PATCH] Enable use/stage2/cifs wherever enabled use/stage2/net-nfs --- conf.d/alt-server.mk | 2 +- conf.d/education.mk | 2 +- conf.d/mixin-basealt.mk | 2 +- conf.d/regular.mk | 4 ++-- conf.d/server-v.mk | 2 +- features.in/slinux/config.mk | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk index 49dec58f..8b47040b 100644 --- a/conf.d/alt-server.mk +++ b/conf.d/alt-server.mk @@ -23,7 +23,7 @@ distro/alt-server: monitoring = $(addprefix server-v/,\ distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \ use/bootloader/grub use/rescue/base use/stage2/kms\ use/stage2/fs use/stage2/hid use/stage2/md \ - use/stage2/mmc use/stage2/net use/stage2/net-nfs \ + use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \ use/docs/license @$(call add,MAIN_GROUPS,$(server_groups_primary)) diff --git a/conf.d/education.mk b/conf.d/education.mk index e92afaed..3aac5724 100644 --- a/conf.d/education.mk +++ b/conf.d/education.mk @@ -53,7 +53,7 @@ mixin/education-installer: \ use/wireless \ +plymouth \ use/stage2/fs use/stage2/hid use/stage2/md \ - use/stage2/mmc use/stage2/net use/stage2/net-nfs \ + use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb @$(call set,INSTALLER,education) @$(call set,META_VOL_ID,ALT Education 9.1 $(ARCH)) diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk index d47911f0..064c592e 100644 --- a/conf.d/mixin-basealt.mk +++ b/conf.d/mixin-basealt.mk @@ -55,7 +55,7 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \ mixin/alt-workstation-install: +installer \ use/install2/fat use/install2/vnc \ use/stage2/fs use/stage2/hid use/stage2/md \ - use/stage2/mmc use/stage2/net use/stage2/net-nfs \ + use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb @$(call set,INSTALLER,alt-workstation) @$(call add,INSTALL2_PACKAGES,installer-feature-slideshow) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index c1f02450..f0eb419b 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS)) # common ground (really lowlevel) distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license \ use/stage2/fs use/stage2/hid use/stage2/md \ - use/stage2/mmc use/stage2/net use/stage2/net-nfs \ + use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb @$(call try,SAVE_PROFILE,yes) ifeq (,$(filter-out i586 x86_64,$(ARCH))) @@ -17,7 +17,7 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @: # graphical target (not enforcing xorg drivers or blobs) distro/.regular-x11: distro/.regular-base mixin/regular-x11 \ use/x11/wacom use/x11/amdgpu +wireless \ - use/stage2/cifs use/live/x11 use/live/repo \ + use/live/x11 use/live/repo \ use/live/suspend use/browser/firefox/live \ use/syslinux/ui/gfxboot use/grub/ui/gfxboot @$(call add,THE_BRANDING,bootloader) diff --git a/conf.d/server-v.mk b/conf.d/server-v.mk index 8b8c1bb9..dfca09cd 100644 --- a/conf.d/server-v.mk +++ b/conf.d/server-v.mk @@ -71,7 +71,7 @@ distro/.server-v-base: distro/.base distro/.installer \ use/firmware use/firmware/cpu \ use/net/etcnet use/net-ssh \ use/stage2/fs use/stage2/hid use/stage2/md \ - use/stage2/mmc use/stage2/net use/stage2/net-nfs \ + use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/scsi use/stage2/usb \ use/stage2/kms \ use/server/virt use/docs/license diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 015fcef5..25c94544 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -91,7 +91,7 @@ use/slinux/base: use/isohybrid use/luks \ +plymouth use/memtest +vmguest \ +efi \ use/stage2/fs use/stage2/hid use/stage2/md \ - use/stage2/mmc use/stage2/net use/stage2/net-nfs \ + use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \ use/live/x11 use/live/rw use/install2/fonts \ use/efi/memtest86 use/efi/shell \