GeezerVison is showing github.com — debian: Use only `-l` for libvirtd default file on debian (#2550) · asdnf/cloudstack@ea33a35
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: python/lib/cloud_utils.py +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -759,7 +759,7 @@ def execute(self): |
759 | 759 | if os.path.exists("/etc/init/libvirt-bin.conf"): |
760 | 760 | replace_line("/etc/init/libvirt-bin.conf", "exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l") |
761 | 761 | else: |
762 | | - replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l -d'") |
| 762 | + replace_or_add_line("/etc/default/libvirt-bin","libvirtd_opts=","libvirtd_opts='-l'") |
763 | 763 |
|
764 | 764 | else: |
765 | 765 | raise AssertionError("Unsupported distribution") |
|
Collapse file
Copy file name to clipboardExpand all lines: python/lib/cloudutils/serviceConfig.py +5-2Lines changed: 5 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -526,9 +526,12 @@ def setupLiveMigration(self): |
526 | 526 | if os.path.exists("/etc/init/libvirt-bin.conf"): |
527 | 527 | cfo = configFileOps("/etc/init/libvirt-bin.conf", self) |
528 | 528 | cfo.replace_line("exec /usr/sbin/libvirtd","exec /usr/sbin/libvirtd -d -l") |
529 | | - else: |
| 529 | + elif os.path.exists("/etc/default/libvirt-bin"): |
530 | 530 | cfo = configFileOps("/etc/default/libvirt-bin", self) |
531 | | - cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l -d'") |
| 531 | + cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l'") |
| 532 | + elif os.path.exists("/etc/default/libvirtd"): |
| 533 | + cfo = configFileOps("/etc/default/libvirtd", self) |
| 534 | + cfo.replace_or_add_line("libvirtd_opts=","libvirtd_opts='-l'") |
532 | 535 |
|
533 | 536 | def config(self): |
534 | 537 | try: |
|