summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-01-09 17:22:29 +0000
committerThomas Backlund <tmb@mageia.org>2012-01-09 17:22:29 +0000
commit9e8d5ca7b6c84afff92bc1b074255b6ccda032c3 (patch)
tree33f9cb2dddd600a0cf8682c358ed4ac208b6d3de
parentb1934308d6e6bbfab2e45f6febdfd5b541c6227c (diff)
downloaddraklive-config-9e8d5ca7b6c84afff92bc1b074255b6ccda032c3.tar
draklive-config-9e8d5ca7b6c84afff92bc1b074255b6ccda032c3.tar.gz
draklive-config-9e8d5ca7b6c84afff92bc1b074255b6ccda032c3.tar.bz2
draklive-config-9e8d5ca7b6c84afff92bc1b074255b6ccda032c3.tar.xz
draklive-config-9e8d5ca7b6c84afff92bc1b074255b6ccda032c3.zip
force mkinitrd instead of dracut for alpha3
-rw-r--r--config/auto_inst.cfg.pl5
-rw-r--r--config/settings-livecd.cfg3
2 files changed, 6 insertions, 2 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 7961734..bb326b2 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -64,6 +64,9 @@ $o = {
'aspell',
'aspell-en',
+ # draklive does not work with dracut
+ 'dracut',
+
if_($ENV{DRAKLIVE_PRODUCT} !~ /guadec/i, 'gcc'),
"/^mageia-theme(?!-common|-kde-background|-$distro_theme(?:|-screensaver))-/",
"/^mageia-release(?!-common|-$distro_release)-/",
@@ -200,7 +203,7 @@ $o = {
if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
# needed to build the livecd
- 'nash',
+ 'mkinitrd', 'nash',
# needed to get some wifi working, can be dropped when some package suggests/requires it
'rfkill',
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index f6b4583..f387bd7 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -1,5 +1,6 @@
# repository=/distrib/mageia/distrib/cauldron
-repository=/home/bcd/build_bcd/pieces/cauldron
+repository/home/draklive/mirror-mkinitrd
+#repository=/home/bcd/build_bcd/pieces/cauldron
# updates_repository=/distrib/mageia/distrib/cauldron
# updates_repository=/home/bcd/build_bcd/pieces/cauldron
additional_repository=