From f7f84c2c96c8b5eeb3a214cbfd8c9e8634553f690a8c82611dd53ab24fb96dac Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 4 Jan 2025 01:43:43 +0000 Subject: [PATCH] [info=c10cfbdb7cc20c2a99a15daf9c40809212540aab1ddbd420c6f3f2cbf8a152ca] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=759 --- _scmsync.obsinfo | 4 ++-- build.specials.obscpio | 2 +- vboxclient.service | 3 +-- virtualbox-60-vboxguest.rules | 1 - virtualbox.changes | 4 ++-- virtualbox.spec | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 5d79b67..8ef1fbc 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1735864652 -commit: 98fd308b06b58bba271843c67949f72e148488744c2e7a5a281c3c17532b8d42 +mtime: 1735954997 +commit: c10cfbdb7cc20c2a99a15daf9c40809212540aab1ddbd420c6f3f2cbf8a152ca url: https://src.opensuse.org/jengelh/virtualbox revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 103e668..104fc3e 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e98c54198af00be84ae9188a1eea1d9226a1e90f2f6302107b0e031c0b05ce91 +oid sha256:9193ffb3e96bb907f786b6cd35890f03d4010731ca8ab58452b730c341219cd4 size 256 diff --git a/vboxclient.service b/vboxclient.service index 2f1c1ed..ecd603d 100644 --- a/vboxclient.service +++ b/vboxclient.service @@ -4,10 +4,9 @@ ConditionVirtualization=|oracle [Service] Type=simple -ExecCondition=sh -c '[ "$XDG_SESSION_TYPE" = "wayland" ] || exit -1' ExecStart=/usr/bin/VBoxDRMClient Restart=on-failure [Install] WantedBy=multi-user.target - +# also Wanted by 90-vboxguest.rules diff --git a/virtualbox-60-vboxguest.rules b/virtualbox-60-vboxguest.rules index 331c61a..caf4eb8 100644 --- a/virtualbox-60-vboxguest.rules +++ b/virtualbox-60-vboxguest.rules @@ -1,4 +1,3 @@ KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" ENV{ID_INPUT}="1", ENV{ID_INPUT_MOUSE}="1" KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0660", TAG+="uaccess" ACTION=="add|change", SUBSYSTEM=="drm", KERNEL=="card[0-9]", SUBSYSTEMS=="pci", ATTRS{vendor}=="0x15ad", ATTRS{device}=="0x0405", TAG+="systemd", ENV{SYSTEMD_WANTS}="vboxclient.service" - diff --git a/virtualbox.changes b/virtualbox.changes index b29ecf8..2261512 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Fri Jan 3 00:37:20 UTC 2025 - Jan Engelhardt +Sat Jan 4 01:40:37 UTC 2025 - Jan Engelhardt -- Resolve wrong placement of ExecCondition= directive. +- Remove bogus ExecCondition= from vboxclient.service. [boo#1234870] ------------------------------------------------------------------- diff --git a/virtualbox.spec b/virtualbox.spec index 4587cd3..476bdf0 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -529,7 +529,7 @@ install -m 755 out/linux.*/release/bin/additions/mount.vboxsf %{buildroot}%{_sbi install -m 744 src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_vbox_instdir}/vboxadd-service install -d %{buildroot}%{_userunitdir} # udev rule for guest (virtualbox-guest-tools) -install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-vboxguest.rules +install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-vboxguest.rules install -p -m 0644 -D %{SOURCE12} %{buildroot}%{_unitdir}/vboxclient.service install -p -m 0644 -D %{SOURCE13} %{buildroot}%{_unitdir}/vboxservice.service # /media is used for auto-mounting of shared folders