summaryrefslogtreecommitdiffstats
path: root/config/live.cfg
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-21 20:48:48 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-21 21:46:07 +0100
commitf631bf349a9f9bbff7e034887fb57b4b89d73574 (patch)
tree62741fbcfd53e12df915f7c4d4157e23f27ec221 /config/live.cfg
parent665851133f2c72e4f746cd95863710375bac2fe3 (diff)
downloaddraklive-config-f631bf349a9f9bbff7e034887fb57b4b89d73574.tar
draklive-config-f631bf349a9f9bbff7e034887fb57b4b89d73574.tar.gz
draklive-config-f631bf349a9f9bbff7e034887fb57b4b89d73574.tar.bz2
draklive-config-f631bf349a9f9bbff7e034887fb57b4b89d73574.tar.xz
draklive-config-f631bf349a9f9bbff7e034887fb57b4b89d73574.zip
Merge live media repos and use newest version of each package
- we no longer need different repos for KDE and GNOME - we need to search both 'release' and 'update' repositories to find the newest version of each package
Diffstat (limited to 'config/live.cfg')
-rw-r--r--config/live.cfg18
1 files changed, 4 insertions, 14 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 182685a..9c8e13a 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -55,21 +55,11 @@ my $_l = {
[ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ],
# add local repos
- 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 'i586',
+ [ 'files/mga_rpms/i586/mga_rpms', '/var/local' ],
),
- 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' ],
- ),
+ if_($live->{settings}{arch} eq 'x86_64',
+ [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ],
),
# disable suspend and hibernate in live mode