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

Timestamp:

May 21, 2012 1:33:10 PM (13 years ago)

Author:

vboxsync

Message:

Linux/Solaris installers: Bugfixes.

Location:

trunk/src/VBox/Installer

Files:

• linux/vboxweb-service.sh.in (modified) (2 diffs)
• solaris/smf-vboxwebsrv.sh (modified) (3 diffs)

trunk/src/VBox/Installer/linux/vboxweb-service.sh.in

@@ -312 +312 @@
         # set authentication method + password hash
         if [ -n "$VBOXWEB_AUTH_LIBRARY" ]; then
-            exec su - "$VBOXWEB_USER" -c "$vboxmanage setproperty websrvauthlibrary \"$VBOXWEB_AUTH_LIBRARY\""
+            su - "$VBOXWEB_USER" -c "$vboxmanage setproperty websrvauthlibrary \"$VBOXWEB_AUTH_LIBRARY\""
             if [ $? -ne 0 ]; then
                 fail_msg "Error $? setting webservice authentication library to $VBOXWEB_AUTH_LIBRARY"
@@ -318 +318 @@
         fi
         if [ -n "$VBOXWEB_AUTH_PWHASH" ]; then
-            exec su - "$VBOXWEB_USER" -c "$vboxmanage setextradata global \"VBoxAuthSimple/users/$VBOXWEB_USER\" \"$VBOXWEB_AUTH_PWHASH\""
+            su - "$VBOXWEB_USER" -c "$vboxmanage setextradata global \"VBoxAuthSimple/users/$VBOXWEB_USER\" \"$VBOXWEB_AUTH_PWHASH\""
             if [ $? -ne 0 ]; then
                 fail_msg "Error $? setting webservice password hash"

trunk/src/VBox/Installer/solaris/smf-vboxwebsrv.sh

@@ -54 +54 @@
         VW_SSL_RANDFILE=`/usr/bin/svcprop -p config/ssl_randfile $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_SSL_RANDFILE=
-        VW_AUTH_LIBRARY=`/usr/bin/svcprop -p config/auth_library 2>/dev/null`
+        VW_AUTH_LIBRARY=`/usr/bin/svcprop -p config/auth_library $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_AUTH_LIBRARY=
-        VW_AUTH_PWHASH=`/usr/bin/svcprop -p config/auth_pwhash 2>/dev/null`
+        VW_AUTH_PWHASH=`/usr/bin/svcprop -p config/auth_pwhash $SMF_FMRI 2>/dev/null`
         [ $? != 0 ] && VW_AUTH_PWHASH=
         VW_TIMEOUT=`/usr/bin/svcprop -p config/timeout $SMF_FMRI 2>/dev/null`
@@ -102 +102 @@
         # Set authentication method + password hash
         if [ -n "$VW_AUTH_LIBRARY" ]; then
-            exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxManage setproperty websrvauthlibrary \"$VW_AUTH_LIBRARY\""
+            su - "$VW_USER" -c "/opt/VirtualBox/VBoxManage setproperty websrvauthlibrary \"$VW_AUTH_LIBRARY\""
             if [ $? != 0 ]; then
                 echo "Error $? setting webservice authentication library to $VW_AUTH_LIBRARY"
@@ -108 +108 @@
         fi
         if [ -n "$VW_AUTH_PWHASH" ]; then
-            exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxManage setextradata global \"VBoxAuthSimple/users/$VW_USER\" \"$VW_AUTH_PWHASH\""
+            su - "$VW_USER" -c "/opt/VirtualBox/VBoxManage setextradata global \"VBoxAuthSimple/users/$VW_USER\" \"$VW_AUTH_PWHASH\""
             if [ $? != 0 ]; then
                 echo "Error $? setting webservice password hash"