From 70d801241f55d033a3ef6cd5ca5cb1d00b9647dd Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 5 Jan 2016 21:19:02 +0000
Subject: [PATCH] image name
---
src/freedombone-image | 8 ++++----
src/freedombone-image-makefile | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/freedombone-image b/src/freedombone-image
index 53fcb2328..8413bdf5e 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -50,7 +50,7 @@ VMDEBOOTSTRAP_REPO=git://git.liw.fi/vmdebootstrap
VMDEBOOTSTRAP_VERSION=0.8
MAKEFILE=${PROJECT_NAME}-image-makefile
IMAGE_SIZE=4G
-IMAGE_TYPE='full'
+IMAGE_NAME='full'
USERNAME=$(echo $USER)
PASSWORD=
@@ -260,11 +260,11 @@ chown -R $CURR_USER:$CURR_USER $BUILD_DIR
cd $BUILD_DIR
if [[ $MINIMAL_INSTALL == "yes" ]]; then
- IMAGE_TYPE='min'
+ IMAGE_NAME='min'
fi
if [[ $ONION_ONLY != "no" ]]; then
- IMAGE_TYPE='onion'
+ IMAGE_NAME='onion'
fi
cd $BUILD_DIR
@@ -283,7 +283,7 @@ make $IMAGE_TYPE \
MINIMAL_INSTALL="$MINIMAL_INSTALL" \
SSH_PORT="$SSH_PORT" \
ONION_ONLY="$ONION_ONLY" \
- IMAGE_TYPE="$IMAGE_TYPE"
+ IMAGE_NAME="$IMAGE_NAME"
if [ ! "$?" = "0" ]; then
echo $'Build failed'
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index f14d9192b..8bd11c7fb 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -30,7 +30,7 @@
MIRROR ?= http://httpredir.debian.org/debian
BUILD_MIRROR ?= http://httpredir.debian.org/debian
IMAGE_SIZE ?= 8G
-IMAGE_TYPE ?= 'full'
+IMAGE_NAME ?= 'full'
SUITE ?= jessie
# include source packages in image?
SOURCE ?= false
@@ -38,7 +38,7 @@ SOURCE ?= false
# yes no
BUILD = $(MACHINE)-$(ARCHITECTURE)
TODAY := $(shell date +%Y-%m-%d)
-NAME = build/$(PROJECT_NAME)-$(IMAGE_TYPE)-$(TODAY)_$(BUILD)
+NAME = build/$(PROJECT_NAME)-$(IMAGE_NAME)-$(TODAY)_$(BUILD)
IMAGE = $(NAME).img
ARCHIVE = $(NAME).tar.bz2
SIGNATURE = $(ARCHIVE).sig
--
GitLab