summaryrefslogtreecommitdiffstats
path: root/examples/minimal
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/minimal
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/minimal')
-rw-r--r--examples/minimal/config/build.cfg8
-rw-r--r--examples/minimal/config/settings.cfg2
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/minimal/config/build.cfg b/examples/minimal/config/build.cfg
index 7e7780d..c6d3d9c 100644
--- a/examples/minimal/config/build.cfg
+++ b/examples/minimal/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 $type = $build->{settings}{type};
my $arch = $build->{settings}{arch};
@@ -10,19 +10,19 @@ my @user_config_dirs = ('/etc/skel', '/home/' . $default_user);
sub build_label {
my ($build) = @_;
- join('-', $distro, $version, $product, $type, $arch);
+ join('-', $distro, $release, $product, $type, $arch);
}
sub build_title {
my ($build) = @_;
- join(' ', $distro, $version, $product, $type);
+ join(' ', $distro, $release, $product, $type);
}
my $default_append = 'root=mgalive:LABEL=' . build_label($build) . ' noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0';
my $config = {
- iso_name_fields => [ qw(distro version product type arch) ],
+ iso_name_fields => [ qw(distro release product type arch) ],
system => {
enabled_media => [
'Core Release',
diff --git a/examples/minimal/config/settings.cfg b/examples/minimal/config/settings.cfg
index b4ee1b5..e37ae33 100644
--- a/examples/minimal/config/settings.cfg
+++ b/examples/minimal/config/settings.cfg
@@ -2,7 +2,7 @@ vendor=Custom
distro=Mageia
product=Live
type=Minimal
-version=7
+release=7
arch=x86_64
region=all
default_user=live