[rpms/fedora-release] f45: presets: Improve virt presets

[Andrea Bolognani <abologna@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 4542c709b60e7693b5a92b8e6c497eb24408467c
            Author : Andrea Bolognani <abologna@redhat.com>
            Date   : 2023-10-04T18:22:26+02:00
            Stats  : +19/-2 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/4542c709b60e7693b5a92b8e6c497eb24408467c?branch=f45

            Log:
            presets: Improve virt presets

The current presets are mostly fine, but the way they're set up
can lead to some confusing behaviors.

For example, on a freshly installed system, the units for the
virtqemud service are configured as

  $ systemctl list-unit-files | grep virtqemud
  virtqemud.service         enabled     enabled
  virtqemud-admin.socket    enabled     disabled
  virtqemud-ro.socket       enabled     disabled
  virtqemud.socket          enabled     disabled

Notice how the status for the sockets differs from the
corresponding presets, which is already a bit confusing but not
problematic from the functional point of view.

Now let's suppose that, after making modifications such as
switching from the modular daemons to the monolithic daemon, the
user wanted to return to the default configuration. Running

  $ for unit in virtqemud{,-ro,-admin}.socket \
                virtqemud.service; do
      sudo systemctl preset $unit;
    done

would do the trick, resulting in the same configuration shown
earlier.

However, things would be a lot different if one were to run the
ever so slightly different

  $ for unit in virtqemud.service \
                virtqemud{,-ro,-admin}.socket; do
      sudo systemctl preset $unit;
    done

Notice how this time the service file is listed before the
sockets, instead of the other way around. That's the only
difference between the two commands, but the resulting
configuration will now be

  $ systemctl list-unit-files | grep virtqemud
  virtqemud.service         enabled     enabled
  virtqemud-admin.socket    disabled    disabled
  virtqemud-ro.socket       disabled    disabled
  virtqemud.socket          disabled    disabled

which will not work correctly.

So the current setup is both a bit confusing and a bit fragile.
In order to improve the situation on both fronts, explicitly
mark as enabled by default those sockets that have, up until now,
been implicitly enabled by virtue of being listed as Also= in
the [Install] section of a service, such as virtqemud, that is
enabled by default.

https://issues.redhat.com/browse/RHEL-3231

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

---
diff --git a/90-default.preset b/90-default.preset
index 7120e23..dc325f5 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -71,11 +71,24 @@ enable virtqemud.service
 enable virtxend.service
 enable virtlxcd.service
 
-# Compatibility with libvirtd sockets for old clients and expose TCP sockets
+# Sockets for the services listed above, to support socket activation
+# after the initial timeout
+enable virtqemud.socket
+enable virtqemud-ro.socket
+enable virtqemud-admin.socket
+enable virtxend.socket
+enable virtxend-ro.socket
+enable virtxend-admin.socket
+enable virtlxcd.socket
+enable virtlxcd-ro.socket
+enable virtlxcd-admin.socket
+
+# Compatibility with libvirtd sockets for old clients (socket activated
+# only when required)
 enable virtproxyd.socket
 
 # Secondary drivers providing supporting functionality to main virtualization
-# drivers, socket activated only when required
+# drivers (socket activated only when required)
 enable virtinterfaced.socket
 enable virtnetworkd.socket
 enable virtnodedevd.socket
@@ -83,6 +96,10 @@ enable virtnwfilterd.socket
 enable virtsecretd.socket
 enable virtstoraged.socket
 
+# Non-driver support services (socket activated only when required)
+enable virtlogd.socket
+enable virtlockd.socket
+
 # https://fedoraproject.org/w/index.php?title=Starting_services_by_default&oldid=377748
 enable xinetd.service