X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F55-aoetools;h=eaf18e693da2b3c3d8babe656e71463e701d4414;hp=fdabd22bb52e6903b99c5a3625f03ba891e1e0d1;hb=b0b0bc5517497c53d1e23a5813d55f6071706001;hpb=fad6e2cc432ea47ba64a42b8d541f37127c2fd9a

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