From: Tong Sun Date: Thu, 2 Oct 2008 06:19:40 +0000 (-0400) Subject: bug fix: allow symlinks when coping existing files to chroot X-Git-Tag: v0.23~26 X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=97cfcac4ad19ee85562c0777ccd8c6286e076af8;ds=sidebyside bug fix: allow symlinks when coping existing files to chroot symptom: when etc/debootstrap/etc/... were symlinks: /bin/chroot-script: line 52: /etc/apt/sources.list: Too many levels of symbolic links justification, quoting from mlist: "please add '--dereference' whenever 'cp' files from host into chroot system. I want to symlink them into /etc/debootstrap/etc/ instead of copying them over." --- diff --git a/grml-debootstrap b/grml-debootstrap index 17e7385..af11daa 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -760,12 +760,12 @@ preparechroot() { # MAKEDEV is just a forking bomb crap, let's do it on our own instead :) ( cd $MNTPOINT/dev && tar zxf /etc/debootstrap/devices.tar.gz ) - # copy any existing existing files to chroot - [ -d /etc/debootstrap/boot ] && cp -a /etc/debootstrap/boot/* $MNTPOINT/boot/ - [ -d /etc/debootstrap/etc ] && cp -a /etc/debootstrap/etc/* $MNTPOINT/etc/ - [ -d /etc/debootstrap/share ] && cp -a /etc/debootstrap/share/* $MNTPOINT/share/ - [ -d /etc/debootstrap/usr ] && cp -a /etc/debootstrap/usr/* $MNTPOINT/usr/ - [ -d /etc/debootstrap/var ] && cp -a /etc/debootstrap/var/* $MNTPOINT/var/ + # copy any existing files to chroot + [ -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/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/ # copy local network setup to chroot if [ -r /etc/network/interfaces -a ! -r "${MNTPOINT}"/etc/network/interfaces ] ; then