etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debian: Use only `-l` for libvirtd default file on debian (#2550) 

This fixes #2546

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2018-04-11 14:08:57 +05:30 committed by GitHub
parent d588f7d92b
commit ea33a35297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/lib/cloud_utils.py
View File

@ -759,7 +759,7 @@ class SetupLiveMigration(ConfigTask):
if os.path.exists("/etc/init/libvirt-bin.conf"):
replace_line("/etc/init/libvirt-bin.conf", "exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l")
else:
replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l -d'")
replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l'")
else:
raise AssertionError("Unsupported distribution")

7
python/lib/cloudutils/serviceConfig.py
View File

@ -526,9 +526,12 @@ class libvirtConfigUbuntu(serviceCfgBase):
if os.path.exists("/etc/init/libvirt-bin.conf"):
cfo = configFileOps("/etc/init/libvirt-bin.conf", self)
cfo.replace_line("exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l")
else:
elif os.path.exists("/etc/default/libvirt-bin"):
cfo = configFileOps("/etc/default/libvirt-bin", self)
cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l -d'")
cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l'")
elif os.path.exists("/etc/default/libvirtd"):
cfo = configFileOps("/etc/default/libvirtd", self)
cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l'")
def config(self):
try: