diff -Nru hw-detect-1.117ubuntu2/check-missing-firmware.sh hw-detect-1.117ubuntu3/check-missing-firmware.sh --- hw-detect-1.117ubuntu2/check-missing-firmware.sh 2016-04-14 13:12:56.000000000 +0000 +++ hw-detect-1.117ubuntu3/check-missing-firmware.sh 2016-09-29 13:50:09.000000000 +0000 @@ -335,7 +335,7 @@ if ! nic_is_configured $module; then log "removing and loading kernel module $module" modprobe -r $module || true - modprobe $module || true + modprobe -b $module || true fi done done diff -Nru hw-detect-1.117ubuntu2/debian/changelog hw-detect-1.117ubuntu3/debian/changelog --- hw-detect-1.117ubuntu2/debian/changelog 2016-04-14 13:16:19.000000000 +0000 +++ hw-detect-1.117ubuntu3/debian/changelog 2016-09-29 13:52:10.000000000 +0000 @@ -1,3 +1,11 @@ +hw-detect (1.117ubuntu3) yakkety; urgency=medium + + * {hw-,disk-,net}detect.sh, check-missing-firmware.sh: use 'modprobe -b' + in order to honor module blacklisting from kernel cmdline parameters. + (LP: #1602717) + + -- Mauricio Faria de Oliveira Thu, 29 Sep 2016 09:52:10 -0400 + hw-detect (1.117ubuntu2) xenial; urgency=medium * Enable disk-detect/multipath/enable by default on s390x. diff -Nru hw-detect-1.117ubuntu2/disk-detect.sh hw-detect-1.117ubuntu3/disk-detect.sh --- hw-detect-1.117ubuntu2/disk-detect.sh 2016-04-14 13:12:56.000000000 +0000 +++ hw-detect-1.117ubuntu3/disk-detect.sh 2016-09-29 13:50:09.000000000 +0000 @@ -75,7 +75,7 @@ local olddevs="" local newdev="" - if ! log-output -t disk-detect modprobe -v "$module"; then + if ! log-output -t disk-detect modprobe -v -b "$module"; then # Prompt the user for parameters for the module. local template="hw-detect/retry_params" local question="$template/$module" @@ -88,9 +88,9 @@ local params="$RET" if [ -n "$params" ]; then - if ! log-output -t disk-detect modprobe -v "$module" $params; then + if ! log-output -t disk-detect modprobe -v -b "$module" $params; then db_unregister "$question" - db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v $module $params" + db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v -b $module $params" db_input critical hw-detect/modprobe_error || [ $? -eq 30 ] db_go false @@ -228,7 +228,7 @@ mkdir -p /dev/md depmod -a >/dev/null 2>&1 for mod in dm-mod md-mod linear multipath raid0 raid1 raid456 raid5 raid6 raid10; do - modprobe $mod >/dev/null 2>&1 || true + modprobe -b $mod >/dev/null 2>&1 || true done if mdadm --examine --scan | grep -q container ; then logger -t disk-detect "MDADM container(s) detected. (Intel/DDF RAID)" @@ -295,7 +295,7 @@ module_probe dm-multipath || true fi # No way to check whether this is loaded already? - log-output -t disk-detect modprobe -v dm-round-robin || true + log-output -t disk-detect modprobe -v -b dm-round-robin || true # ensure multipath and sg3 udev rules are run before we probe. if [ -x /bin/udevadm ]; then diff -Nru hw-detect-1.117ubuntu2/ethdetect.sh hw-detect-1.117ubuntu3/ethdetect.sh --- hw-detect-1.117ubuntu2/ethdetect.sh 2016-04-14 13:12:56.000000000 +0000 +++ hw-detect-1.117ubuntu3/ethdetect.sh 2016-09-29 13:50:09.000000000 +0000 @@ -126,7 +126,7 @@ devs="$(snapshot_devs)" - if ! log-output -t ethdetect modprobe -v "$module"; then + if ! log-output -t ethdetect modprobe -v -b "$module"; then # Prompt the user for parameters for the module. local template="hw-detect/retry_params" local question="$template/$module" @@ -139,9 +139,9 @@ local params="$RET" if [ -n "$params" ]; then - if ! log-output -t ethdetect modprobe -v "$module" $params; then + if ! log-output -t ethdetect modprobe -v -b "$module" $params; then db_unregister "$question" - db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v $module $params" + db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v -b $module $params" db_input critical hw-detect/modprobe_error || [ $? -eq 30 ] db_go false diff -Nru hw-detect-1.117ubuntu2/hw-detect.sh hw-detect-1.117ubuntu3/hw-detect.sh --- hw-detect-1.117ubuntu2/hw-detect.sh 2016-04-14 13:12:56.000000000 +0000 +++ hw-detect-1.117ubuntu3/hw-detect.sh 2016-09-29 13:50:09.000000000 +0000 @@ -90,7 +90,7 @@ echo 0 > /proc/sys/kernel/printk devs="$(snapshot_devs)" - if log-output -t hw-detect modprobe -v "$module"; then + if log-output -t hw-detect modprobe -v -b "$module"; then olddevs="$devs" devs="$(snapshot_devs)" newdevs="$(compare_devs "$olddevs" "$devs")" @@ -109,7 +109,7 @@ log "Error loading '$module'" if [ "$module" != floppy ] && [ "$module" != ide-floppy ] && \ [ "$module" != ide-cd ] && [ "$module" != ide-generic ]; then - db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v $module" + db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v -b $module" db_input medium hw-detect/modprobe_error || [ $? -eq 30 ] db_go fi