From: Michael Prokop <devnull@localhost>
Date: Sun, 16 Dec 2007 20:55:43 +0000 (+0100)
Subject: Make sure /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan does not fail
X-Git-Tag: 0.0.13~3
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=0afe62bf10b67e45e05c53966f02da0042bafb9a

Make sure /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan does not fail
---

diff --git a/debian/changelog b/debian/changelog
index dd9556c..29105d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ grml-live (0.0.13) unstable; urgency=low
   * Use -no-progress for Squashfs build process.
   * Improve /etc/resolv.conf handling in
     /etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs
+  * Adjust hostname in /etc/postfix/main.cf.
+  * Make sure /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan does not fail.
   * Disable Recommends for aptitude as well.
   * Check for presence of live-initramfs in 10-build-initramfs.
   * Install aptitude in softupdate if not present.
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan b/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan
index 778a3a2..5a1a8d5 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan
+++ b/etc/grml/fai/config/scripts/GRMLBASE/40-deborphan
@@ -4,18 +4,18 @@
 # 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: Sun Dec 09 14:02:46 CET 2007 [mika]
+# Latest change: Sun Dec 16 21:54:29 CET 2007 [mika]
 ################################################################################
 
 set -u
 set -e
 
 if [ -r $target/lib/shadowfs/liblogfs.so -a -x $target/usr/bin/deborphan ] ; then
-   $ROOTCMD deborphan --add-keep shadowfs
+   $ROOTCMD deborphan --add-keep shadowfs || /bin/true
 fi
 
 if [ -r $target/usr/bin/bsdtar -a -x $target/usr/bin/deborphan ] ; then
-   $ROOTCMD deborphan --add-keep bsdtar
+   $ROOTCMD deborphan --add-keep bsdtar || /bin/true
 fi
 
 ## END OF FILE #################################################################