summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2014-12-11 20:03:23 +0159
committerThomas Backlund <tmb@mageia.org>2014-12-11 20:03:23 +0159
commit7ed10f204f8cc21ebdeb2f3d977c75afd5e78670 (patch)
treec8dc4d3c06e67743dd3c9ce394487864eb6a6a50
parent3f4a1cd3bfcb522b7ac3b929c03e90c92ce3329e (diff)
downloaddraklive-config-7ed10f204f8cc21ebdeb2f3d977c75afd5e78670.tar
draklive-config-7ed10f204f8cc21ebdeb2f3d977c75afd5e78670.tar.gz
draklive-config-7ed10f204f8cc21ebdeb2f3d977c75afd5e78670.tar.bz2
draklive-config-7ed10f204f8cc21ebdeb2f3d977c75afd5e78670.tar.xz
draklive-config-7ed10f204f8cc21ebdeb2f3d977c75afd5e78670.zip
block java on liveCDs
-rw-r--r--config/auto_inst.cfg.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 6b2721f..014bc0a 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -200,7 +200,7 @@ $o = {
'/^kernel-server-/', '/^fglrx-kernel-3\.17\.2-server-/', '/^nvidia-current-kernel-3\.17\.2-server-/', '/^nvidia304-kernel-3\.17\.2-server-/', '/^vboxadditions-kernel-3\.17\.2-server-/',
'/^broadcom-wl-/',
- if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
+ if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'),
# not needed anymore (mga #2001)
'nspluginwrapper',
@@ -223,8 +223,7 @@ $o = {
# theese are in live media
'broadcom-bcma-config', 'broadcom-ssb-config',
-
-
+
# uClibc & co
'uClibc', 'libuClibc0.9.30.3', 'libuClibc-zlib1', 'lib64uClibc0.9.30.3', 'lib64uClibc-zlib1',