diff options
Diffstat (limited to 'config/auto_inst.cfg.pl')
| -rw-r--r-- | config/auto_inst.cfg.pl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 4c5fca7..24968d6 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -152,9 +152,9 @@ $o = { 'gnome-packagekit-common', 'gnome-keyring', ), ), - ($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i - ? ('/openjdk/', 'java-1.5.0-gcj') - : '/java(?!scriptcoregtk\d+)/'), + #($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i + #? ('/openjdk/', 'java-1.5.0-gcj') + #: '/java(?!scriptcoregtk\d+)/'), 'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader', 'drakfax', 'efax', ), @@ -202,7 +202,8 @@ $o = { if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-*-desktop-/', '/^nvidia-current-kernel-*-desktop-/', '/^nvidia304-kernel-*-desktop-', '/^nvidia173-kernel-*-desktop-/', '/^vboxadditions-kernel-*-desktop-/'), '/^kernel-server-/', '/^fglrx-kernel-*-server-/', '/^nvidia-current-kernel-*-server-/', '/^nvidia304-kernel-*-server-/', '/^nvidia173-kernel-*-server-/', '/^vboxadditions-kernel-*-server-/', '/^broadcom-wl-/', - #'libreoffice-core', + + if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), # not needed anymore (mga #2001) 'nspluginwrapper', @@ -240,7 +241,7 @@ $o = { 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia173', 'x11-driver-video-nvidia304', 'x11-driver-video-vboxvideo', - 'basesystem', + 'basesystem', 'bluez-firmware', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome 'dmraid', 'mdadm', 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch', @@ -253,7 +254,7 @@ $o = { if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'), - if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted',),#, 'ibus-ui-gtk3'), + if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', ),#, 'ibus-ui-gtk3'), if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i, 'samba-client', |