Changeset 12650 in vbox for trunk/src/VBox/Installer

Timestamp:

Sep 22, 2008 3:05:24 PM (17 years ago)

Author:

vboxsync

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

36939

Message:

Solaris/installer: Zone fixes - eliminated devlink.tab and webservice to load only in the global zone. Link creation is now done manually during postinstall.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (3 diffs)
• makepackage.sh (modified) (1 diff)
• postinstall.sh (modified) (2 diffs)
• preremove.sh (modified) (1 diff)
• vboxdrv.sh (modified) (4 diffs)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -55 +55 @@
 OTHER_CLEAN      = $(addprefix $(SOLARIS_INST_DIR)/,\
         vbox.pkginfo vbox.copyright vbox.space vbox.pkgresponse \
-        makepackage.sh prototype postinstall.sh preremove.sh etc/devlink.tab )
+        makepackage.sh prototype postinstall.sh preremove.sh)
 
 #
@@ -228 +228 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.space \
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse \
-                $(VBOX_PATH_SOL_INST_SRC)/vboxdevlink.sed \
                 $(VBOX_PATH_SOL_INST_SRC)/VBox.sh \
                 $(VBOX_PATH_SOL_INST_SRC)/virtualbox.desktop \
@@ -392 +391 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/makepackage.sh                                     $(SOLARIS_INST_DIR)/makepackage.sh
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkgresponse                                   $(SOLARIS_INST_DIR)/autoresponse
-        $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vboxdevlink.sed                                    $(SOLARIS_INST_DIR)/etc/devlink.tab
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOL_INST_SRC)/vbox.space                                         $(SOLARIS_INST_DIR)/vbox.space
         $(QUIET)$(SED) \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -87 +87 @@
     echo 'i copyright=./vbox.copyright' >> prototype
 fi
-echo 'e sed /etc/devlink.tab ? ? ?' >> prototype
 find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|preremove.sh|ReadMe.txt|vbox.space|vbox.copyright|VirtualBoxKern' | pkgproto >> prototype
 
-# don't grok for the sed class files
+# don't grok for the class files
 filelist_fixup prototype '$2 == "none"'                                                                 '$5 = "root"; $6 = "bin"'
 filelist_fixup prototype '$2 == "none"'                                                                 '$3 = "opt/VirtualBox/"$3"="$3'

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

@@ -30 +30 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    echo "Configuring VirtualBox kernel module..."
+    echo "Configuring VirtualBox Host kernel module..."
     /opt/VirtualBox/vboxdrv.sh stopall silentunload
     /opt/VirtualBox/vboxdrv.sh start
 
-    echo "Configuring VirtualBox NetFilter kernel module..."
     if test -f /platform/i86pc/kernel/drv/vboxflt.conf; then
+        echo "Configuring VirtualBox NetFilter kernel module..."
         /opt/VirtualBox/vboxdrv.sh fltstart
     fi
@@ -55 +55 @@
     fi
 fi
-if test -f /var/svc/manifest/application/virtualbox/webservice.xml; then
-    /usr/sbin/svccfg import /var/svc/manifest/application/virtualbox/webservice.xml
-    /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
-fi
-/usr/sbin/removef $PKGINST /opt/VirtualBox/etc/devlink.tab 1>/dev/null
-/usr/sbin/removef $PKGINST /opt/VirtualBox/etc 1>/dev/null
-rm -rf /opt/VirtualBox/etc
-/usr/sbin/removef -f $PKGINST
 
-/usr/sbin/installf -f $PKGINST
+if test "$currentzone" = "global"; then
+    if test -f /var/svc/manifest/application/virtualbox/webservice.xml; then
+        /usr/sbin/svccfg import /var/svc/manifest/application/virtualbox/webservice.xml
+        /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
+    fi
 
-# We need to touch the desktop link in order to add it to the menu right away
-if test "$currentzone" = "global"; then
+    # create /dev link for vboxdrv
+    /usr/sbin/installf -c none $PKGINST /dev/vboxdrv=../devices/pseudo/vboxdrv@0:vboxdrv s
+
+    # We need to touch the desktop link in order to add it to the menu right away
     if test -f "/usr/share/applications/virtualbox.desktop"; then
         touch /usr/share/applications/virtualbox.desktop
     fi
+fi
 
-    # create /dev link for vboxdrv (only possible from global zone)
-    /usr/sbin/devfsadm -i vboxdrv
-fi
+/usr/sbin/installf -f $PKGINST
 
 echo "Done."

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

@@ -21 +21 @@
 echo "This script will unload the VirtualBox kernel module..."
 
-# vboxdrv.sh would've been installed, we just need to call it.
-/opt/VirtualBox/vboxdrv.sh stopall
-
-# remove /dev/vboxdrv
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    rm -f /dev/vboxdrv
+    # stop and unregister webservice daemon
+    /usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
+    /usr/sbin/svccfg delete svc:/application/virtualbox/webservice:default
+
+    # vboxdrv.sh would've been installed, we just need to call it.
+    /opt/VirtualBox/vboxdrv.sh stopall
 fi
-
-# stop and unregister webservice daemon
-/usr/sbin/svcadm disable -s svc:/application/virtualbox/webservice:default
-/usr/sbin/svccfg delete svc:/application/virtualbox/webservice:default
-
 
 echo "Done."

trunk/src/VBox/Installer/solaris/vboxdrv.sh

@@ -61 +61 @@
     fi
 
-    abort "## VirtualBox kernel module NOT installed."
+    abort "## VirtualBox Host kernel module NOT installed."
 }
 
@@ -100 +100 @@
 {
     if module_loaded; then
-        info "VirtualBox kernel module already loaded."
+        info "VirtualBox Host kernel module already loaded."
     else
         if test -n "_HARDENED_"; then
@@ -108 +108 @@
         fi
         if test ! module_loaded; then
-            abort "## Failed to load VirtualBox kernel module."
+            abort "## Failed to load VirtualBox Host kernel module."
         elif test -c "/devices/pseudo/$MODNAME@0:$MODNAME"; then
-            info "VirtualBox kernel module loaded."
+            info "VirtualBox Host kernel module loaded."
         else
             abort "Aborting due to attach failure."
@@ -120 +120 @@
 {
     if module_loaded; then
-        /usr/sbin/rem_drv $MODNAME || abort "## Failed to unload VirtualBox kernel module."
-        info "VirtualBox kernel module unloaded."
+        /usr/sbin/rem_drv $MODNAME || abort "## Failed to unload VirtualBox Host kernel module."
+        info "VirtualBox Host kernel module unloaded."
     elif test -z "$SILENTUNLOAD"; then
-        info "VirtualBox kernel module not loaded."
+        info "VirtualBox Host kernel module not loaded."
     fi