live, server, e2k.mk, regular.mk: use/services/lvm2-disable

These used to carry (or need) their own means for the same
problem of extra services consuming bootup time.
This commit is contained in:
Michael Shigorin 2017-08-02 21:46:01 +03:00
parent 5174ec5dff
commit 209c610f80
4 changed files with 9 additions and 9 deletions

View File

@ -4,9 +4,9 @@ vm/live-e2k: vm/bare use/e2k use/deflogin/live
@$(call add,THE_PACKAGES,openssh)
@$(call add,THE_LISTS,$(call tags,ve tools))
vm/rescue-e2k: vm/live-e2k use/tty/S0 use/net-eth/dhcp
vm/rescue-e2k: vm/live-e2k use/tty/S0 use/net-eth/dhcp use/services/lvm2-disable
@$(call add,THE_PACKAGES,agetty gpm fdisk parted smartmontools pv sshfs)
@$(call add,THE_LISTS,$(call tags,server && (network || extra)))
@$(call add,DEFAULT_SERVICES_DISABLE,gpm smartd)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm mdadm smartd)
endif

View File

@ -13,12 +13,12 @@ distro/.regular-x11: distro/.regular-base +vmguest +wireless \
use/live/x11 use/live/install use/live/suspend \
use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
use/branding use/browser/firefox/live use/browser/firefox/i18n \
use/browser/firefox/h264
use/browser/firefox/h264 use/services/lvm2-disable
@$(call add,LIVE_PACKAGES,volumes-profile-regular)
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,LIVE_LISTS,$(call tags,base rescue))
@$(call add,LIVE_PACKAGES,gpm livecd-install-apt-cache)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop lvm2-lvmpolld)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
@$(call add,EFI_BOOTARGS,live_rw)
# common WM live/installer bits

View File

@ -7,12 +7,12 @@ _ON = alteratord cpufreq-simple \
random rpcbind plymouth avahi-daemon \
_OFF = anacron blk-availability bridge clamd crond dhcpd dmeventd dnsmasq \
lvm2-lvmetad lvm2-monitor mdadm netfs o2cb ocfs2 openvpn postfix \
rawdevices slapd smartd sshd sysstat update_wms xinetd
mdadm netfs o2cb ocfs2 openvpn postfix rawdevices slapd smartd sshd \
sysstat update_wms xinetd
# 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
use/live: use/stage2 sub/rootfs@live sub/stage2@live use/services/lvm2-disable
@$(call add_feature)
@$(call add,CLEANUP_BASE_PACKAGES,'installer*')
@$(call add,DEFAULT_SERVICES_ENABLE,$(_ON))

View File

@ -9,12 +9,12 @@ use/server/base: use/server use/firmware/server \
@$(call add,STAGE1_KMODULES,e1000e igb)
@$(call add,INSTALL2_PACKAGES,installer-feature-server-raid-fixup-stage2)
use/server/mini: use/server/base
use/server/mini: use/server/base use/services/lvm2-disable
@$(call add,THE_LISTS,\
$(call tags,base && (network || security || pkg)))
@$(call add,THE_LISTS,$(call tags,extra && (server || network)))
@$(call add,MAIN_LISTS,osec)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus lvm2-lvmetad)
@$(call add,DEFAULT_SERVICES_DISABLE,messagebus)
use/server/ovz-base: use/server
@$(call set,STAGE1_KFLAVOUR,std-def)