X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=7495e80604cdf27d01b8c968f4df9625a2733607;hp=d8b8fb60a1a2d5c536483a383a7a33b4d8712fd6;hb=7540b11c2352b5895e11b957a3200e8a12209c26;hpb=1df19dabd733a9b7b5587efe51358a0b868df0d3 diff --git a/chroot-script b/chroot-script index d8b8fb6..7495e80 100755 --- a/chroot-script +++ b/chroot-script @@ -416,6 +416,8 @@ grub() { UPDATEGRUB='/sbin/update-grub' fi $UPDATEGRUB -y + + # grub1: if [ -f /boot/grub/menu.lst ] ; then sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst case "$TARGET" in @@ -436,6 +438,62 @@ grub() { sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst $UPDATEGRUB -y fi + + # grub2: + if [ -f /etc/default/grub ] ; then + # create a copy of the original: + cp /etc/default/grub /etc/default/grub.orig + + case "$TARGET" in + # do NOT use uuid with SW-RAID + /dev/md*) + GRUB_CMDLINE="root=${TARGET} ro ${BOOT_APPEND}" + ;; + *) + if [ -n "$TARGET_UUID" ] ; then + GRUB_CMDLINE="root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}" + else + GRUB_CMDLINE="root=${TARGET} ro ${BOOT_APPEND}" + fi + ;; + esac + + cat > /etc/default/grub << EOF +# Note: this file has been generated by chroot-script of grml-debootstrap. +# This configuration file is a workaround being necessary as the device.map +# generated by the live system might not correspond with your harddisk +# installation. +# +# Please restore the original Debian configuration executing the following +# commands when running your harddisk installation: +# +# grub-mkdevicemap +# mv /etc/default/grub.orig /etc/default/grub +# update-grub +# +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR=Debian +# GRUB_DISABLE_LINUX_UUID=true +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE" +EOF + + [ -n "$INSTALL_NOTES" ] && echo " + +The grub2 configuration has been adjusted so you should +be able to boot into your Debian installation now. +After rebooting into your Debian installation please execute: + + grub-mkdevicemap + mv /etc/default/grub.orig /etc/default/grub + update-grub + +to finalise configuration. This instructions are available +in the header of /etc/default/grub as well. +" >> $INSTALL_NOTES + + $UPDATEGRUB + fi fi } # }}}