diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 16:23:35 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 16:23:35 +0000 |
| commit | a37173d23897a26b91032344826f88da05aa08aa (patch) | |
| tree | 06352a1cae6949950724b72ef7fffc47021aa892 | |
| parent | 73736f5c820dc990031f1dec2211a55f52dc1e06 (diff) | |
| download | draklive-config-a37173d23897a26b91032344826f88da05aa08aa.tar draklive-config-a37173d23897a26b91032344826f88da05aa08aa.tar.gz draklive-config-a37173d23897a26b91032344826f88da05aa08aa.tar.bz2 draklive-config-a37173d23897a26b91032344826f88da05aa08aa.tar.xz draklive-config-a37173d23897a26b91032344826f88da05aa08aa.zip | |
Update config files for latest changes in drakiso.
| -rw-r--r-- | config/build.cfg | 30 | ||||
| -rw-r--r-- | config/settings.cfg | 5 |
2 files changed, 21 insertions, 14 deletions
diff --git a/config/build.cfg b/config/build.cfg index 3472fd6..38f9295 100644 --- a/config/build.cfg +++ b/config/build.cfg @@ -5,12 +5,20 @@ use MDK::Common; my $use_modules = to_bool($build->{settings}{pack}); my @user_config_dirs = ('/etc/skel', if_($build->{settings}{default_user}, '/home/' . $build->{settings}{default_user})); -sub build_one_label { +sub build_label { my ($build) = @_; - "LABEL=" . join("-", "Mageia", $build->{settings}{version}, $build->{settings}{product}, $build->{settings}{desktop}); + join('-', 'Mageia', $build->{settings}{version}, $build->{settings}{product}, $build->{settings}{desktop}, $build->{settings}{arch}); } +sub build_title { + my ($build) = @_; + + join(' ', 'Mageia', $build->{settings}{version}, $build->{settings}{product}, $build->{settings}{desktop}); +} + +my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0'; + my $_l = { system => { auto_install => 'config/auto_inst.cfg.pl', @@ -128,7 +136,6 @@ my $_l = { ], disable_timers => [ ], - append => "splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0", vga_mode => 788, final_fixes => join(';', if_($build->{settings}{default_user}, "echo $build->{settings}{default_user} > /etc/draklive-install.d/user"), @@ -239,24 +246,23 @@ my $_l = { }, media => { storage => 'iso', - source => build_one_label($build), + label => build_label($build), + bootloader_title => build_title($build), bootloader_langs => 'bootloader/lang-names.txt', bootloader_kbds => 'bootloader/kbd-names.txt', bootloader_messages => 'bootloader/po', bootloader_default => 0, bootloader_timeout => 10, - bootloader_entries => [ 'Boot Mageia Live' => 'xdriver=free', - ' + use non-free video drivers (slower to boot)' => 'nokmsboot', - 'Install Mageia Live' => 'install xdriver=free', - ' + use non-free video drivers (slower to boot)' => 'install nokmsboot', - ], + bootloader_entries => [ + 'Boot Mageia Live' => { append => $default_append . ' xdriver=free' }, + ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' }, + 'Install Mageia Live' => { append => $default_append . ' xdriver=free' }, + ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' }, + ], #mbr_boot_img => 'bootloader/boot_hybrid.img', #eltorito_img => 'bootloader/eltorito.img', #bootx64_efi => 'bootloader/bootx64.efi', files => [ - # FIXME: add doc and autorun - #[ 'extra/livecd/autorun/*', ''], - #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) ], }, mount => MGA::DrakISO::Mounts::volatile_squash_union($use_modules), diff --git a/config/settings.cfg b/config/settings.cfg index c49e14b..790e563 100644 --- a/config/settings.cfg +++ b/config/settings.cfg @@ -1,7 +1,8 @@ -name=Mageia -version=6 +vendor=Mageia +distro=Mageia product=Live desktop=GNOME +version=6 arch=x86_64 region=all default_user=live |