X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=66c8213a6f63cb0f5cb760bc6815dae8cbed0fd1;hp=c87c9b6cd5b5436e74d900b6ee83569d1be27b86;hb=8b1c652b800232a1ec82272e9802f1a252cf0f36;hpb=172555b16331aaa411d3cdac7625e5d0d444d793

diff --git a/grml-debootstrap b/grml-debootstrap
index c87c9b6..66c8213 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -5,41 +5,41 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2+
 ################################################################################
-# http://www.debian.org/releases/stable/i386/index.html.en
 
 # variables {{{
 PN="$(basename $0)"
-VERSION="$(dpkg --list $PN 2>/dev/null| awk '/^i/ {print $3}')"
+VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
 VERSION="${VERSION:-unknown}"
 MNTPOINT="/mnt/debootstrap.$$"
 
 # defaults
-[ -n "$CHROOT_SCRIPTS"] || CHROOT_SCRIPTS='yes'
-[ -n "$CONFFILES"] || CONFFILES='/etc/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 "$EXTRAPACKAGES"] || EXTRAPACKAGES='yes'
-[ -n "$FALLBACK_MIRROR"] || FALLBACK_MIRROR='http://http.debian.net/debian'
-[ -n "$FORCE"] || FORCE=''
-[ -n "$HOSTNAME"] || HOSTNAME='grml'
-[ -n "$INITRD"] || INITRD='yes'
-[ -n "$INSTALL_NOTES"] || INSTALL_NOTES='/etc/debootstrap/install_notes'
-[ -n "$LOCALES"] || LOCALES='yes'
-[ -n "$MIRROR"] || MIRROR="$FALLBACK_MIRROR"
-[ -n "$MKFS"] || MKFS='mkfs.ext3'
-[ -n "$PACKAGES"] || PACKAGES='yes'
-[ -n "$PRE_SCRIPTS"] || PRE_SCRIPTS='yes'
-[ -n "$RECONFIGURE"] || RECONFIGURE='console-data'
-[ -n "$RELEASE"] || RELEASE='wheezy'
-[ -n "$RM_APTCACHE"] || RM_APTCACHE='yes'
-[ -n "$SCRIPTS"] || SCRIPTS='yes'
-[ -n "$SECURE"] || SECURE='yes'
-[ -n "$TIMEZONE"] || TIMEZONE='Europe/Vienna'
-[ -n "$TUNE2FS"] || TUNE2FS='tune2fs -c0 -i0'
-[ -n "$UPGRADE_SYSTEM"] || UPGRADE_SYSTEM='yes'
-[ -n "$VMSIZE"] || VMSIZE="2G"
+[ -n "$CHROOT_SCRIPTS" ] || CHROOT_SCRIPTS='yes'
+[ -n "$CONFFILES" ] || CONFFILES='/etc/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 "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes'
+[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian'
+[ -n "$FORCE" ] || FORCE=''
+[ -n "$HOSTNAME" ] || HOSTNAME='grml'
+[ -n "$INITRD" ] || INITRD='yes'
+[ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes'
+[ -n "$LOCALES" ] || LOCALES='yes'
+[ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"
+[ -n "$MKFS" ] || MKFS='mkfs.ext4'
+[ -n "$PACKAGES" ] || PACKAGES='yes'
+[ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes'
+[ -n "$RECONFIGURE" ] || RECONFIGURE='console-data'
+[ -n "$RELEASE" ] || RELEASE='wheezy'
+[ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes'
+[ -n "$SCRIPTS" ] || SCRIPTS='yes'
+[ -n "$SECURE" ] || SECURE='yes'
+[ -n "$TIMEZONE" ] || TIMEZONE='Europe/Vienna'
+[ -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
@@ -77,8 +77,8 @@ Bootstrap options:
 
 Options for Virtual Machine deployment:
 
-      --vmfile           Set up a Virtual Machine instead of installing to
-                         a partition or directory, to be combined with --target,
+      --vmfile           Set up a Virtual Machine (raw format) instead of installing
+                         to a partition or directory, to be combined with --target,
                          like: --vmfile --target /mnt/sda1/qemu.img
       --vmsize <size>    Use specified size for size of VM file (default: 2G).
                          Syntax as supported by qemu-img, like: --vmsize 3G
@@ -108,6 +108,7 @@ Configuration options:
 Other options:
 
   -v, --verbose            Increase verbosity.
+      --debug              Execute in very verbose way.
   -h, --help               Print this usage information and exit.
   -V, --version            Show summary of options and exit.
 
@@ -333,6 +334,11 @@ fi
 [ "$_opt_insecure" ]            && echo "Warning: --insecure is deprecated, continuing anyway."
 [ "$_opt_force" ]               && FORCE=$_opt_force
 [ "$_opt_verbose" ]             && VERBOSE="-v"
+[ "$_opt_debug" ]               && DEBUG="true"
+
+if [ "$DEBUG" = "true" ] ; then
+  set -x
+fi
 
 [ "$_opt_help" ] && {
   usage ; eend 0
@@ -793,6 +799,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] {{{
@@ -878,6 +894,18 @@ mkfs() {
        einfo "Running $MKFS on $TARGET"
        $MKFS $TARGET ; RC=$?
 
+       if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
+         if ! echo "$MKFS" | grep -q "mkfs.ext" ; then
+           eerror "Not changing disk uuid for $TARGET because $MKFS doesn't seem to match for ext{2,3,4} file system"
+           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
+           eend $?
+         fi
+       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
@@ -952,7 +980,15 @@ 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"
-  parted -s "${TARGET}" 'mkpart primary ext3 2M -1'
+  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 ext4 2M -1'
 
   # if dm-mod isn't available then kpartx will fail with
   # "Is device-mapper driver missing from kernel? [...]"
@@ -1247,7 +1283,11 @@ chrootscript() {
   else
     einfo "Executing chroot-script now"
     mount --bind /dev "$MNTPOINT"/dev
-    chroot "$MNTPOINT" /bin/chroot-script ; RC=$?
+    if [ "$DEBUG" = "true" ] ; then
+      chroot "$MNTPOINT" /bin/sh -x /bin/chroot-script ; RC=$?
+    else
+      chroot "$MNTPOINT" /bin/chroot-script ; RC=$?
+    fi
     umount "$MNTPOINT"/dev
     eend $RC
   fi