Changeset 50296 in vbox

Timestamp:

Jan 30, 2014 7:33:06 PM (11 years ago)

Author:

vboxsync

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

91955

Message:

Intaller/Solaris: Reverse binary checks in smf scripts, check whether the file exists first and not after checking whether it is executable

Location:

trunk/src/VBox/Installer/solaris

Files:

• smf-vboxballoonctrl.sh (modified) (2 diffs)
• smf-vboxwebsrv.sh (modified) (2 diffs)

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

@@ -2 +2 @@
 # $Id$
 
-# Copyright (C) 2008-2013 Oracle Corporation
+# Copyright (C) 2008-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 case $VW_OPT in
     start)
-        if [ ! -x /opt/VirtualBox/VBoxBalloonCtrl ]; then
+        if [ ! -f /opt/VirtualBox/VBoxBalloonCtrl ]; then
             echo "ERROR: /opt/VirtualBox/VBoxBalloonCtrl does not exist."
             return $SMF_EXIT_ERR_CONFIG
         fi
 
-        if [ ! -f /opt/VirtualBox/VBoxBalloonCtrl ]; then
-            echo "ERROR: /opt/VirtualBox/VBoxBalloonCtrl does not exist."
+        if [ ! -x /opt/VirtualBox/VBoxBalloonCtrl ]; then
+            echo "ERROR: /opt/VirtualBox/VBoxBalloonCtrl is not executable."
             return $SMF_EXIT_ERR_CONFIG
         fi

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

@@ -2 +2 @@
 # $Id$
 
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 case $VW_OPT in
     start)
-        if [ ! -x /opt/VirtualBox/vboxwebsrv ]; then
+        if [ ! -f /opt/VirtualBox/vboxwebsrv ]; then
             echo "ERROR: /opt/VirtualBox/vboxwebsrv does not exist."
             return $SMF_EXIT_ERR_CONFIG
         fi
 
-        if [ ! -f /opt/VirtualBox/vboxwebsrv ]; then
-            echo "ERROR: /opt/VirtualBox/vboxwebsrv does not exist."
+        if [ ! -x /opt/VirtualBox/vboxwebsrv ]; then
+            echo "ERROR: /opt/VirtualBox/vboxwebsrv is not executable."
             return $SMF_EXIT_ERR_CONFIG
         fi