rhtyd closed pull request #2550: debian: Use only `-l` for libvirtd default
file on debian
URL: https://github.com/apache/cloudstack/pull/2550
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
index 43c93c87631..a9afb04dd8e 100644
--- a/python/lib/cloud_utils.py
+++ b/python/lib/cloud_utils.py
@@ -759,7 +759,7 @@ def execute(self):
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")
diff --git a/python/lib/cloudutils/serviceConfig.py
b/python/lib/cloudutils/serviceConfig.py
index c9c019c5abe..68d1b9cef5b 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -526,9 +526,12 @@ def setupLiveMigration(self):
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:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
