From b14aff979f3859314f4c03db813cae0977d5b9b4 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 13 May 2014 16:57:33 +0400 Subject: [PATCH] regular.mk: use/domain-client/full in "rich" images This is actually downplaying: the net effect is that a few images continue to carry krb5-ticket-watcher and have avahi service enabled by default while most of the images have one "weird" item less on their menus and a few hundred kilobytes less in total RSS. These are not really needed by default in lightweight distros sporting reduced application and services set, and the heavier ones will take relatively less hit by default while being more ready as ALT Domain clients (which was the whole motivation behind adding the feature and the corresponding pkglist). --- conf.d/regular.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 10df81e0..f18f8c80 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -101,7 +101,8 @@ distro/regular-gnustep: distro/.regular-sysv \ distro/regular-gnustep-systemd: distro/.regular-base +systemd \ mixin/regular-wmaker mixin/regular-gnustep; @: -distro/regular-xfce: distro/.regular-gtk use/x11/xfce +nm; @: +distro/regular-xfce: distro/.regular-gtk \ + use/x11/xfce use/domain-client/full +nm; @: distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm @$(call add,LIVE_LISTS,$(call tags,desktop gvfs)) @@ -109,7 +110,7 @@ distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality +nm distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad @$(call add,LIVE_PACKAGES,livecd-regular-xmonad) -distro/regular-mate: distro/.regular-gtk use/x11/mate +nm +distro/regular-mate: distro/.regular-gtk use/x11/mate use/domain-client/full +nm @$(call add,LIVE_LISTS,$(call tags,mobile mate)) distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @: @@ -135,7 +136,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \ use/net-eth/dhcp use/efi/refind; @: distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \ - use/fonts/zerg +pulse +plymouth +nm + use/fonts/zerg use/domain-client/full +pulse +plymouth +nm @$(call add,LIVE_LISTS,$(call tags,(regular || network) && kde4)) @$(call add,LIVE_PACKAGES,rosa-imagewriter)