diff options
| -rw-r--r-- | config/auto_inst.cfg.pl | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 8076bbf..485e27c 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -123,7 +123,7 @@ $o = { '/^firefox-en_/', '/^myspell-en_/', ), - if_($ENV{DRAKLIVE_PRODUCT} !~ /liveusb-rw/i, 'task-printing-scanning'), + 'task-printing-scanning', 'qtradio', 'kradio', 'system-config-printer', 'poppler-data', 'tetex', @@ -138,9 +138,7 @@ $o = { 'gnome-packagekit-common', 'gnome-keyring', ), ), - #($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i - #? ('/openjdk/', 'java-1.5.0-gcj') - #: '/java(?!scriptcoregtk\d+)/'), + 'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader', 'drakfax', 'efax', ), @@ -164,17 +162,6 @@ $o = { if_($has_plasma5, 'gdb'), #- suggested by one of the plasma base package - #exclude some packages that are too big from the PLASMA5 Live CD - if_($ENV{DRAKLIVE_PRODUCT} !~ /liveusb-rw/i, - if_($has_plasma5, 'digikam'), - if_($has_plasma5, 'ufraw-gimp'), - if_($has_plasma5, 'marble-common'), - if_($has_plasma5, 'p7zip'), - #if_($has_plasma5, 'thunderbird'), #- we have kmail - if_($has_gnome, 'thunderbird', 'pan'), #- we have evolution - 'cpqarrayd', - ), - if_($has_gnome, 'beagle', 'inkscape'), 'mono', @@ -185,6 +172,7 @@ $o = { # shipped in live nonfree '/^broadcom-wl-/', + 'broadcom-bcma-config', 'broadcom-ssb-config', # not needed anymore (mga #2001) 'nspluginwrapper', @@ -204,9 +192,6 @@ $o = { # not wanted 'mate-polkit', - - # theese are in live media - 'broadcom-bcma-config', 'broadcom-ssb-config', if_($ENV{DRAKLIVE_REGION} eq 'int', 'ardour', 'ardour3', 'lftp', 'lm_sensors', 'kscd', 'tvtime', 'kamera', '/^plasma-applet-system-monitor-/', 'dragon', 'k3b'), ], @@ -289,14 +274,6 @@ $o = { "perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' '/etc/inittab'", #- FIXME: in any::set_autologin, unlink if gdm/sddm conf file and binary exist if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"), - if_($distro_theme eq 'Liveusb-Rw', - #- set blue gtk theme for Liveusb-Rw in Gnome - #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'", - #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'", - #- set blue gtk theme for Liveusb-Rw in GTK - "perl -pi -e 's/META_CLASS=.*/META_CLASS=powerpack/' /etc/sysconfig/system", - "echo MDV_MENU_STYLE=discovery > /etc/sysconfig/menustyle", - ), ), 'autoExitInstall' => 1, 'keep_unrequested_dependencies' => 0, |