live, live.mk: use/browser now

Firefox was the very reasonable default for initial livecd
implementation but now that at least initial browser chooser
infrastructure is in place it's time to un-hardwire its use.

It's _the_ default but switchable now so that images providing
a comprehensive browser can avoid feature duplication.
This commit is contained in:
Michael Shigorin 2014-05-23 22:29:54 +04:00
parent d986baac50
commit b9de03f79a
4 changed files with 6 additions and 8 deletions

View File

@ -51,16 +51,15 @@ distro/live-rescue: distro/live-icewm use/efi
# 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 use/sound
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_LISTS,$(call tags,live desktop))
@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
distro/live-webkiosk-mini: distro/.live-webkiosk
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest
@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash)
@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
use/browser/plugin/flash use/browser/plugin/java +vmguest; @:
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:

View File

@ -39,9 +39,10 @@ use/live/x11: use/live/base use/syslinux/localboot.cfg \
@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
@$(call add,LIVE_PACKAGES,pciutils)
# this target specifically pulls free xorg drivers in (and a few more bits)
# this target specifically pulls free xorg drivers in (and a few more bits);
# a browser is requested too, the recommended one can be overridden downstream
use/live/desktop: use/live/x11 use/x11/xorg use/x11/wacom \
use/xdg-user-dirs/deep +vmguest; @:
use/browser/firefox/live use/xdg-user-dirs/deep +vmguest; @:
# preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live

View File

@ -1,7 +1,6 @@
xdm
xinit
xinitrc
livecd-firefox
livecd-setlocale
installer-feature-runlevel5-stage3
os-prober

View File

@ -1 +0,0 @@
firefox