From: Michael Prokop <devnull@localhost>
Date: Sun, 9 Dec 2007 18:25:22 +0000 (+0100)
Subject: Remove and recreate /root directory in 98-clean-chroot
X-Git-Tag: 0.0.12
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=00982709e1675875e39657464380cf4ad7e60411

Remove and recreate /root directory in 98-clean-chroot
---

diff --git a/debian/changelog b/debian/changelog
index 13ff765..247cc0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ grml-live (0.0.12) unstable; urgency=low
   * Generate md5sum of ISO if using class 'RELEASE'.
   * Do not install package 'grml' via GRMLBASE because we want
     to use grml-small in GRML_SMALL and GRML_MEDIUM.
-  * Do not exit if cleanup of /root directory in 98-clean-chroot fails.
+  * Remove and recreate /root directory in 98-clean-chroot.
   * Skip stage updatebase when using softupdate and handle upgrade
     on our own via hooks.
   * Execute removal of log files after sourcing config files.
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index bd1ae73..18b5d61 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -47,7 +47,7 @@ if ifclass RELEASE ; then
    # Remove all FAI logs from chroot via grml-live later then:
    touch $target/etc/grml_fai_release
    # Remove all files inside /root/ of chroot:
-   rm -rf $target/root/.* $target/root/* || /bin/true
+   rm -rf $target/root && mkdir -m 0755 $target/root
 fi
 
 ## END OF FILE #################################################################