projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b591814
)
updatebase.GRMLBASE: execute fcopy with -i flag to ignore non-matching files
author
Michael Prokop
<mika@grml.org>
Thu, 3 Jul 2014 13:33:01 +0000
(15:33 +0200)
committer
Michael Prokop
<mika@grml.org>
Thu, 3 Jul 2014 13:33:01 +0000
(15:33 +0200)
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.
etc/grml/fai/config/hooks/updatebase.GRMLBASE
patch
|
blob
|
history
diff --git
a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index
e1633b3
..
b1c22e0
100755
(executable)
--- 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