summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-05-30 20:15:54 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-05-30 20:15:54 +0100
commit5dbb5b8d9443c5e20e5e284e51563e4e465c1381 (patch)
treec17ee537d209ec7c08d152cdec499afb572950b0 /config
parent66f04b049c33a13173ad72bedc06fac46f046990 (diff)
downloaddraklive-config-5dbb5b8d9443c5e20e5e284e51563e4e465c1381.tar
draklive-config-5dbb5b8d9443c5e20e5e284e51563e4e465c1381.tar.gz
draklive-config-5dbb5b8d9443c5e20e5e284e51563e4e465c1381.tar.bz2
draklive-config-5dbb5b8d9443c5e20e5e284e51563e4e465c1381.tar.xz
draklive-config-5dbb5b8d9443c5e20e5e284e51563e4e465c1381.zip
Use pcmemtest for memory test.
Diffstat (limited to 'config')
-rw-r--r--config/build.cfg12
1 files changed, 5 insertions, 7 deletions
diff --git a/config/build.cfg b/config/build.cfg
index e4b5506..e0c3546 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -27,7 +27,7 @@ sub build_title {
join(' ', $distro, $release, $product, $desktops[0]);
}
-my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 splash quiet';
+my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vga=788 splash quiet';
my $config = {
system => {
@@ -340,8 +340,6 @@ my $config = {
# boot. We should have done all necessary updates at build time.
"touch /etc/.updated /var/.updated",
),
-
- vga_mode => 788,
},
loopbacks => {
exclude => [
@@ -366,7 +364,7 @@ my $config = {
' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot xclone=1' },
'Install Mageia Live' => { append => $default_append . ' noxconf install' },
' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot xclone=1 install' },
- 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
+ 'Memory Test' => { command => 'linux32', image => '/boot/pcmemtest', initrd => 'none' },
],
mbr_boot_img => 'bootloader/images/boot_hybrid.img',
eltorito_img => 'bootloader/images/eltorito.img',
@@ -382,9 +380,9 @@ my $config = {
boot64_efi => 'bootloader/images/bootx64.efi'
),
copy_from_repo => [
- 'autorun.inf' => 'files/autorun.inf',
- 'dosutils' => 'files/dosutils',
- 'isolinux/memtest' => "boot/memtest",
+ 'autorun.inf' => 'files/autorun.inf',
+ 'dosutils' => 'files/dosutils',
+ 'isolinux/pcmemtest' => "boot/pcmemtest",
],
checksums => [ qw(md5 sha2 sha3) ],
},