Skip to content

M
mkimage-profiles
Commit b9de03f7 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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.
parent d986baac
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
conf.d/live.mk
View file @ b9de03f7
...@@ -51,16 +51,15 @@ distro/live-rescue: distro/live-icewm use/efi ...@@ -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 # 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 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*') @$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')
distro/live-webkiosk-mini: distro/.live-webkiosk distro/live-webkiosk-mini: distro/.live-webkiosk
@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox) @$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)
# NB: flash/java plugins are predictable security holes # NB: flash/java plugins are predictable security holes
distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live +vmguest distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
@$(call add,LIVE_PACKAGES,mozilla-plugin-adobe-flash) use/browser/plugin/flash use/browser/plugin/java +vmguest; @:
@$(call add,LIVE_PACKAGES,mozilla-plugin-java-1.6.0-sun)
distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @: distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:
......
features.in/live/config.mk
View file @ b9de03f7
...@@ -39,9 +39,10 @@ use/live/x11: use/live/base use/syslinux/localboot.cfg \ ...@@ -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,fonts-ttf-dejavu fonts-ttf-droid)
@$(call add,LIVE_PACKAGES,pciutils) @$(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/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 # preconfigure apt for both live and installed-from-live systems
use/live/repo: use/live use/live/repo: use/live
......
pkg.in/lists/tagged/desktop+live
View file @ b9de03f7
xdm xdm
xinit xinit
xinitrc xinitrc
livecd-firefox
livecd-setlocale livecd-setlocale
installer-feature-runlevel5-stage3 installer-feature-runlevel5-stage3
os-prober os-prober
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment