Merge remote-tracking branch 'origin/pr/141'

diff --combined chroot-script
index 96fba0a,3544d5c..58bdb0e
--- 1/chroot-script
--- 2/chroot-script
+++ b/chroot-script
@@@ -616,19 -616,31 +616,31 @@@ grub_install() 
       for device in $SELECTED_PARTITIONS ; do
          GRUB="${device%%[0-9]}"
          echo "Installing grub on ${GRUB}:"
-         grub-install --no-floppy "$GRUB"
+         if ! grub-install --no-floppy "$GRUB" ; then
+           echo "Error: failed to execute 'grub-install --no-floppy $GRUB'." >&2
+           exit 1
+         fi
+ 
       done
       rm -f /boot/grub/device.map
    else
       echo "Installing grub on ${GRUB}:"
       case "$RELEASE" in
         lenny|squeeze|wheezy)
-          grub-install --no-floppy "$(readlink -f "${GRUB}")"
+          local grub_dev
+          grub_dev="$(readlink -f "${GRUB}")"
+          if ! grub-install --no-floppy "${grub_dev}" ; then
+            echo "Error: failed to execute 'grub-install --no-floppy ${grub_dev}'." >&2
+            exit 1
+          fi
           rm -f /boot/grub/device.map
           ;;
         *)
           echo "(hd0) ${GRUB}" > /boot/grub/device.map
-          grub-install "(hd0)"
+          if ! grub-install "(hd0)" ; then
+            echo "Error: failed to execute 'grub-install (hd0)'." >&2
+            exit 1
+          fi
           rm /boot/grub/device.map
           ;;
       esac
@@@ -646,11 -658,6 +658,11 @@@
      return 1
    fi
  
 +  if [ -n "${BOOT_APPEND}" ] ; then
 +    echo "Adding BOOT_APPEND configuration ['${BOOT_APPEND}'] to /etc/default/grub."
 +    sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" /etc/default/grub
 +  fi
 +
    mountpoint /boot/efi &>/dev/null && umount /boot/efi
  
    $UPDATEGRUB