X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-debootstrap;h=245f0d8b4118a4cafcbd2c8fd712cedd672afc4a;hb=refs%2Ftags%2Fv0.23;hp=c90b1b06071237dd95b074455d181dfe827ff0d0;hpb=6fd5cf97f5debb0b0d931612d6bad9f325d30129;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index c90b1b0..245f0d8 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -765,8 +765,10 @@ preparechroot() {
 
   # copy scripts that should be executed inside the chroot:
   _opt_chroot_scripts=${_opt_chroot_scripts:-$CONFFILES/chroot-scripts/}
-  [ -d $_opt_chroot_scripts -a "$CHROOT_SCRIPTS" = 'yes' ] && \
-    cp -a $VERBOSE $_opt_chroot_scripts $MNTPOINT/etc/debootstrap/
+  [ -d $_opt_chroot_scripts -a "$CHROOT_SCRIPTS" = 'yes' ] && {
+    mkdir -p $MNTPOINT/etc/debootstrap/chroot-scripts
+    cp -a $VERBOSE $_opt_chroot_scripts/* $MNTPOINT/etc/debootstrap/chroot-scripts/
+  }
 
   # notice: do NOT use $CHROOT_VARIABLES inside chroot but statically file instead!
   cp $VERBOSE $CHROOT_VARIABLES  $MNTPOINT/etc/debootstrap/variables
@@ -779,7 +781,6 @@ preparechroot() {
   # provide system's /etc/hosts to the target:
   if ! [ -f "$MNTPOINT/etc/hosts" ] ; then
      cp $VERBOSE /etc/hosts $MNTPOINT/etc/hosts
-     sed -i "s#127.0.0.1 .*#127.0.0.1       localhost  $HOSTNAME#" /etc/hosts
   fi
 
   # setup default locales