[lxc-devel] [distrobuilder/master] definition: Fix default name and definition template

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 363 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180327/ae81052e/attachment.bin>
-------------- next part --------------
From d0444007c2fbaa2fa006cc0dc71e63ea7b7f6876 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 27 Mar 2018 12:57:42 +0200
Subject: [PATCH] definition: Fix default name and definition template

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 shared/definition.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shared/definition.go b/shared/definition.go
index b858a0a..8397725 100644
--- a/shared/definition.go
+++ b/shared/definition.go
@@ -167,11 +167,11 @@ func (d *Definition) SetDefaults() {
 
 	// Set default name and description templates
 	if d.Image.Name == "" {
-		d.Image.Name = "{{ image.distribution }}-{{ image.release }}-{{ image.mapped_architecture }}-{{ image.variant }}-{{ image.serial }}"
+		d.Image.Name = "{{ image.distribution }}-{{ image.release }}-{{ image.architecture_mapped }}-{{ image.variant }}-{{ image.serial }}"
 	}
 
 	if d.Image.Description == "" {
-		d.Image.Description = "{{ image.distribution|capfirst }} {{ image.release }} {{ image.mapped_architecture }}{% if image.variant != \"default\" %} ({{ image.variant }}){% endif %} ({{ image.serial }})"
+		d.Image.Description = "{{ image.distribution|capfirst }} {{ image.release }} {{ image.architecture_mapped }}{% if image.variant != \"default\" %} ({{ image.variant }}){% endif %} ({{ image.serial }})"
 	}
 }