diff options
author | Thomas Backlund <tmb@mageia.org> | 2014-08-31 14:28:16 +0200 |
---|---|---|
committer | Thomas Backlund <tmb@mageia.org> | 2014-08-31 14:28:16 +0200 |
commit | 1a7671a56936fb15a8c71750a85fdd62216c5bc5 (patch) | |
tree | fa29f67df2120c991380a2a1b6b1add8392ef89d /config | |
parent | 8fbe674ed37d05169dde3e8f1c170758d0f66c4a (diff) | |
download | draklive-config-1a7671a56936fb15a8c71750a85fdd62216c5bc5.tar draklive-config-1a7671a56936fb15a8c71750a85fdd62216c5bc5.tar.gz draklive-config-1a7671a56936fb15a8c71750a85fdd62216c5bc5.tar.bz2 draklive-config-1a7671a56936fb15a8c71750a85fdd62216c5bc5.tar.xz draklive-config-1a7671a56936fb15a8c71750a85fdd62216c5bc5.zip |
Mga 4.1 configsdistro/mga4.1
Diffstat (limited to 'config')
-rw-r--r-- | config/auto_inst.cfg.pl | 8 | ||||
-rw-r--r-- | config/live.cfg | 5 | ||||
-rw-r--r-- | config/settings-livecd.cfg | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 4f48f8c..e3b0da1 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -196,8 +196,8 @@ $o = { 'mono', # block the kernels we dont want - if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.8-desktop-/', '/^nvidia-current-kernel-3\.12\.8-desktop-/', '/^nvidia304-kernel-3\.12\.8-desktop-', '/^nvidia173-kernel-3\.12\.8-desktop-/', '/^vboxadditions-kernel-3\.12\.8-desktop-/'), - '/^kernel-server-/', '/^fglrx-kernel-3\.12\.8-server-/', '/^nvidia-current-kernel-3\.12\.8-server-/', '/^nvidia304-kernel-3\.12\.8-server-/', '/^nvidia173-kernel-3\.12\.8-server-/', '/^vboxadditions-kernel-3\.12\.8-server-/', + 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_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'), @@ -210,7 +210,7 @@ $o = { 'flash-player-plugin', # xguest sucks - 'xguest', + 'xguest', 'apper', # not wanted (mga #9752) 'al-anvar', @@ -261,6 +261,8 @@ $o = { if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',), + if_($has_kde4, 'kcm_touchpad',), + if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i, 'samba-client', 'RealPlayer', 'RealPlayer-rpnp', diff --git a/config/live.cfg b/config/live.cfg index 5b8b4cb..f320962 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -298,6 +298,7 @@ my $_l = { # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) + [ 'files/isolinux/CD/*', 'isolinux/' ], ], ), if_($live->{settings}{product} =~ /LiveDVD/i, @@ -316,8 +317,12 @@ my $_l = { # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) + [ 'files/isolinux/DVD/*', 'isolinux/' ], ], ), + + + }, #extra_media => [ { storage => 'usb' } ], mount => MDV::Draklive::Mounts::volatile_squash_union($use_modules), diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg index 524dafa..feebdae 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -1,5 +1,5 @@ #repository=/distrib/mageia/distrib/cauldron -repository=/home/bcd/build_bcd/pieces/cauldron +repository=/home/bcd/build_bcd/pieces/4 #repository=/home/draklive/distrib/cauldron # updates_repository=/distrib/mageia/distrib/cauldron # updates_repository=/home/bcd/build_bcd/pieces/cauldron @@ -7,11 +7,11 @@ additional_repository= arch=i586 desktop=KDE4 media=DVD -region=int +region=all pack= name=Mageia product=LiveDVD -version=4 +version=4.1 commercial=0 default_user=live builddir=/home/draklive/var-data/build |