From 127456e5b57da8bdb9827e143a8064001628414f Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Fri, 19 Sep 2008 17:32:57 +0000
Subject: [PATCH] Added user-defined image volume label support. The default
 label is as previously: Haiku.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27636 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/BuildSetup            | 2 +-
 build/jam/HaikuImage            | 2 ++
 build/scripts/build_haiku_image | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 3315af5375..9bd85cae25 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -49,7 +49,7 @@ HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
 HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ;
 HAIKU_DEFAULT_INSTALL_DIR = /Haiku ;
 HAIKU_DEFAULT_IMAGE_SIZE ?= 128 ; # 128 MB
-
+HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ;
 
 # analyze an optionally replace jam's target parameters
 HAIKU_ORIGINAL_JAM_TARGETS = $(JAM_TARGETS) ;
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 99dd3d5fc7..c4d97c7e74 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -592,6 +592,7 @@ HAIKU_IMAGE_NAME ?= $(HAIKU_DEFAULT_IMAGE_NAME) ;
 HAIKU_IMAGE_DIR ?= $(HAIKU_DEFAULT_IMAGE_DIR) ;
 HAIKU_IMAGE = $(HAIKU_IMAGE_NAME) ;
 HAIKU_IMAGE_SIZE ?= $(HAIKU_DEFAULT_IMAGE_SIZE) ; # 100 MB
+HAIKU_IMAGE_LABEL ?= $(HAIKU_DEFAULT_IMAGE_LABEL) ; 
 MakeLocate $(HAIKU_IMAGE) : $(HAIKU_IMAGE_DIR) ;
 
 # Set the default installation directory.
@@ -612,6 +613,7 @@ AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
 AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
 #AddVariableToScript $(script) : isImage : 1 ;
 AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
+AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
 AddVariableToScript $(script) : addBuildCompatibilityLibDir
 	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
 AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
diff --git a/build/scripts/build_haiku_image b/build/scripts/build_haiku_image
index 7b47eaed8e..f64cc33ed0 100755
--- a/build/scripts/build_haiku_image
+++ b/build/scripts/build_haiku_image
@@ -8,6 +8,7 @@
 # isImage
 # imagePath
 # imageSize
+# imageLabel
 # addBuildCompatibilityLibDir
 # updateOnly
 # dontClearImage
@@ -128,8 +129,8 @@ if [ $isImage ]; then
 				|| exit 1
 		fi
 
-		$bfsShell --initialize $imageOffsetFlags "$imagePath" Haiku \
-			"block_size 2048" || exit 1
+		$bfsShell --initialize $imageOffsetFlags "$imagePath" \
+			"$imageLabel" "block_size 2048" || exit 1
 		$makebootable $imageOffsetFlags "$imagePath"
 	fi
 	$bfsShell -n $imageOffsetFlags "$imagePath" > /dev/null &