Merge pull request #54 from yast/backport_sp6

Backport SP6

package/yast2-vm.changes

@@ -1,5 +1,13 @@
 -------------------------------------------------------------------
-Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
+Thu Apr 20 15:22:54 MDT 2023 - carnold@suse.com
+
+- The libvirtd daemon is deprecated and is going away.
+  The replacements are virtqemud for KVM/qemu and virtxend for Xen.
+  (bsc#1210572)
+- 4.6.1
+
+-------------------------------------------------------------------
+Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák <lslezak@suse.cz>
 
 - Branch package for SP6 (bsc#1208913)
 

package/yast2-vm.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-vm
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-vm
-Version:        4.6.0
+Version:        4.6.1
 Release:        0
 Summary:        Configure Hypervisor and Tools for Xen and KVM
 License:        GPL-2.0-only

src/modules/VirtConfig.rb

@@ -434,13 +434,28 @@ def ConfigureDom0()
       # Force AppArmor to reload the profiles
       reloadApparmor
 
-      # Enable and start the libvirtd daemon for both KVM and Xen
-      cmd = "systemctl enable libvirtd.service"
-      Builtins.y2milestone("Enable libvirtd.service: %1", cmd)
-      SCR.Execute(path(".target.bash"), cmd)
-      cmd = "systemctl start libvirtd.service"
-      Builtins.y2milestone("Start libvirtd.service: %1", cmd)
-      SCR.Execute(path(".target.bash"), cmd)
+      # Enable and start the libvirt virtqemud daemon for KVM
+      if install_kvm
+        cmd = "systemctl enable virtqemud.service"
+        Builtins.y2milestone("Enable virtqemud.service: %1", cmd)
+        SCR.Execute(path(".target.bash"), cmd)
+        if Arch.is_xen == false
+          cmd = "systemctl start virtqemud.service"
+          Builtins.y2milestone("Start virtqemud.service: %1", cmd)
+          SCR.Execute(path(".target.bash"), cmd)
+        end
+      end
+      # Enable and start the libvirt virtxend daemon for Xen
+      if install_xen
+        cmd = "systemctl enable virtxend.service"
+        Builtins.y2milestone("Enable virtxend.service: %1", cmd)
+        SCR.Execute(path(".target.bash"), cmd)
+        if Arch.is_xen == true
+          cmd = "systemctl start virtxend.service"
+          Builtins.y2milestone("Start virtxend.service: %1", cmd)
+          SCR.Execute(path(".target.bash"), cmd)
+        end
+      end
 
       # Enable and start the virtlogd socket (libvirt >= 1.3.0) for both KVM and Xen
       cmd = "systemctl enable virtlogd.socket"