From 304a7b616167e3b291c437273ea28a60a2a12a55 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 15 Jan 2017 11:38:02 +0100
Subject: [PATCH 079/325] release/Makefile: Use the OSRELEASE verbatim as
 VOLUME_LABEL

... but shorten if the label would be too long otherwise.

On ElectroBSD the OSRELEASE only contains useful information.

Obtained from: ElectroBSD
---
 release/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index d68e4edbcef3..9a8891b4c221 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -65,11 +65,13 @@ ${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo
 .for _V in ${TARGET_ARCH}
 .if !empty(TARGET:M${_V})
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}
-VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET}
 .else
 OSRELEASE=	${TYPE}-${REVISION}-${BRANCH}-${TARGET}-${TARGET_ARCH}
-VOLUME_LABEL=	${REVISION:C/[.-]/_/g}_${BRANCH:C/[.-]/_/g}_${TARGET_ARCH}
 .endif
+# The label length needs to be below 32 characters to fit into
+# the UFS superblock. PRERELEASE is the only branch name that
+# can prevent this, so we shorten it.
+VOLUME_LABEL=	${OSRELEASE:C/PRERELEASE/PREREL/}
 .endfor
 .endif
 
-- 
2.32.0