X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=16b851414193a3be7a52f29d58b24e309df5ba49;hp=abfad4b708af0193c78769e4706ebeae0bb61d16;hb=6a14e0a87856a8bfd220d8d8d441cc2ffc390a60;hpb=6814ad2770e658327e02076af9e3d6d3157e8f19

diff --git a/chroot-script b/chroot-script
index abfad4b..16b8514 100755
--- a/chroot-script
+++ b/chroot-script
@@ -357,8 +357,6 @@ hostname() {
      if [ -r /etc/postfix/main.cf ] ; then
         # adjust hostname related options:
         sed -i "s/grml/$HOSTNAME/g" /etc/postfix/main.cf
-        sed -i "s/^myhostname = .*/myhostname = $HOSTNAME/" /etc/postfix/main.cf
-        sed -i "s/^mydestination = .*/mydestination = localdomain, localhost, localhost.localdomain, $HOSTNAME/" /etc/postfix/main.cf
 
         # listen on loopback interface only:
         sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf
@@ -418,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
@@ -438,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_CMDLLINE_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
 }
 # }}}