regular.mk: add gpm to desktop/rescue images

Make it automatically start in desktop ones, and let it be available in rescue too (there's a risk of gpm picking up a wrong protocol and selecting/pasting at random which is not exactly the right thing for rescue environment with root shells all around).

regular.mk: add gpm to desktop/rescue images
144d4c0f · Michael Shigorin · c7dadfd8 · 144d4c0f
Commit 144d4c0f authored Sep 23, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

regular.mk conf.d/regular.mk +3 -0

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -12,6 +12,8 @@ distro/.regular-x11: distro/.regular-bare use/x11/wacom +vmguest \
 	use/luks use/branding
 	@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
 	@$(call add,LIVE_LISTS,$(call tags,base rescue))
+	@$(call add,LIVE_PACKAGES,gpm)
+	@$(call add,DEFAULT_SERVICES_ENABLE,gpm)

 # WM base target
 distro/.regular-base: distro/.regular-x11 use/x11/xorg
@@ -82,6 +84,7 @@ distro/regular-sugar: distro/.regular-gtk use/x11/sugar; @:
 distro/regular-rescue: distro/.regular-bare use/rescue/rw \
 	use/syslinux/ui/menu use/hdt use/efi/refind
 	@$(call set,KFLAVOURS,un-def)
+	@$(call add,RESCUE_PACKAGES,gpm)

 distro/regular-server: distro/.regular-bare +installer +sysvinit +power \
 	use/install2/fs use/bootloader/lilo use/firmware use/server/mini