diff options
| author | Thomas Backlund <tmb@mageia.org> | 2014-08-31 14:39:26 +0200 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2014-08-31 14:39:26 +0200 |
| commit | 3d1403b296827ff2a90a500c8e3eb9ecadcfe233 (patch) | |
| tree | df9f7986ccadd9d09bb3274e234eb75b9cfd234b /config | |
| parent | 1a7671a56936fb15a8c71750a85fdd62216c5bc5 (diff) | |
| download | draklive-config-3d1403b296827ff2a90a500c8e3eb9ecadcfe233.tar draklive-config-3d1403b296827ff2a90a500c8e3eb9ecadcfe233.tar.gz draklive-config-3d1403b296827ff2a90a500c8e3eb9ecadcfe233.tar.bz2 draklive-config-3d1403b296827ff2a90a500c8e3eb9ecadcfe233.tar.xz draklive-config-3d1403b296827ff2a90a500c8e3eb9ecadcfe233.zip | |
Mga 5 Alpha1 configs
Diffstat (limited to 'config')
| -rw-r--r-- | config/auto_inst.cfg.pl | 14 | ||||
| -rw-r--r-- | config/settings-livecd.cfg | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index e3b0da1..511fa3c 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -196,9 +196,9 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.21-desktop-/', '/^nvidia-current-kernel-3\.12\.21-desktop-/', '/^nvidia304-kernel-3\.12\.21-desktop-', '/^nvidia173-kernel-3\.12\.21-desktop-/', '/^vboxadditions-kernel-3\.12\.21-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.12\.21-server-/', '/^nvidia-current-kernel-3\.12\.21-server-/', '/^nvidia304-kernel-3\.12\.21-server-/', '/^nvidia173-kernel-3\.12\.21-server-/', '/^vboxadditions-kernel-3\.12\.21-server-/', - '/^broadcom-wl-/', + if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.15\.2-desktop-/', '/^nvidia-current-kernel-3\.15\.2-desktop-/', '/^nvidia304-kernel-3\.15\.2-desktop-', '/^nvidia173-kernel-3\.15\.2-desktop-/', '/^vboxadditions-kernel-3\.15\.2-desktop-/'), + '/^kernel-server-/', '/^fglrx-kernel-3\.15\.2-server-/', '/^nvidia-current-kernel-3\.15\.2-server-/', '/^nvidia304-kernel-3\.15\.2-server-/', '/^nvidia173-kernel-3\.15\.2-server-/', '/^vboxadditions-kernel-3\.15\.2-server-/', + '/^broadcom-wl-/', '/^nvidia-current-/', '/^nvidia304-/', '/^nvidia173-/', '/^fglrx-/', if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -241,11 +241,11 @@ $o = { if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'), if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'), - if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest', 'nvidia173-kernel-desktop586-latest', 'vboxadditions-kernel-desktop586-latest'), - if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'nvidia173-kernel-desktop-latest', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), + if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'vboxadditions-kernel-desktop586-latest'), + if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'vboxadditions-kernel-desktop-latest', 'gummiboot'), - 'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia304', 'x11-driver-video-nvidia173', 'x11-driver-video-vboxvideo', - 'basesystem', + 'x11-server-common', 'x11-driver-video-vboxvideo', + 'basesystem', 'x11-driver-video', 'x11-driver-input', 'bluez-firmware', 'mageiawelcome', 'usbutils', # we want lsusb 'shared-mime-info', # needed for .desktop files to work atleast in gnome diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg index feebdae..dda8487 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -1,17 +1,17 @@ #repository=/distrib/mageia/distrib/cauldron -repository=/home/bcd/build_bcd/pieces/4 +repository=/home/bcd/build_bcd/pieces/cauldron #repository=/home/draklive/distrib/cauldron # updates_repository=/distrib/mageia/distrib/cauldron # updates_repository=/home/bcd/build_bcd/pieces/cauldron additional_repository= arch=i586 desktop=KDE4 -media=DVD +media=CD region=all pack= name=Mageia -product=LiveDVD -version=4.1 +product=LiveCD +version=5-alpha1 commercial=0 default_user=live builddir=/home/draklive/var-data/build |