From 00f059abfd4c7896e3fd8de78ac7c1b66dcd6ba8 Mon Sep 17 00:00:00 2001
From: "Tomas Kelemen (vudiq)" <tomas.kelemen@gmail.com>
Date: Fri, 1 Jun 2018 11:52:36 +0200
Subject: [PATCH] mkimage: use BOOTLABEL and DISKLABEL directly

---
 scripts/mkimage | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scripts/mkimage b/scripts/mkimage
index 424181ec0a..e482defaa6 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -71,8 +71,6 @@ trap cleanup SIGINT
   UUID_2=$(date '+%M%S')
   FAT_SERIAL_NUMBER="${UUID_1}${UUID_2}"
   UUID_SYSTEM="${UUID_1}-${UUID_2}"
-  FAT_VOLUME_LABEL="${DISTRO_BOOTLABEL}"
-  STORAGE_VOLUME_LABEL="${DISTRO_DISKLABEL}"
 
 # create an image
   echo
@@ -129,7 +127,7 @@ fi
   alias mmd="mmd -i $DISK@@$OFFSET"
 
   if [ "$BOOTLOADER" = "syslinux" -o "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then
-    mformat -v "$FAT_VOLUME_LABEL" -N "$FAT_SERIAL_NUMBER" ::
+    mformat -v "$DISTRO_BOOTLABEL" -N "$FAT_SERIAL_NUMBER" ::
   fi
   sync
 
@@ -277,7 +275,7 @@ fi # bootloader
 # create filesystem on part2
   echo "image: creating filesystem on part2..."
   mke2fs -F -q -t ext4 -m 0 "$LE_TMP/part2.ext4"
-  tune2fs -L "$STORAGE_VOLUME_LABEL" -U $UUID_STORAGE "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
+  tune2fs -L "$DISTRO_DISKLABEL" -U $UUID_STORAGE "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
   e2fsck -n "$LE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
   sync