summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/build.cfg43
-rwxr-xr-xupdate_bootloader_files.sh2
2 files changed, 14 insertions, 31 deletions
diff --git a/config/build.cfg b/config/build.cfg
index da7ef56..4178d87 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -1,7 +1,3 @@
-#!/usr/bin/perl -cw
-
-use MDK::Common;
-
my $distro = $build->{settings}{distro};
my $version = $build->{settings}{version};
my $product = $build->{settings}{product};
@@ -14,7 +10,6 @@ my $has_lxde = member('LXDE', @desktops);
my $has_plasma = member('Plasma', @desktops);
my $has_xfce = member('Xfce', @desktops);
-my $use_modules = to_bool($build->{settings}{pack});
my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
sub build_label {
@@ -31,7 +26,7 @@ sub build_title {
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 = {
+my $config = {
system => {
enabled_media => [
'Core Release',
@@ -65,7 +60,7 @@ my $_l = {
if_($has_xfce, qw(XFCE)),
))
],
- compssListLevel => 5,
+ rpmsrate_level => 5,
include_packages => [
# Satisfy the basesystem bootloader requirement.
@@ -154,6 +149,8 @@ my $_l = {
'dkms-nvidia-current', 'x11-driver-video-nvidia-current',
],
+ langs_always => [ 'en_US' ],
+
post_install => join(";",
# systemd boots by default to multiuser.target (old init 3), so change to graphical (old init 5).
"ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target",
@@ -162,8 +159,6 @@ my $_l = {
"perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' /etc/inittab",
),
- langs_always => [ 'en_US' ],
-
disable_services => [
# Uncommon hardware.
qw(bpalogin capi4linux cpqarrayd mdadm oki4daemon pcscd),
@@ -304,35 +299,19 @@ my $_l = {
vga_mode => 788,
},
loopbacks => {
- exclude => {
- type => 'squashfs',
- files => [
- { path => '/root/drakx' },
- ],
- },
- if_($use_modules, modules => [
- { type => 'squashfs', source => '/root/drakx/i18n-*.lst', rooted => 1 },
- ]),
+ exclude => [
+ { path => '/root/drakx' },
+ ],
},
regions => {
int => [qw(en)],
},
- packs => {
- int => [ map { "i18n-$_" } qw(en) ],
- },
- copy_from_repo => [
- 'autorun.inf' => 'files/autorun.inf',
- 'dosutils' => 'files/dosutils',
- 'isolinux/memtest' => "boot/memtest",
- ],
media => {
- storage => 'iso',
label => build_label($build),
bootloader_title => build_title($build),
bootloader_theme => 'bootloader/maggy',
bootloader_font => 'bootloader/unicode.pf2',
bootloader_langs => 'bootloader/lang-names.txt',
- bootloader_kbds => 'bootloader/kbd-names.txt',
bootloader_messages => 'bootloader/messages',
bootloader_default => 0,
bootloader_timeout => 10,
@@ -341,7 +320,7 @@ my $_l = {
' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
'Install Mageia Live' => { append => $default_append . ' xdriver=free install' },
' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
- 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => '' },
+ 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
],
mbr_boot_img => 'bootloader/images/boot_hybrid.img',
eltorito_img => 'bootloader/images/eltorito.img',
@@ -353,6 +332,10 @@ my $_l = {
efi_type => '64bit',
boot64_efi => 'bootloader/images/bootx64.efi'
),
+ copy_from_repo => [
+ 'autorun.inf' => 'files/autorun.inf',
+ 'dosutils' => 'files/dosutils',
+ 'isolinux/memtest' => "boot/memtest",
+ ],
},
- mount => MGA::DrakISO::Mounts::volatile_squash_union($use_modules),
};
diff --git a/update_bootloader_files.sh b/update_bootloader_files.sh
index 4e7b2e8..7655012 100755
--- a/update_bootloader_files.sh
+++ b/update_bootloader_files.sh
@@ -20,6 +20,6 @@ for arch in $archs; do
exit 1
fi
fi
- cp -ru usr/share/drakiso-bootloader/* bootloader
+ cp -ru usr/share/drakiso/bootloader/* bootloader
rm -r usr
done