From: Michael Prokop <mika@grml.org>
Date: Thu, 3 Jul 2014 13:33:01 +0000 (+0200)
Subject: updatebase.GRMLBASE: execute fcopy with -i flag to ignore non-matching files
X-Git-Tag: v0.25.1~2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=862dda19d8da57572cc4032d0882f32273dee999

updatebase.GRMLBASE: execute fcopy with -i flag to ignore non-matching files

Otherwise when building testing/unstable we get:

| fcopy: no matching file for any class for etc/apt/preferences.d/wheezy-backports defined.

and fcopy fails to execute:

| updatebase.GRMLBASE  FAILED with exit code 1.

and causing the following '$ROOTCMD apt-key add /etc/apt/grml.key
to never get executed then.
---

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index e1633b3..b1c22e0 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -67,7 +67,7 @@ if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
 fi
 
 # install all apt related files
-fcopy -B -v -r /etc/apt
+fcopy -i -B -v -r /etc/apt
 
 # install Grml gpg key:
 $ROOTCMD apt-key add /etc/apt/grml.key