summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-12-17 21:20:33 (GMT)
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-12-17 21:20:33 (GMT)
commit3903cc3b39ece18857e580ce75c8cb9026b7e7d1 (patch)
tree69268573859996cd364a38967ca9e458fdf15e5a
parent6681c19754a068ef2c829c949204cbf23fcf299d (diff)
Rename 'version' setting to 'release'.
-rw-r--r--config/build.cfg8
-rw-r--r--config/settings.cfg2
2 files changed, 5 insertions, 5 deletions
diff --git a/config/build.cfg b/config/build.cfg
index 1905882..2e901a4 100644
--- a/config/build.cfg
+++ b/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 $arch = $build->{settings}{arch};
my $default_user = $build->{settings}{default_user};
@@ -15,14 +15,14 @@ my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
sub build_label {
my ($build) = @_;
- my $short_version = $version =~ s/beta/b/r;
- join('-', $distro, $short_version, $product, $desktops[0], $arch);
+ my $short_release = $release =~ s/beta/b/r;
+ join('-', $distro, $short_release, $product, $desktops[0], $arch);
}
sub build_title {
my ($build) = @_;
- join(' ', $distro, $version, $product, $desktops[0]);
+ join(' ', $distro, $release, $product, $desktops[0]);
}
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/config/settings.cfg b/config/settings.cfg
index de0fe66..e6fb9bc 100644
--- a/config/settings.cfg
+++ b/config/settings.cfg
@@ -2,7 +2,7 @@ vendor=Mageia
distro=Mageia
product=Live
desktop=Xfce
-version=7-beta1
+release=7-beta1
arch=x86_64
region=all
default_user=live