X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-debootstrap;h=47e4e5c46e56a0796bc9faa2be4383d4415dc79b;hb=fdf85c677ecb6c0f5d059db862cd9d0511c7e865;hp=5b5ad449315aed17dff8082107919276c6231bc8;hpb=ff11fa235c412826e9474946c7b74c5080a2ffaf;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index 5b5ad44..47e4e5c 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -1288,17 +1288,13 @@ fi
       ;;
   esac
 
-  case "$RELEASE" in
-    lenny|squeeze|wheezy)
-      if grep -q '^GRUB_DISABLE_LINUX_UUID=.*true' "${MNTPOINT}"/etc/default/grub 2>/dev/null ; then
-        ewarn "GRUB_DISABLE_LINUX_UUID is set to true in /etc/default/grub, not adjusting root= in grub.cfg."
-        ewarn "Please note that your system might NOT be able to properly boot."
-      else
-        einfo "Adjusting grub.cfg for successful boot sequence."
-        sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg
-      fi
-      ;;
-  esac
+  if grep -q '^GRUB_DISABLE_LINUX_UUID=.*true' "${MNTPOINT}"/etc/default/grub 2>/dev/null ; then
+    ewarn "GRUB_DISABLE_LINUX_UUID is set to true in /etc/default/grub, not adjusting root= in grub.cfg."
+    ewarn "Please note that your system might NOT be able to properly boot."
+  else
+    einfo "Adjusting grub.cfg for successful boot sequence."
+    sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg
+  fi
 
   umount "${MNTPOINT}"/proc
   umount "${MNTPOINT}"/sys
@@ -1445,11 +1441,6 @@ preparechroot() {
   # make sure we can access network [relevant for cdebootstrap]
   [ -f "${MNTPOINT}"/etc/resolv.conf ] || cp $VERBOSE /etc/resolv.conf "${MNTPOINT}"/etc/resolv.conf
 
-  # provide system's /etc/hosts to the target:
-  if ! [ -f "$MNTPOINT/etc/hosts" ] ; then
-     cp $VERBOSE /etc/hosts "${MNTPOINT}"/etc/hosts
-  fi
-
   # setup default locales
   [ -n "$LOCALES" ] && cp $VERBOSE "${CONFFILES}"/locale.gen "${MNTPOINT}"/etc/locale.gen
 
@@ -1530,8 +1521,9 @@ execute_pre_scripts() {
 
 # execute all scripts in /etc/debootstrap/post-scripts/ {{{
 execute_post_scripts() {
-  # make sure we have $MNTPOINT available for our scripts
+  # make sure we have $MNTPOINT and HOSTNAME available for our scripts
   export MNTPOINT
+  export TARGET_HOSTNAME=$HOSTNAME
 
   if [ -d "$_opt_scripts" ] || [ "$SCRIPTS" = 'yes' ] ; then
     # legacy support for /etc/debootstrap/scripts/