Changeset 32639 in vbox

Timestamp:

Sep 20, 2010 1:08:48 PM (14 years ago)

Author:

vboxsync

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

66046

Message:

Solaris/Installer: Remote installation fix. Make package non-relocatable and use PKG_INSTALL_ROOT.

Location:

trunk/src/VBox/Installer/solaris

Files:

• checkinstall.sh (modified) (1 diff)
• makepackage.sh (modified) (1 diff)
• pkginstall.sh (modified) (2 diffs)
• postinstall.sh (modified) (1 diff)
• preremove.sh (modified) (1 diff)

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

@@ -35 +35 @@
 
 # nothing to check for targetted install
-if test "x${BASEDIR}" != "x/"; then
+if test "x$PKG_INSTALL_ROOT" != "x/"; then
     exit 0
 fi

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

@@ -212 +212 @@
 mv -f prototype2 prototype
 
+# Our package is a non-relocatable package. pkgadd will take care of "relocating" them when they are used for
+# remote installations using $PKG_INSTALL_ROOT and not $BASEDIR. Seems this little subtlety led to it's own page:
+# http://docs.sun.com/app/docs/doc/820-4042/package-2?a=view
+filelist_fixup prototype  '$2 == "none"'                              '$3="/"$3'
+filelist_fixup prototype  '$2 == "manifest"'                          '$3="/"$3'
+symlink_fixup  prototype  '$2 == "none"'                              '$3="/"$3'
+hardlink_fixup prototype  '$2 == "none"'                              '$3="/"$3'
+
 echo " --- start of prototype  ---"
 cat prototype

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

@@ -30 +30 @@
 fi
 
-${BASEDIR}/opt/VirtualBox/vboxconfig.sh --preremove --fatal "$ISIPS"
+# If PKG_INSTALL_ROOT is undefined or NULL, redefine to '/' and carry on.
+${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/vboxconfig.sh --preremove --fatal "$ISIPS"
 
 if test "$?" -eq 0; then
     echo "Installing new ones..."
-    ${BASEDIR}/opt/VirtualBox/vboxconfig.sh --postinstall
+    $PKG_INSTALL_ROOT/opt/VirtualBox/vboxconfig.sh --postinstall
     rc=$?
     if test "$rc" -ne 0; then
-        echo "Completed but with errors."
+        echo 1>&2 "## Completed but with errors."
         rc=1
     else
@@ -45 +46 @@
     fi
 else
-    echo "## ERROR!! Failed to remove older/partially installed bits."
+    echo 1>&2 "## ERROR!! Failed to remove older/partially installed bits."
     rc=1
 fi

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

@@ -19 +19 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    ${BASEDIR}/opt/VirtualBox/pkginstall.sh --srv4
+    ${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/pkginstall.sh --srv4
     rc=$?
 fi

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

@@ -17 +17 @@
 if test "$currentzone" = "global"; then
     echo "Removing VirtualBox services and drivers..."
-    ${BASEDIR}/opt/VirtualBox/vboxconfig.sh --preremove
+    ${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/vboxconfig.sh --preremove
     if test "$?" -eq 0; then
         echo "Done."
         exit 0
     fi
-    echo "Failed."
+    echo 1>&2 "## Failed."
     exit 1
 fi