diff -u openipmi-2.0.18/debian/changelog openipmi-2.0.18/debian/changelog --- openipmi-2.0.18/debian/changelog +++ openipmi-2.0.18/debian/changelog @@ -1,3 +1,12 @@ +openipmi (2.0.18-0ubuntu7.2) trusty; urgency=medium + + * debian/openipmi.init: Do not unload all modules if some configured + HW modules are not successfully loaded. + Backported from Xenial. + -LP: #1318317 + + -- Nishanth Aravamudan Fri, 18 Mar 2016 14:45:39 -0700 + openipmi (2.0.18-0ubuntu7.1) trusty; urgency=medium * Detect that a module is built into the kernel. diff -u openipmi-2.0.18/debian/openipmi.init openipmi-2.0.18/debian/openipmi.init --- openipmi-2.0.18/debian/openipmi.init +++ openipmi-2.0.18/debian/openipmi.init @@ -328,9 +328,9 @@ local locdelay modprobe ipmi_msghandler > /dev/null 2>&1 modules_loaded ipmi_msghandler - [ ${OnePlusLoaded} -ne 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return + [ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1)) && return load_hw_modules - [ $((RETVAL & 1)) -eq 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return + [ $((RETVAL & 1)) -eq 1 ] && return if [ "${DEV_IPMI}" = "yes" ]; then modprobe ipmi_devintf > /dev/null 2>&1