From 73e27a850481857f1fe886eca1b8db21028269ff Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Wed, 25 Jul 2018 16:32:01 +0100 Subject: [PATCH] modprobe DIB_MODPROBE_BLACKLIST should be optional modprobe element currently fails when DIB_MODPROBE_BLACKLIST is not set. As there are now two methods to control blacklisting this should be optional. Change-Id: Ibf3c31a95177ba88c1b93228490c7f36f5b70b57 --- .../elements/modprobe/install.d/80-modprobe-blacklist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diskimage_builder/elements/modprobe/install.d/80-modprobe-blacklist b/diskimage_builder/elements/modprobe/install.d/80-modprobe-blacklist index 6493726f8..b8b4ef7e7 100755 --- a/diskimage_builder/elements/modprobe/install.d/80-modprobe-blacklist +++ b/diskimage_builder/elements/modprobe/install.d/80-modprobe-blacklist @@ -6,7 +6,7 @@ fi set -eu set -o pipefail -MODULES_LIST=${DIB_MODPROBE_BLACKLIST:?"Please set DIB_MODPROBE_BLACKLIST."} +MODULES_LIST=${DIB_MODPROBE_BLACKLIST:-""} for mod_name in $MODULES_LIST; do echo "blacklist $mod_name" >> /etc/modprobe.d/blacklist.conf