diff options
| author | Olivier Blin <blino@mageia.org> | 2012-01-10 21:51:19 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2012-01-10 21:51:19 +0000 |
| commit | 9e504e89943a8dc64ff3d054dc028f49653262b0 (patch) | |
| tree | 8ab941acec1a1f04c6b494e9109557b97bf77b96 | |
| parent | 8cdb509782ebbda16498aa1ed0a028c06f38f32d (diff) | |
| download | draklive-config-9e504e89943a8dc64ff3d054dc028f49653262b0.tar draklive-config-9e504e89943a8dc64ff3d054dc028f49653262b0.tar.gz draklive-config-9e504e89943a8dc64ff3d054dc028f49653262b0.tar.bz2 draklive-config-9e504e89943a8dc64ff3d054dc028f49653262b0.tar.xz draklive-config-9e504e89943a8dc64ff3d054dc028f49653262b0.zip | |
revert mkinitrd/nash changes (r2628), dracut is the goal
| -rw-r--r-- | config/auto_inst.cfg.pl | 5 | ||||
| -rw-r--r-- | config/settings-livecd.cfg | 3 | ||||
| -rwxr-xr-x | tools/build_live.sh | 12 |
3 files changed, 8 insertions, 12 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl index 2af291e..77a1d0d 100644 --- a/config/auto_inst.cfg.pl +++ b/config/auto_inst.cfg.pl @@ -64,9 +64,6 @@ $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)-/", @@ -205,7 +202,7 @@ $o = { if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'), # needed to build the livecd - 'mkinitrd', 'nash', + '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 f387bd7..f6b4583 100644 --- a/config/settings-livecd.cfg +++ b/config/settings-livecd.cfg @@ -1,6 +1,5 @@ # repository=/distrib/mageia/distrib/cauldron -repository/home/draklive/mirror-mkinitrd -#repository=/home/bcd/build_bcd/pieces/cauldron +repository=/home/bcd/build_bcd/pieces/cauldron # updates_repository=/distrib/mageia/distrib/cauldron # updates_repository=/home/bcd/build_bcd/pieces/cauldron additional_repository= diff --git a/tools/build_live.sh b/tools/build_live.sh index ebc2581..15713bd 100755 --- a/tools/build_live.sh +++ b/tools/build_live.sh @@ -8,13 +8,13 @@ exec &>$logdir/draklive-$set.log set -x -#archs="i586" -archs="i586 x86_64" -desktops="KDE4 GNOME" -#desktops="KDE4" -regions="Europe1-Americas Europe2 Africa-India Asia-Noindia" +archs="i586" +#archs="i586 x86_64" +#desktops="KDE4 GNOME" +desktops="KDE4" +#regions="Europe1-Americas Europe2 Africa-India Asia-Noindia" #regions="int" -#regions="Europe1-Americas" +regions="Europe1-Americas" draklive_config=$(dirname $(dirname $0)) #draklive_config=/home/blino/live-config/ |