summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-19 17:28:18 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2017-12-19 19:38:59 +0000
commit6dfba4b638f9f16112824318cc869eb6d8d1a86e (patch)
tree75001e10f868499add6f4f22cc5962d75fbf709c /config
parent52bb40d59aed2dc9777bf3ff20be3a6d9b56e5ca (diff)
downloaddraklive-config-6dfba4b638f9f16112824318cc869eb6d8d1a86e.tar
draklive-config-6dfba4b638f9f16112824318cc869eb6d8d1a86e.tar.gz
draklive-config-6dfba4b638f9f16112824318cc869eb6d8d1a86e.tar.bz2
draklive-config-6dfba4b638f9f16112824318cc869eb6d8d1a86e.tar.xz
draklive-config-6dfba4b638f9f16112824318cc869eb6d8d1a86e.zip
Switch to using drakiso version of draklive.
- s/$live/$build/ - rename live.cfg to build.cfg - remove some redundant settings and configuration values - use mga6 repository for testing until cauldron stabilises - rename postInstall to final_fixes
Diffstat (limited to 'config')
-rw-r--r--config/build.cfg (renamed from config/live.cfg)55
-rw-r--r--config/settings.cfg14
2 files changed, 31 insertions, 38 deletions
diff --git a/config/live.cfg b/config/build.cfg
index 1a2bbc8..e7935f0 100644
--- a/config/live.cfg
+++ b/config/build.cfg
@@ -2,28 +2,25 @@
use MDK::Common;
-my $use_modules = to_bool($live->{settings}{pack});
-my @user_config_dirs = ('/etc/skel', if_($live->{settings}{default_user}, '/home/' . $live->{settings}{default_user}));
+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 {
- my ($live) = @_;
+ my ($build) = @_;
- my ($version, $extra) = split(/-/, $live->{settings}{version});
- "LABEL=" . join("-", "Mageia", $version, $live->{settings}{desktop}, $live->{settings}{product});
+ my ($version, $extra) = split(/-/, $build->{settings}{version});
+ "LABEL=" . join("-", "Mageia", $version, $build->{settings}{desktop}, $build->{settings}{product});
}
my $_l = {
- workdir => $live->{settings}{workdir},
system => {
- root => $live->{settings}{chroot},
- repository => $live->{settings}{repository},
auto_install => 'config/auto_inst.cfg.pl',
install_env => {
},
- if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}),
+ if_($build->{settings}{default_user}, preselect_kdm_user => $build->{settings}{default_user}),
langs_always => [ 'en_US' ],
files => [
- if_($live->{settings}{desktop} eq 'GNOME',
+ if_($build->{settings}{desktop} eq 'GNOME',
# add draklive-install icon to favourites in live mode and disable screen locking
# (override files are processed in alphabetical order - make sure this one comes last)
[ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ],
@@ -42,10 +39,10 @@ my $_l = {
[ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ],
# add local repos
- if_($live->{settings}{arch} eq 'i586',
+ if_($build->{settings}{arch} eq 'i586',
[ 'files/mga_rpms/i586/mga_rpms', '/var/local' ],
),
- if_($live->{settings}{arch} eq 'x86_64',
+ if_($build->{settings}{arch} eq 'x86_64',
[ 'files/mga_rpms/x86_64/mga_rpms', '/var/local' ],
),
@@ -78,11 +75,11 @@ my $_l = {
[ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ],
# fix for /var/lib/gdm sometimes ending up as root:root
- if_($live->{settings}{desktop} eq 'GNOME',
+ if_($build->{settings}{desktop} eq 'GNOME',
[ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ]
),
- if_($live->{settings}{desktop} eq 'Plasma',
+ if_($build->{settings}{desktop} eq 'Plasma',
[ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ],
[ 'files/draklive-install.d/remove.d/clear-sddm-state', '/etc/draklive-install.d/remove.d/clear-sddm-state', { mode => 0644 } ],
),
@@ -134,20 +131,20 @@ my $_l = {
],
append => "splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0",
vga_mode => 788,
- postInstall => join(';',
- if_($live->{settings}{default_user}, "echo $live->{settings}{default_user} > /etc/draklive-install.d/user"),
- "perl -pi -e 's,<DEFAULT_USER>,$live->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install",
+ final_fixes => join(';',
+ if_($build->{settings}{default_user}, "echo $build->{settings}{default_user} > /etc/draklive-install.d/user"),
+ "perl -pi -e 's,<DEFAULT_USER>,$build->{settings}{default_user},' /etc/draklive-install.d/sysconfig/finish-install",
- if_($live->{settings}{desktop} eq 'Xfce' && $live->{settings}{default_user},
+ if_($build->{settings}{desktop} eq 'Xfce' && $build->{settings}{default_user},
# add a desktop icon to run draklive-install
- "mkdir -p /home/$live->{settings}{default_user}/Desktop",
- "cp /usr/share/applications/mageia-draklive-install.desktop /home/$live->{settings}{default_user}/Desktop/draklive-install.desktop",
+ "mkdir -p /home/$build->{settings}{default_user}/Desktop",
+ "cp /usr/share/applications/mageia-draklive-install.desktop /home/$build->{settings}{default_user}/Desktop/draklive-install.desktop",
),
#- fix user perms for copied files
- if_($live->{settings}{default_user}, "chown -R " .
- "$live->{settings}{default_user}.$live->{settings}{default_user}" .
- " /home/$live->{settings}{default_user}"
+ if_($build->{settings}{default_user}, "chown -R " .
+ "$build->{settings}{default_user}.$build->{settings}{default_user}" .
+ " /home/$build->{settings}{default_user}"
),
# remove readahead
@@ -157,13 +154,13 @@ my $_l = {
#- which can be huge
'> /var/log/lastlog',
- if_($live->{settings}{desktop} eq 'Plasma',
+ if_($build->{settings}{desktop} eq 'Plasma',
"rm -f /usr/share/icons/*/icon-theme.cache",
"cp -a /etc/akonadi/mysql-global.conf /etc/akonadi/mysql-global-standard.conf",
"cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf",
"ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak",
),
- if_($live->{settings}{desktop} eq 'GNOME',
+ if_($build->{settings}{desktop} eq 'GNOME',
# modify and compile schema to get draklive-install and Firefox in menu
"sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override",
"glib-compile-schemas /usr/share/glib-2.0/schemas/",
@@ -210,10 +207,10 @@ my $_l = {
"sed -i -r 's/DeviceTimeout=[0-9]+/DeviceTimeout=10/' /usr/share/plymouth/plymouthd.defaults",
),
additional_media => [
- if_($live->{settings}{updates_repository},
+ if_($build->{settings}{updates_repository},
{
name => 'core_updates_testing',
- path => $live->{settings}{updates_repository} . '/' . $live->{settings}{arch} . '/media/core/updates_testing',
+ path => $build->{settings}{updates_repository} . '/' . $build->{settings}{arch} . '/media/core/updates_testing',
packages => [
],
},
@@ -243,7 +240,7 @@ my $_l = {
},
media => {
storage => 'iso',
- source => build_one_label($live),
+ source => build_one_label($build),
bootloader_langs => 'bootloader/lang-names.txt',
bootloader_kbds => 'bootloader/kbd-names.txt',
bootloader_messages => 'bootloader/po',
@@ -263,5 +260,5 @@ my $_l = {
#map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf)
],
},
- mount => MDV::Draklive::Mounts::volatile_squash_union($use_modules),
+ mount => MGA::DrakISO::Mounts::volatile_squash_union($use_modules),
};
diff --git a/config/settings.cfg b/config/settings.cfg
index d739cbc..c49e14b 100644
--- a/config/settings.cfg
+++ b/config/settings.cfg
@@ -1,14 +1,10 @@
-repository=/home/bcd/build_bcd/pieces/cauldron
-additional_repository=
-arch=x86_64
-desktop=GNOME
-media=Hybrid
-region=all
-pack=
name=Mageia
-product=Live
version=6
-commercial=0
+product=Live
+desktop=GNOME
+arch=x86_64
+region=all
default_user=live
+repository=/home/bcd/build_bcd/pieces/6
builddir=/home/draklive/var-data/build
chroot=/home/draklive/var-data/chroot