diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-05-16 11:35:59 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-05-16 11:35:59 +0300 |
| commit | 41f3868799b3d3cee63434741afe830f02c3a0a0 (patch) | |
| tree | 2b384c5aaba5d9e9e8e5b16242da72d1b67c49d3 /config | |
| parent | 8246301a16cde0be2c96ca774af2d1c1350afe67 (diff) | |
| download | draklive-config-41f3868799b3d3cee63434741afe830f02c3a0a0.tar draklive-config-41f3868799b3d3cee63434741afe830f02c3a0a0.tar.gz draklive-config-41f3868799b3d3cee63434741afe830f02c3a0a0.tar.bz2 draklive-config-41f3868799b3d3cee63434741afe830f02c3a0a0.tar.xz draklive-config-41f3868799b3d3cee63434741afe830f02c3a0a0.zip | |
only block fglrx on Gnome media
Diffstat (limited to 'config')
| -rw-r--r-- | config/auto_inst.cfg.pl | 13 | ||||
| -rw-r--r-- | config/live.cfg | 19 |
2 files changed, 25 insertions, 7 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 854f4ae..5b19745 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -198,9 +198,10 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/', - '/^broadcom-wl-/', 'x11-driver-video-fglrx', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.19\.8-desktop-/', '/^nvidia-current-kernel-3\.19\.8-desktop-/', '/^nvidia340-kernel-3\.19\.8-desktop-', '/^nvidia304-kernel-3\.19\.8-desktop-', '/^vboxadditions-kernel-3\.19\.8-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-3\.19\.8-server-/', '/^nvidia-current-kernel-3\.19\.8-server-/', '/^nvidia340-kernel-3\.19\.8-server-/', '/^nvidia304-kernel-3\.19\.8-server-/', '/^vboxadditions-kernel-3\.19\.8-server-/', + if_($has_gnome, '/^fglrx-kernel-3\.19\.8-desktop/', 'x11-driver-video-fglrx'), + '/^broadcom-wl-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core', '/^java-1.8.0-/'), @@ -241,6 +242,12 @@ $o = { if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest'), if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'gummiboot'), + if_(!$has_gnome, + if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest'), + 'x11-driver-video-fglrx', + ), + 'x11-server-common', 'x11-driver-video-vboxvideo', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia340', 'x11-driver-video-nvidia304', 'basesystem', 'x11-driver-video', 'x11-driver-input', 'bluez-firmware', 'mageiawelcome', diff --git a/config/live.cfg b/config/live.cfg index 0f6d1df..b156397 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -53,12 +53,23 @@ my $_l = { [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ], # add local repos - if_($live->{settings}{arch} eq 'i586', - [ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ], + if_($live->{settings}{desktop} eq 'GNOME', + if_($live->{settings}{arch} eq 'i586', + [ 'files/mga_rpms/GNOME/i586/mga_rpms', '/var/local/mga_rpms' ], + ), + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/mga_rpms/GNOME/x86_64/mga_rpms', '/var/local/mga_rpms' ], + ), ), - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ], + if_($live->{settings}{desktop} eq 'KDE4', + if_($live->{settings}{arch} eq 'i586', + [ 'files/mga_rpms/KDE4/i586/mga_rpms', '/var/local/mga_rpms' ], + ), + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/mga_rpms/KDE4/x86_64/mga_rpms', '/var/local/mga_rpms' ], + ), ), + # disable suspend and hibernate in live mode [ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ], #- make cups the default spooler |