Changeset 92503 in vbox for trunk/src/VBox/Additions/solaris/Installer

Timestamp:

Nov 18, 2021 5:43:22 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148366

Message:

Installer/solaris, Additions/solaris/Installer: Fix handing of /etc/devlink.tab group membership in the driver install. Automatically adjusts to the group which should be used on the respective OS update version. Done in a way which automatically repairs the incorrect group membership on the next install/uninstall.

Location:

trunk/src/VBox/Additions/solaris/Installer

Files:

• postinstall.sh (modified) (1 diff)
• preremove.sh (modified) (1 diff)

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -98 +98 @@
     $vboxadditions_path/vboxguest.sh start
 
+    # Figure out group to use for /etc/devlink.tab (before Solaris 11 SRU6
+    # it was always using group sys)
+    group=sys
+    if [ -f /etc/dev/reserved_devnames ]; then
+        # Solaris 11 SRU6 and later use group root (check a file which isn't
+        # tainted by VirtualBox install scripts and allow no other group)
+        refgroup=$(LC_ALL=C /usr/bin/ls -lL /etc/dev/reserved_devnames | awk '{ print $4 }' 2>/dev/null)
+        if [ $? -eq 0 -a "x$refgroup" = "xroot" ]; then
+            group=root
+        fi
+        unset refgroup
+    fi
+
     sed -e '/name=vboxguest/d' /etc/devlink.tab > /etc/devlink.vbox
     echo "type=ddi_pseudo;name=vboxguest        \D" >> /etc/devlink.vbox
+    chmod 0644 /etc/devlink.vbox
+    chown root:$group /etc/devlink.vbox
     mv -f /etc/devlink.vbox /etc/devlink.tab
 

trunk/src/VBox/Additions/solaris/Installer/preremove.sh

@@ -48 +48 @@
 /opt/VirtualBoxAdditions/vboxguest.sh stopall silentunload
 
+# Figure out group to use for /etc/devlink.tab (before Solaris 11 SRU6
+# it was always using group sys)
+group=sys
+if [ -f /etc/dev/reserved_devnames ]; then
+    # Solaris 11 SRU6 and later use group root (check a file which isn't
+    # tainted by VirtualBox install scripts and allow no other group)
+    refgroup=$(LC_ALL=C /usr/bin/ls -lL /etc/dev/reserved_devnames | awk '{ print $4 }' 2>/dev/null)
+    if [ $? -eq 0 -a "x$refgroup" = "xroot" ]; then
+        group=root
+    fi
+    unset refgroup
+fi
+
 # remove devlink.tab entry for vboxguest
-sed -e '
-/name=vboxguest/d' /etc/devlink.tab > /etc/devlink.vbox
+sed -e '/name=vboxguest/d' /etc/devlink.tab > /etc/devlink.vbox
+chmod 0644 /etc/devlink.vbox
+chown root:$group /etc/devlink.vbox
 mv -f /etc/devlink.vbox /etc/devlink.tab