diff --git a/diskutil.py b/diskutil.py index 472edb93..ab15096d 100644 --- a/diskutil.py +++ b/diskutil.py @@ -7,6 +7,7 @@ from constants import MultipathConfig import fcntl import glob +import subprocess import shutil import util import netutil @@ -23,7 +24,11 @@ def mpath_cli_is_working(): regex = re.compile("switchgroup") try: - (rc,stdout) = util.runCmd2(["multipathd","-k"], with_stdout=True, inputtext="help") + proc = subprocess.Popen(["multipathd", "-k"], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + stdin=subprocess.PIPE, text=True) + stdout, stderr = proc.communicate(input="help") m=regex.search(stdout) return bool(m) except: @@ -60,7 +65,7 @@ def mpath_enable(mpath_config): assert 0 # launch manually to make possible to wait initialization - util.runCmd2(["/sbin/multipath", "-v0", "-B"]) + util.runCmd2(["/sbin/multipath", "-v0"]) time.sleep(1) util.runCmd2(util.udevsettleCmd()) diff --git a/init b/init index cd24e97d..35396090 100755 --- a/init +++ b/init @@ -116,7 +116,7 @@ def main(args): try: installer_version = subprocess.check_output( - ['rpm', '-q', '--qf', '%{VERSION}-%{RELEASE}', 'host-installer']) + ['rpm', '-q', '--qf', '%{VERSION}-%{RELEASE}', 'host-installer'], text=True) except Exception: installer_version = 'unknown'