X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=fd63e7d059221bfe6b2fbd5adcadb014da3594ca;hp=0c0df3f8339297733c86d6381e9eeb4a729cd033;hb=5a873a814c3c3b5be33b7142f853fc7dc924e498;hpb=80fae65003d0e67cebb17c596092d805f0f7e0ea

diff --git a/grml-debootstrap b/grml-debootstrap
index 0c0df3f..fd63e7d 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -39,6 +39,7 @@ 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
@@ -792,6 +793,16 @@ else
 fi
 # }}}
 
+# It is not possible to build amd64 on i686. {{{
+CURRENT_ARCH="$(uname -m)"
+if [ "$CURRENT_ARCH" != "x86_64" ] ; then
+   if [ "$ARCH" = "amd64" ] ; then
+      eerror "It is not possible to build amd64 on $CURRENT_ARCH." ; eend 1
+      bailout 1
+   fi
+fi
+# }}}
+
 checkconfiguration
 
 # finally make sure at least $TARGET is set [the partition for the new system] {{{
@@ -877,6 +888,12 @@ mkfs() {
        einfo "Running $MKFS on $TARGET"
        $MKFS $TARGET ; RC=$?
 
+       if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
+         einfo "Changing disk uuid for $TARGET to fixed (non-random) value using tune2fs"
+         tune2fs "$TARGET" -U 26ada0c0-1165-4098-884d-aafd2220c2c6
+         eend $?
+       fi
+
        # make sure /dev/disk/by-uuid/... is up2date, otherwise grub
        # will fail to detect the uuid in the chroot
        if echo "$TARGET" | grep -q "/dev/md" ; then
@@ -951,6 +968,14 @@ prepare_vm() {
   qemu-img create -f raw "${TARGET}" "${VMSIZE}"
   echo 4 66 | /usr/share/grml-debootstrap/bootgrub.mksh -A | dd of="$TARGET" conv=notrunc
   dd if=/dev/zero bs=1 conv=notrunc count=64 seek=446 of="$TARGET"
+  if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
+    einfo "Adjusting disk signature to a fixed (non-random) value"
+    MBRTMPFILE=$(mktemp)
+    dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1
+    echo -en "\x41\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1
+    dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
+    eend $?
+  fi
   parted -s "${TARGET}" 'mkpart primary ext3 2M -1'
 
   # if dm-mod isn't available then kpartx will fail with