[rpms/virtualbox-guest-additions] alext-upd-to-7.2.12: Add mount.vboxsf script wrapper

[rpms/virtualbox-guest-additions] alext-upd-to-7.2.12: Add mount.vboxsf script wrapper

[@ 2026-07-12 20:58 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/virtualbox-guest-additions
Branch : alext-upd-to-7.2.12
Commit : b9f1767dccd23d4a4adae6eff54d96e77982c0d3
Author : Sérgio M. Basto <sergio@serjux.com>
Date   : 2022-11-05T23:01:30+00:00
Stats  : +24/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/virtualbox-guest-additions/c/b9f1767dccd23d4a4adae6eff54d96e77982c0d3?branch=alext-upd-to-7.2.12

Log:
Add mount.vboxsf script wrapper

---
diff --git a/mount.vboxsf b/mount.vboxsf
new file mode 100644
index 0000000..f833e78
--- /dev/null
+++ b/mount.vboxsf
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Hopefully this works as intented, supporting both pre-4.16 and newer kernels
+# https://bugs.archlinux.org/task/58272#comment168687
+
+kver_major=$(uname -r | cut -d. -f1)
+kver_minor=$(uname -r | cut -d. -f2)
+
+if ((kver_major * 100 + kver_minor < 416)); then
+	exec /usr/lib/virtualbox/mount.vboxsf "$@"
+fi
+
+# mount(1) annoyingly prepends the current directory to the source
+name=${1#$PWD/}; shift
+
+# Mainline vboxsf accepts regular mount opts
+exec /usr/bin/mount -cit vboxsf "$name" "$@"

diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 170548e..c664743 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,6 +1,6 @@
 Name:       virtualbox-guest-additions
 Version:    7.0.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -9,6 +9,7 @@ Source0:    https://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{v
 Source1:    vboxservice.service
 Source3:    VirtualBox-60-vboxguest.rules
 Source4:    vboxclient.service
+Source5:    mount.vboxsf
 
 Patch60:    VirtualBox-7.0.2-xclient-cleanups.patch
 
@@ -115,7 +116,9 @@ mkdir -p %{buildroot}%{_libdir}/security
 
 # Guest-additions tools
 install -m 0755 -t %{buildroot}%{_sbindir}   \
-    obj/bin/additions/VBoxService
+    obj/bin/additions/VBoxService            \
+    %{SOURCE5}
+
 install -m 0755 -t %{buildroot}%{_bindir}    \
     obj/bin/additions/VBoxDRMClient          \
     obj/bin/additions/VBoxClient             \
@@ -167,6 +170,7 @@ getent passwd vboxadd >/dev/null || \
 %{_bindir}/VBoxClient-all
 %{_bindir}/VBoxDRMClient
 %{_sbindir}/VBoxService
+%{_sbindir}/mount.vboxsf
 %{_libdir}/security/pam_vbox.so
 %{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
 %{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -178,6 +182,7 @@ getent passwd vboxadd >/dev/null || \
 %changelog
 * Sat Nov 05 2022 Sérgio Basto <sergio@serjux.com> - 7.0.2-1
 - Update to 7.0.2
+- Add mount.vboxsf script wrapper
 
 * Mon Oct 31 2022 Sérgio Basto <sergio@serjux.com> - 6.1.40-1
 - Update virtualbox-guest-additions to 6.1.40