Changeset 44215 in vbox for trunk/src

Timestamp:

Dec 29, 2012 12:45:56 AM (12 years ago)

Author:

vboxsync

Message:

Propagate xtrace from pkgadd -v down the scripts.

Location:

trunk/src/VBox/Installer/solaris

Files:

• pkginstall.sh (modified) (1 diff, 1 prop)
• postinstall.sh (modified) (1 diff)
• vboxconfig.sh (modified) (3 diffs, 1 prop)

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

@@ -31 +31 @@
 fi
 
+# pkgadd -v
+if test "$1" = "--sh-trace" || test "$2" = "--sh-trace" || test "$3" = "--sh-trace"; then
+    set -x
+fi
+DEBUGOPT=`set -o | sed -ne 's/^xtrace *on$/--sh-trace/p'` # propagate pkgadd -v
+
 # If PKG_INSTALL_ROOT is undefined or NULL, redefine to '/' and carry on.
-${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/vboxconfig.sh --preremove --fatal "$ISIPS"
+${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/vboxconfig.sh --preremove --fatal ${ISIPS} ${DEBUGOPT}
 
 if test "$?" -eq 0; then
     echo "Installing new ones..."
-    $PKG_INSTALL_ROOT/opt/VirtualBox/vboxconfig.sh --postinstall
+    $PKG_INSTALL_ROOT/opt/VirtualBox/vboxconfig.sh --postinstall ${DEBUGOPT}
     rc=$?
     if test "$rc" -ne 0; then

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

@@ -20 +20 @@
 currentzone=`zonename`
 if test "$currentzone" = "global"; then
-    ${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/pkginstall.sh --srv4
+    DEBUGOPT=`set -o | sed -ne 's/^xtrace *on$/--sh-trace/p'` # propagate pkgadd -v
+    ${PKG_INSTALL_ROOT:=/}/opt/VirtualBox/pkginstall.sh --srv4 ${DEBUGOPT}
     rc=$?
 fi

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

@@ -604 +604 @@
     fi
 
-    # Create the device link for non-remote installs
+    # Create the device link for non-remote installs (not really relevant any more)
     if test "$REMOTEINST" -eq 0; then
         /usr/sbin/devfsadm -i "$MOD_VBOXDRV"
-        if test $? -ne 0 || test ! -h "/dev/vboxdrv" || test ! -h "/dev/vboxdrvu" ; then
-            errorprint "Failed to create device link for $MOD_VBOXDRV."
-            exit 1
-        fi
+        #if test $? -ne 0 || test ! -h "/dev/vboxdrv" || test ! -h "/dev/vboxdrvu" ; then
+        #    errorprint "Failed to create device link for $MOD_VBOXDRV."
+        #    exit 1
+        #fi
     fi
 
@@ -1222 +1222 @@
             DIR_CONF="/usr/kernel/drv"
             ;;
+        --sh-trace) # forwarded pkgadd -v 
+            set -x
+            ;;
         --help)
             printusage
@@ -1227 +1230 @@
             ;;
         *)
-            break
+            # Take a hard line on invalid options.
+            errorprint "Invalid command line option: \"$1\""
+            exit 1;
             ;;
     esac