From: Michael Prokop Date: Mon, 29 May 2017 17:21:43 +0000 (+0200) Subject: Get rid of /etc/network/if-up.d/aoe-discover X-Git-Tag: v0.29.7~1 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=b0b0bc5517497c53d1e23a5813d55f6071706001;hp=0ec2fe3a8826aabcba072e6192782a0da1cf280e Get rid of /etc/network/if-up.d/aoe-discover Closes grml/grml#47 --- diff --git a/etc/grml/fai/config/scripts/GRMLBASE/55-aoetools b/etc/grml/fai/config/scripts/GRMLBASE/55-aoetools index fdabd22..eaf18e6 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/55-aoetools +++ b/etc/grml/fai/config/scripts/GRMLBASE/55-aoetools @@ -6,16 +6,15 @@ # License: This file is licensed under the GPL v2 or any later version. ################################################################################ -set -u -set -e - -if ! [ -r "${target}/usr/lib/modules-load.d/aoetools.conf" ] ; then - echo "File /usr/lib/modules-load.d/aoetools.conf doesn't exist, skipping execution of script." - exit 0 -fi +set -eu +# see https://github.com/grml/grml/issues/32 echo "Removing /usr/lib/modules-load.d/aoetools.conf to avoid automatic aoe discovery" rm -f "${target}/usr/lib/modules-load.d/aoetools.conf" +# see https://github.com/grml/grml/issues/47 +echo "Removing /etc/network/if-up.d/aoe-discover to avoid network startup failures" +rm -f "${target}/etc/network/if-up.d/aoe-discover" + ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2