projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SW: drop deprecated cpufrequtils (+ drop scripts/GRMLBASE/36-cpufrequtils)
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
55-aoetools
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/55-aoetools
b/etc/grml/fai/config/scripts/GRMLBASE/55-aoetools
index
fdabd22
..
eaf18e6
100755
(executable)
--- 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.
################################################################################
# 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"
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
## END OF FILE #################################################################
# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2