Do not exit if cleanup of /root directory in 98-clean-chroot fails

diff --git a/debian/changelog b/debian/changelog
index e915013..96c467a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +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.
 
  -- Michael Prokop <mika@grml.org>  Sun, 09 Dec 2007 17:28:01 +0100
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index e8c634c..bd1ae73 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Nov 05 22:37:04 CET 2007 [mika]
+# Latest change: Sun Dec 09 18:46:19 CET 2007 [mika]
 ################################################################################
 
 set -e
@@ -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/*
+   rm -rf $target/root/.* $target/root/* || /bin/true
 fi
 
 ## END OF FILE #################################################################