diff options
| author | Thomas Backlund <tmb@mageia.org> | 2016-07-03 00:14:44 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2016-07-03 00:14:44 +0300 |
| commit | 2e3414a5adfa0e650afd0470332413aa17838261 (patch) | |
| tree | 45a13dfdf79a6fd03f44bf8b518a9c3b5a9b8adf /config | |
| parent | d6edf9f0f667ea2a478641b12191e8d3dc2d54d1 (diff) | |
| download | draklive-config-2e3414a5adfa0e650afd0470332413aa17838261.tar draklive-config-2e3414a5adfa0e650afd0470332413aa17838261.tar.gz draklive-config-2e3414a5adfa0e650afd0470332413aa17838261.tar.bz2 draklive-config-2e3414a5adfa0e650afd0470332413aa17838261.tar.xz draklive-config-2e3414a5adfa0e650afd0470332413aa17838261.zip | |
merge live media repos as they are now identical
Diffstat (limited to 'config')
| -rw-r--r-- | config/live.cfg | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/config/live.cfg b/config/live.cfg index 823e8b4..b1e8fba 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -53,24 +53,14 @@ my $_l = { # clean live files [ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ], [ '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}{desktop} eq 'PLASMA5', - if_($live->{settings}{arch} eq 'i586', - [ 'files/mga_rpms/PLASMA5/i586/mga_rpms', '/var/local/mga_rpms' ], - ), - if_($live->{settings}{arch} eq 'x86_64', - [ 'files/mga_rpms/PLASMA5/x86_64/mga_rpms', '/var/local/mga_rpms' ], - ), - ), + if_($live->{settings}{arch} eq 'i586', + [ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ], + ), + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/mga_rpms/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 } ], |