From 83be006e288c58a46f5b76c29b6886c1f417d88c Mon Sep 17 00:00:00 2001 From: Ɓukasz 'sil2100' Zemczak Date: Wed, 15 Mar 2017 10:19:34 +0100 Subject: Import patches-unapplied version 2.2.6-0ubuntu1 to ubuntu/zesty-proposed Imported using git-ubuntu import. Changelog parent: d064ab0bffd429382ea4fafeb144784d403848bd New changelog entries: * New upstream release (LP: #1661750). * debian/control: - Change the maintainer to Ubuntu Developers (LP: #1657528). - Add the dependency of isc-dhcp-client as our maintainer scripts assume it's installed. - Add trailing commas to dependencies, add whitespaces. * Rename ephemeral-disk-warning.sh to ephemeral-disk-warning (lintian error). * debian/docs: - Remove LICENSE.txt as it's redundant. * debian/postinst: - Stop checking for update-initramfs existence using the absolute path, use the 'command' command instead to make lintian happy. * Remove debian/patches/disable-auto-update.patch: - We now ship with auto-updates enabled (LP: #1650522). * debian/maintscript: - Add a maintscript to rename the old logrotate file on upgrade from an ancient version of walinuxagent (LP: #1673152). --- azurelinuxagent/common/rdma.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'azurelinuxagent/common/rdma.py') diff --git a/azurelinuxagent/common/rdma.py b/azurelinuxagent/common/rdma.py index ba9a029..226482d 100644 --- a/azurelinuxagent/common/rdma.py +++ b/azurelinuxagent/common/rdma.py @@ -133,14 +133,14 @@ class RDMAHandler(object): """Load the kernel driver, this depends on the proper driver to be installed with the install_driver() method""" logger.info("RDMA: probing module '%s'" % self.driver_module_name) - result = shellutil.run('modprobe %s' % self.driver_module_name) + result = shellutil.run('modprobe --first-time %s' % self.driver_module_name) if result != 0: error_msg = 'Could not load "%s" kernel module. ' - error_msg += 'Run "modprobe %s" as root for more details' + error_msg += 'Run "modprobe --first-time %s" as root for more details' logger.error( error_msg % (self.driver_module_name, self.driver_module_name) ) - return + return False logger.info('RDMA: Loaded the kernel driver successfully.') return True @@ -158,6 +158,7 @@ class RDMAHandler(object): logger.info('RDMA: module loaded.') return True logger.info('RDMA: module not loaded.') + return False def reboot_system(self): """Reboot the system. This is required as the kernel module for -- cgit v1.2.3