X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=d3932f07ba13fb62d93af2f98bf2d37674131e1e;hp=9a27e4b6da5b524fdb2c748d679ca4d6d9f783b9;hb=7e3c788fd3874cecf4aab08011fda562c1f1ae70;hpb=00642691771b3adcc1fc6223d8f928c229989434

diff --git a/grml-debootstrap b/grml-debootstrap
index 9a27e4b..d3932f0 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -58,7 +58,7 @@ MNTPOINT="/mnt/debootstrap.$$"
 [ -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 "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://httpredir.debian.org/debian'
 [ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no"
 [ -n "$FORCE" ] || FORCE=''
 [ -n "$HOSTNAME" ] || HOSTNAME='grml'
@@ -381,12 +381,6 @@ fi
 [ "$_opt_packages_set" ]        && PACKAGES='yes'
 [ "$_opt_nopackages" ]          && PACKAGES=''
 [ "$_opt_debconf_set" ]         && DEBCONF='yes'
-
-if [ "$_opt_scripts_set" ] ; then
-  ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead."
-  SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71
-fi
-
 [ "$_opt_post_scripts_set" ]    && POST_SCRIPTS='yes'
 [ "$_opt_pre_scripts_set" ]     && PRE_SCRIPTS='yes'
 [ "$_opt_chroot_scripts_set" ]  && CHROOT_SCRIPTS='yes'
@@ -413,6 +407,20 @@ fi
 [ "$_opt_contrib" ]             && COMPONENTS="$COMPONENTS contrib"
 [ "$_opt_non_free" ]            && COMPONENTS="$COMPONENTS non-free"
 
+# command line option checks
+if [ "$_opt_scripts_set" ] ; then
+  ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead."
+  SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71
+fi
+
+if [ "$_opt_grub" ] && [ "$_opt_vmfile" ] ; then
+  eerror "The --grub option is incompatible with --vmfile, please drop it from your command line."
+  eerror "The --grub option is unneeded as GRUB will be installed automatically."
+  eend 1
+  bailout 1
+fi
+
+
 if [ "$DEBUG" = "true" ] ; then
   set -x
 fi
@@ -440,7 +448,7 @@ fi
 
 # make sure we have what we need {{{
 if [ -n "$VIRTUAL" ] ; then
-  check4progs kpartx mksh parted qemu-img || bailout 1
+  check4progs kpartx parted qemu-img || bailout 1
 fi
 # }}}
 
@@ -644,7 +652,7 @@ prompt_for_mirror()
   [ $? -eq 0 ] || bailout
 
   if [ "$CHOOSE_MIRROR" = 'net' ] ; then
-     [ -n "$MIRROR" ] || MIRROR='http://http.debian.net/debian'
+     [ -n "$MIRROR" ] || MIRROR='http://httpredir.debian.org/debian'
      MIRROR="$(dialog --stdout --title "${PN}" --inputbox \
                "Please enter Debian mirror you would like to use for installing packages." \
                0 0 $MIRROR)"
@@ -777,6 +785,8 @@ elif [ -n "$INTERACTIVE" ] ; then
    Using ISO:       $ISO"
    [ -n "$ARCH" ]  && INFOTEXT="$INFOTEXT
    Using arch:      $ARCH"
+   [ -n "$CONFFILES" ] && INFOTEXT="$INFOTEXT
+   Config files:    $CONFFILES"
 
    INFOTEXT="$INFOTEXT
 
@@ -800,11 +810,12 @@ else # if not running automatic installation display configuration and prompt fo
      [ -n "$GRUB" ]     && echo "   Install grub:    $GRUB" || echo "   Install grub:    no"
    fi
 
-   [ -n "$RELEASE" ]  && echo "   Using release:   $RELEASE"
-   [ -n "$HOSTNAME" ] && echo "   Using hostname:  $HOSTNAME"
-   [ -n "$MIRROR" ]   && echo "   Using mirror:    $MIRROR"
-   [ -n "$ISO" ]      && echo "   Using ISO:       $ISO"
-   [ -n "$ARCH" ]     && echo "   Using arch:      $ARCH"
+   [ -n "$RELEASE" ]   && echo "   Using release:   $RELEASE"
+   [ -n "$HOSTNAME" ]  && echo "   Using hostname:  $HOSTNAME"
+   [ -n "$MIRROR" ]    && echo "   Using mirror:    $MIRROR"
+   [ -n "$ISO" ]       && echo "   Using ISO:       $ISO"
+   [ -n "$ARCH" ]      && echo "   Using arch:      $ARCH"
+   [ -n "$CONFFILES" ] && echo "   Config files:    $CONFFILES"
    if [ -n "$VIRTUAL" ] ; then
       echo "   Deploying as Virtual Machine."
       if [ -n "$VMSIZE" -a -n "$VMFILE" ]; then
@@ -881,7 +892,7 @@ fi
 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
+      eerror "It is not possible to build amd64 on $CURRENT_ARCH. Consider installing and booting the 'linux-image-amd64' kernel or using '--arch i386' instead." ; eend 1
       bailout 1
    fi
 fi
@@ -1091,8 +1102,7 @@ prepare_vm() {
   if [ -n "$VMFILE" ]; then
     qemu-img create -f raw "${TARGET}" "${VMSIZE}"
   fi
-  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}" 'mklabel msdos'
   if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
     einfo "Adjusting disk signature to a fixed (non-random) value"
     MBRTMPFILE=$(mktemp)
@@ -1102,6 +1112,7 @@ prepare_vm() {
     eend $?
   fi
   parted -s "${TARGET}" 'mkpart primary ext4 2M -1'
+  parted -s "${TARGET}" 'set 1 boot on'
 
   # if dm-mod isn't available then kpartx will fail with
   # "Is device-mapper driver missing from kernel? [...]"
@@ -1180,8 +1191,9 @@ if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v |
       cp -a "${MNTPOINT}"/usr/lib/grub/i386-pc "${MNTPOINT}/boot/grub/"
       ;;
   esac
+  dd if="${MNTPOINT}/usr/lib/grub/i386-pc/boot.img" of="${ORIG_TARGET}" conv=notrunc bs=440 count=1
   chroot "${MNTPOINT}" grub-mkimage -O i386-pc -p "(hd0,msdos1)/boot/grub" -o /tmp/core.img biosdisk part_msdos ext2
-  dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=4
+  dd if="${MNTPOINT}/tmp/core.img" of="${ORIG_TARGET}" conv=notrunc seek=1
   rm -f "${MNTPOINT}/tmp/core.img"
 fi
 
@@ -1566,7 +1578,7 @@ remove_configs() {
     return 0
   fi
 
-  if ! mountpoint "${MNTPOINT}" ; then
+  if ! mountpoint "${MNTPOINT}" >/dev/null 2>&1 ; then
     ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files." ; eend 0
     return 0
   fi