summaryrefslogtreecommitdiffstats
path: root/examples/gui/config
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-12-15 21:34:01 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-12-15 23:11:21 +0000
commit7a576632911be26f2432f664151613a92b35db93 (patch)
treedc5b952e090eb738ca75f7aa16ae872788474f29 /examples/gui/config
parentcf03eb32aeb0e01bbb23f8bb65279bb1d940c269 (diff)
downloaddrakiso-7a576632911be26f2432f664151613a92b35db93.tar
drakiso-7a576632911be26f2432f664151613a92b35db93.tar.gz
drakiso-7a576632911be26f2432f664151613a92b35db93.tar.bz2
drakiso-7a576632911be26f2432f664151613a92b35db93.tar.xz
drakiso-7a576632911be26f2432f664151613a92b35db93.zip
Use 'release' instead of 'version' in settings.
This avoids confusion with the 'version' field found in the product.id and urpmi.cfg files, which is just the base version number.
Diffstat (limited to 'examples/gui/config')
-rw-r--r--examples/gui/config/build.cfg6
-rw-r--r--examples/gui/config/settings.cfg2
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index 94fae58..3aa0372 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -1,5 +1,5 @@
my $distro = $build->{settings}{distro};
-my $version = $build->{settings}{version};
+my $release = $build->{settings}{release};
my $product = $build->{settings}{product};
my $desktop = $build->{settings}{desktop};
my $arch = $build->{settings}{arch};
@@ -9,13 +9,13 @@ my @user_config_dirs = ('/etc/skel');
sub build_label {
my ($build) = @_;
- join('-', $distro, $version, $product, $desktop, $arch);
+ join('-', $distro, $release, $product, $desktop, $arch);
}
sub build_title {
my ($build) = @_;
- join(' ', $distro, $version, $product, $desktop);
+ join(' ', $distro, $release, $product, $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';
diff --git a/examples/gui/config/settings.cfg b/examples/gui/config/settings.cfg
index 0085504..e0a8b56 100644
--- a/examples/gui/config/settings.cfg
+++ b/examples/gui/config/settings.cfg
@@ -2,7 +2,7 @@ vendor=Custom
distro=Mageia
product=Live
desktop=Custom
-version=7
+release=7
arch=x86_64
repository=http://mirrors.kernel.org/mageia/distrib/7
workdir=