[PATCH v6 2/4] libvirt.spec: relocate pre script of daemon-driver-qemu

[Ani Sinha]

On Tue, 21 Dec 2021, Olaf Hering wrote:

> Reduce the delta in an upcoming change.
> No change in behavior intended.
>
> Signed-off-by: Olaf Hering <olaf at aepfle.de>

Reviewed-by: Ani Sinha <ani at anisinha.ca>

> ---
>  libvirt.spec.in | 32 +++++++++++++++-----------------
>  1 file changed, 15 insertions(+), 17 deletions(-)
>
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 16be1e173e..7bd74da2c9 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1466,6 +1466,21 @@ fi
>
>
>  %if %{with_qemu}
> +%pre daemon-driver-qemu
> +# We want soft static allocation of well-known ids, as disk images
> +# are commonly shared across NFS mounts by id rather than name; see
> +# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
> +getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
> +getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
> +if ! getent passwd qemu >/dev/null; then
> +  if ! getent passwd 107 >/dev/null; then
> +    useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
> +  else
> +    useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
> +  fi
> +fi
> +exit 0
> +
>  %post daemon-driver-qemu
>      %if %{with_modular_daemons}
>  %libvirt_daemon_systemd_post virtqemud
> @@ -1587,23 +1602,6 @@ done
>  %libvirt_daemon_perform_restart libvirtd
>  %libvirt_daemon_perform_restart virtnwfilterd
>
> -%if %{with_qemu}
> -%pre daemon-driver-qemu
> -# We want soft static allocation of well-known ids, as disk images
> -# are commonly shared across NFS mounts by id rather than name; see
> -# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
> -getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
> -getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
> -if ! getent passwd qemu >/dev/null; then
> -  if ! getent passwd 107 >/dev/null; then
> -    useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
> -  else
> -    useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
> -  fi
> -fi
> -exit 0
> -%endif
> -
>  %if %{with_lxc}
>  %pre login-shell
>  getent group virtlogin >/dev/null || groupadd -r virtlogin
>
>