Changeset 66804 in vbox for trunk/src/VBox/ValidationKit/testboxscript

Timestamp:

May 5, 2017 8:41:11 AM (8 years ago)

Author:

vboxsync

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

115221

Message:

testboxscript: On solaris we can't expect that the existing service config makes sense, apparently. nice.

File:

• trunk/src/VBox/ValidationKit/testboxscript/solaris/setup-routines.sh (modified) (1 diff)

trunk/src/VBox/ValidationKit/testboxscript/solaris/setup-routines.sh

@@ -118 +118 @@
                  | ${MY_TR} '\n' ' ' \
                 `;
-        XMLARGS=`echo "${XMLARGS} " \
-                 | ${MY_SED} \
-                   -e 's/>  */> /g' \
-                   -e 's/  *\/>/ \/>/g' \
-                   -e "s/^.*<exec_method \([^>]*\)name='start'\([^>]*\)>.*\$/\1 \2/" \
-                   -e "s/^.*exec='\([^']*\)'.*\$/\1/" \
-                   -e 's/&quot;/"/g' \
-                   -e 's/&lt;/</g' \
-                   -e 's/&gt;/>/g' \
-                   -e 's/&amp;/&/g' \
-                 | ${MY_SED} \
-                   -e 's/^.*testboxscript -d -m *//' \
-                `;
-        eval common_testboxscript_args_to_config ${XMLARGS}
+        case "${XMLARGS}" in 
+            *exec_method*)
+                XMLARGS=`echo "${XMLARGS} " \
+                         | ${MY_SED} \
+                           -e 's/>  */> /g' \
+                           -e 's/  *\/>/ \/>/g' \
+                           -e "s/^.*<exec_method \([^>]*\)name='start'\([^>]*\)>.*\$/\1 \2/" \
+                           -e "s/^.*exec='\([^']*\)'.*\$/\1/" \
+                           -e 's/&quot;/"/g' \
+                           -e 's/&lt;/</g' \
+                           -e 's/&gt;/>/g' \
+                           -e 's/&amp;/&/g' \
+                         | ${MY_SED} \
+                           -e 's/^.*testboxscript -d -m *//' \
+                        `;
+                eval common_testboxscript_args_to_config ${XMLARGS}
+                ;;
+            *)
+                echo "error: ${MY_SVCCFG}" "export" "${MY_SVC_FMRI} contains no exec_method element." >&2
+                echo "       Please delete the service manually and restart setup.sh" >&2
+                exit 2
+                ;;
+        esac
     fi
 }