From: Michael Prokop <mika@grml.org>
Date: Mon, 13 Oct 2014 10:19:02 +0000 (+0200)
Subject: Make disk identifier configurable via DISK_IDENTIFIER variable
X-Git-Tag: v0.67~13
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=86c53253ecc5dd7971ab6e8d04b285c08265906a;ds=sidebyside

Make disk identifier configurable via DISK_IDENTIFIER variable

When using fixed disk identifiers for Virtual Machine
builds (using FIXED_DISK_IDENTIFIERS='yes').

Thanks: Patrick Schleizer <adrelanos@riseup.net> for the initial patch
Fixes: #28
---

diff --git a/config b/config
index 19e66b4..670f608 100644
--- a/config
+++ b/config
@@ -214,4 +214,8 @@
 # Default: 'no'
 # FIXED_DISK_IDENTIFIERS='yes'
 
+# Disk identifier when using FIXED_DISK_IDENTIFIERS='yes'.
+# Default: '26ada0c0-1165-4098-884d-aafd2220c2c6'
+# DISK_IDENTIFIER='26ada0c0-1165-4098-884d-aafd2220c2c6'
+
 ## END OF FILE #################################################################
diff --git a/grml-debootstrap b/grml-debootstrap
index a5c7ca6..007d0be 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -18,10 +18,12 @@ MNTPOINT="/mnt/debootstrap.$$"
 [ -n "$DEBCONF" ] || DEBCONF='yes'
 [ -n "$DEBIAN_FRONTEND" ] || DEBIAN_FRONTEND='noninteractive'
 [ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='debootstrap'
-[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8'
 [ -n "$DEFAULT_LANGUAGE" ] || DEFAULT_LANGUAGE='en_US:en'
+[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8'
+[ -n "$DISK_IDENTIFIER" ] || DISK_IDENTIFIER='26ada0c0-1165-4098-884d-aafd2220c2c6'
 [ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes'
 [ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian'
+[ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no"
 [ -n "$FORCE" ] || FORCE=''
 [ -n "$HOSTNAME" ] || HOSTNAME='grml'
 [ -n "$INITRD" ] || INITRD='yes'
@@ -41,7 +43,6 @@ MNTPOINT="/mnt/debootstrap.$$"
 [ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0'
 [ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes'
 [ -n "$VMSIZE" ] || VMSIZE="2G"
-[ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no"
 
 # inside the chroot system locales might not be available, so use minimum:
 export LANG=C
@@ -930,8 +931,8 @@ mkfs() {
         eend 1
         bailout 1
       else
-        einfo "Changing disk uuid for $TARGET to fixed (non-random) value using tune2fs"
-        tune2fs "$TARGET" -U 26ada0c0-1165-4098-884d-aafd2220c2c6
+        einfo "Changing disk uuid for $TARGET to fixed (non-random) value $DISK_IDENTIFIER using tune2fs"
+        tune2fs "$TARGET" -U "$DISK_IDENTIFIER"
         eend $?
       fi
     fi