From 7ed10f204f8cc21ebdeb2f3d977c75afd5e78670 Mon Sep 17 00:00:00 2001 From: Thomas Backlund Date: Thu, 11 Dec 2014 20:03:23 +0159 Subject: block java on liveCDs --- config/auto_inst.cfg.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config') 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', -- cgit v1.2.1