Changeset 24240 in vbox for trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

Timestamp:

Nov 2, 2009 9:50:12 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Additions: some zone fixes.

File:

• trunk/src/VBox/Additions/solaris/Installer/postinstall.sh (modified) (5 diffs)

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

@@ -67 +67 @@
 
 solaris64dir="amd64"
-vboxadditions_path="/opt/VirtualBoxAdditions"
+vboxadditions_path="$BASEDIR/opt/VirtualBoxAdditions"
 vboxadditions64_path=$vboxadditions_path/$solaris64dir
 
+# get the current zone
+currentzone=`zonename`
 # get what ISA the guest is running
 cputype=`isainfo -k`
@@ -77 +79 @@
     isadir=""
 fi
+
 vboxadditionsisa_path=$vboxadditions_path/$isadir
 
@@ -91 +94 @@
 fi
 
-# vboxguest.sh would've been installed, we just need to call it.
-echo "Configuring VirtualBox guest kernel module..."
-$vboxadditions_path/vboxguest.sh restartall silentunload
-
-sed -e '
-/name=vboxguest/d' /etc/devlink.tab > /etc/devlink.vbox
-echo "type=ddi_pseudo;name=vboxguest    \D" >> /etc/devlink.vbox
-mv -f /etc/devlink.vbox /etc/devlink.tab
-
-# create the device link
-/usr/sbin/devfsadm -i vboxguest
-sync
+
+if test "$currentzone" = "global"; then
+    # vboxguest.sh would've been installed, we just need to call it.
+    echo "Configuring VirtualBox guest kernel module..."
+    $vboxadditions_path/vboxguest.sh restartall silentunload
+
+    sed -e '/name=vboxguest/d' /etc/devlink.tab > /etc/devlink.vbox
+    echo "type=ddi_pseudo;name=vboxguest        \D" >> /etc/devlink.vbox
+    mv -f /etc/devlink.vbox /etc/devlink.tab
+
+    # create the device link
+    /usr/sbin/devfsadm -i vboxguest
+    sync
+fi
+
 
 # check if Xorg exists
@@ -114 +120 @@
 # create links
 echo "Creating links..."
-/usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s
+if test "$currentzone" = "global"; then
+    /usr/sbin/installf -c none $PKGINST /dev/vboxguest=../devices/pci@0,0/pci80ee,cafe@4:vboxguest s
+fi
 if test ! -z "$xorgbin"; then
     /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxClient=$vboxadditions_path/VBox.sh s
@@ -305 +313 @@
 
 
-# Setup our VBoxService SMF service
-echo "Configuring service..."
-
-/usr/sbin/svccfg import /var/svc/manifest/system/virtualbox/vboxservice.xml
-/usr/sbin/svcadm enable svc:/system/virtualbox/vboxservice
-
-/usr/sbin/devfsadm -i vboxguest
-
-# Update boot archive
-BOOTADMBIN=/sbin/bootadm
-if test -x "$BOOTADMBIN"; then
-    if test -h "/dev/vboxguest"; then
-        echo "Updating boot archive..."
-        $BOOTADMBIN update-archive > /dev/null
+if test "$currentzone" = "global"; then
+    # Setup our VBoxService SMF service
+    echo "Configuring service..."
+
+    /usr/sbin/svccfg import /var/svc/manifest/system/virtualbox/vboxservice.xml
+    /usr/sbin/svcadm enable svc:/system/virtualbox/vboxservice
+
+    /usr/sbin/devfsadm -i vboxguest
+
+    # Update boot archive
+    BOOTADMBIN=/sbin/bootadm
+    if test -x "$BOOTADMBIN"; then
+        if test -h "/dev/vboxguest"; then
+            echo "Updating boot archive..."
+            $BOOTADMBIN update-archive > /dev/null
+        else
+            echo "## Guest kernel module doesn't seem to be up. Skipped explicit boot-archive update."
+        fi
     else
-        echo "## Guest kernel module doesn't seem to be up. Skipped explicit boot-archive update."
-    fi
-else
-    echo "## $BOOTADMBIN not found/executable. Skipped explicit boot-archive update."
-fi
+        echo "## $BOOTADMBIN not found/executable. Skipped explicit boot-archive update."
+    fi
+fi
+
 
 echo "Done."