diff --git a/conf.d/live.mk b/conf.d/live.mk index a3dc7450..33618fa1 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -49,9 +49,9 @@ distro/live-rescue: distro/live-icewm use/efi $(call tags,(base || extra) && (archive || rescue || network))) # NB: this one doesn't include the browser, needs to be chosen downstream -distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru +distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru \ + use/sound/alsa @$(call add,LIVE_LISTS,$(call tags,desktop && (live || network))) - @$(call add,LIVE_PACKAGES,alsa-utils udev-alsa) @$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*') distro/live-webkiosk-mini: distro/.live-webkiosk diff --git a/features.in/live/config.mk b/features.in/live/config.mk index 3c9f637a..0ff3cc08 100644 --- a/features.in/live/config.mk +++ b/features.in/live/config.mk @@ -18,7 +18,7 @@ use/live/rw: use/live; @: endif # graphical target (not enforcing xorg drivers or blobs) -use/live/x11: use/live/base use/x11-autologin use/live/sound +power +efi +use/live/x11: use/live/base use/x11-autologin use/sound +power +efi @$(call add,LIVE_LISTS,$(call tags,desktop && (live || network))) @$(call add,LIVE_LISTS,$(call tags,base l10n)) @$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid) @@ -66,6 +66,3 @@ use/live/hooks: use/live # a crude hack to make sure Russian is supported in a particular image 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)