Copy /etc/debootstrap/[s]bin as well to the chroot if they are present.

diff --git a/debian/changelog b/debian/changelog
index f64fd00..4a0ac4a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ grml-debootstrap (0.23) unstable; urgency=low
   * Improve documentation regarding installation of bootloader when
     using directories as installation target. [Closes: issue539]
     Patch by Tong Sun - thanks!
+  * Copy /etc/debootstrap/[s]bin as well to the chroot if they are
+    present. Suggestion by Tong Sun - thanks! [Closes: issue540]
 
- -- Michael Prokop <mika@grml.org>  Sun, 05 Oct 2008 14:47:27 +0200
+ -- Michael Prokop <mika@grml.org>  Sun, 05 Oct 2008 23:18:56 +0200
 
 grml-debootstrap (0.22) unstable; urgency=low
 

diff --git a/grml-debootstrap b/grml-debootstrap
index af11daa..2976280 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -761,8 +761,10 @@ preparechroot() {
   ( cd $MNTPOINT/dev && tar zxf /etc/debootstrap/devices.tar.gz )
 
   # copy any existing files to chroot
+  [ -d /etc/debootstrap/bin   ] && cp -a -L /etc/debootstrap/bin/*   $MNTPOINT/bin/
   [ -d /etc/debootstrap/boot  ] && cp -a -L /etc/debootstrap/boot/*  $MNTPOINT/boot/
   [ -d /etc/debootstrap/etc   ] && cp -a -L /etc/debootstrap/etc/*   $MNTPOINT/etc/
+  [ -d /etc/debootstrap/sbin  ] && cp -a -L /etc/debootstrap/sbin/*  $MNTPOINT/sbin/
   [ -d /etc/debootstrap/share ] && cp -a -L /etc/debootstrap/share/* $MNTPOINT/share/
   [ -d /etc/debootstrap/usr   ] && cp -a -L /etc/debootstrap/usr/*   $MNTPOINT/usr/
   [ -d /etc/debootstrap/var   ] && cp -a -L /etc/debootstrap/var/*   $MNTPOINT/var/