From: Michael Prokop <mika@grml.org>
Date: Mon, 14 Dec 2009 23:33:02 +0000 (+0100)
Subject: Merge branch 't/pre_scripts'
X-Git-Tag: v0.33~8
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=ee2a7490fd324489ab008239c0b8657e880df2db;hp=abaa0ae3ce13b407e587d5ec5884695203e0bf7f

Merge branch 't/pre_scripts'
---

diff --git a/chroot-script b/chroot-script
index 75c6990..b2158aa 100755
--- a/chroot-script
+++ b/chroot-script
@@ -131,7 +131,7 @@ EOF
 
 # remove now useless apt cache {{{
 remove_apt_cache() {
-    find /var/cache/apt/archives -name '*.deb' -exec rm -f '{}' \;
+  apt-get clean
 }
 # }}}
 
diff --git a/grml-debootstrap b/grml-debootstrap
index 53f1e20..48f7c64 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -576,6 +576,10 @@ set_target_directory(){
     TUNE2FS=''
     FSCK=''
     GRUB=''
+    # make sure we normalise the path to an absolute directory name so something like:
+    #  mkdir -p foo/a bar/a; (cd foo; grml-debootstrap -t a)&; (cd bar; grml-debootstrap -t a)&; wait
+    # works
+    TARGET="$(readlink -f $TARGET)"
 }
 
 if [ -b "$TARGET" ] ; then