diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 6a01886..8ef1fbc 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1735511841 -commit: 46dc19ce6d92942a4fa58296a7273d586e6affcb763f4ac55747b7283de20885 +mtime: 1735954997 +commit: c10cfbdb7cc20c2a99a15daf9c40809212540aab1ddbd420c6f3f2cbf8a152ca url: https://src.opensuse.org/jengelh/virtualbox revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 1e6f41e..104fc3e 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdffbd805f61ed51aa7f6214c9363558059706c90faeb6585839c6d9b4d5fac8 +oid sha256:9193ffb3e96bb907f786b6cd35890f03d4010731ca8ab58452b730c341219cd4 size 256 diff --git a/vboxclient.service b/vboxclient.service index 4d89e18..ecd603d 100644 --- a/vboxclient.service +++ b/vboxclient.service @@ -1,7 +1,6 @@ [Unit] Description=VirtualBox guest VMSVGA resize client ConditionVirtualization=|oracle -ExecCondition=sh -c '[[ "$XDG_SESSION_TYPE" == "wayland" ]] || exit -1' [Service] Type=simple @@ -10,4 +9,4 @@ 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 cbd5c37..2261512 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jan 4 01:40:37 UTC 2025 - Jan Engelhardt + +- Remove bogus ExecCondition= from vboxclient.service. + [boo#1234870] + ------------------------------------------------------------------- Sun Dec 29 22:25:33 UTC 2024 - Jan Engelhardt 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