ensure --chroot-scripts always works

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index 69f2cf0..245f0d8 100755 (executable)
--- 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