live-flightgear.iso lacked sound

Thanks snejok@ for spotting the missing, I didn't get around to tests with headphones... Also fixed nouveau getting in after target shuffling, and tweaked firefox homepage to be useful in this context.

live-flightgear.iso lacked sound
4afd735a · Michael Shigorin · 3d649db6 · 4afd735a · 4afd735a
Commit 4afd735a authored Mar 31, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

live.mk conf.d/live.mk +2 -1

config.mk features.in/live/config.mk +5 -1

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -46,7 +46,8 @@ distro/live-webkiosk-mini: distro/.live-kiosk use/live/hooks use/live/ru

 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:

-distro/live-flightgear: distro/live-icewm use/x11/3d-free use/x11/3d-proprietary
+distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary
 	@$(call add,LIVE_PACKAGES,FlightGear fgo)
+	@$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html)

 endif
--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -10,7 +10,8 @@ use/live/base: use/live use/syslinux/ui/menu
 	@$(call add,LIVE_LISTS,$(call tags,base && (live || network)))

 # optimized out: use/x11/xorg
-use/live/desktop: use/live/base use/x11/wacom use/virtualbox/guest +power
+use/live/desktop: use/live/base use/x11/wacom use/virtualbox/guest \
+	use/live/sound +power
 	@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)
@@ -26,3 +27,6 @@ use/live/hooks: use/live

 use/live/ru: use/live
 	@$(call add,LIVE_PACKAGES,livecd-ru)
+
+use/live/sound: use/live
+	@$(call add,LIVE_PACKAGES,amixer alsa-utils aplay udev-alsa)