Changeset 88632 in vbox for trunk/src/VBox/ValidationKit/testboxscript/solaris

Timestamp:

Apr 21, 2021 12:27:22 PM (4 years ago)

Author:

vboxsync

Message:

testboxscript.xml service manifest has to be located permanent in /lib/svc/manifest/system for non solaris 10 versions. In solaris 11, the new service described in the manifest, will be added automatically by the command svcadm restart manifest-import

File:

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

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

@@ -54 +54 @@
 # Solaris variables.
 #
-MY_SVC_TMP="/tmp/testboxscript.xml"
 MY_SVC_FMRI="svc:/system/virtualbox/testboxscript"
 MY_SVCCFG="/usr/sbin/svccfg"
 MY_SVCADM="/usr/sbin/svcadm"
+MY_CHGRP="/usr/bin/chgrp"
 MY_TR="/usr/bin/tr"
 MY_TAB=`printf "\t"`
+
+if test "${MY_SOLARIS_VER}" -lt 11; then
+    # solaris 10 service import
+    MY_SVC="/tmp/testboxscript.xml"
+else
+    # use propper manifest directory
+    # /lib/svc/manifest/system for solaris 11 and higher for testboxscript.xml file
+
+    # Since sol 11.4 the solaris testboxscript service
+    # generates Warnings in /var/svc/log/system-manifest-import:default.log
+    # -------- Warning!!
+    # Configuring services...
+    # * Warning!! Importing Zone access service  ...FAILED.
+
+    MY_SVC="/lib/svc/manifest/system/testboxscript.xml"
+fi
 if test "${MY_SOLARIS_VER}" -lt 11; then ## No gsed on S10?? ARG!
     MY_SED="/usr/xpg4/bin/sed"
@@ -202 +218 @@
 
     # Create the service xml config file.
-    cat > "${MY_SVC_TMP}" <<EOF
+    cat > "${MY_SVC}" <<EOF
 <?xml version='1.0'?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
@@ -233 +249 @@
 EOF
     if [ "`uname -r`" = "5.10" ]; then # Seems to be gone in S11?
-        cat >> "${MY_SVC_TMP}" <<EOF
+        cat >> "${MY_SVC}" <<EOF
             <dependency name='filesystem-volfs'  grouping='require_all' restart_on='none' type='service'>
             <service_fmri value='svc:/system/filesystem/volfs:default' />
@@ -239 +255 @@
 EOF
     fi
-    cat >> "${MY_SVC_TMP}" <<EOF
+    cat >> "${MY_SVC}" <<EOF
         <!-- start + stop methods -->
         <exec_method type='method' name='start' exec='${MY_SCREEN} -S testboxscript -d -m ${MY_ARGV}'
@@ -268 +284 @@
 EOF
 
-    # Install the service, replacing old stuff.
-    if "${MY_SVCCFG}" "export" "${MY_SVC_FMRI}" > /dev/null 2>&1; then
+    if test "${MY_SOLARIS_VER}" -lt 11; then
+      # Install the service, replacing old stuff.
+      if "${MY_SVCCFG}" "export" "${MY_SVC_FMRI}" > /dev/null 2>&1; then
         "${MY_SVCCFG}" "delete" "${MY_SVC_FMRI}"
-    fi
-    "${MY_SVCCFG}" "import" "${MY_SVC_TMP}"
-    rm -f "${MY_SVC_TMP}"
+      fi
+      "${MY_SVCCFG}" "import" "${MY_SVC}"
+
+      # only for solaris version less than 11
+      rm -f "${MY_SVC}"
+    else
+      "${MY_CHGRP}" "sys" "${MY_SVC}"
+      "${MY_SVCADM}" "restart" "manifest-import"
+
+      # Do not remove the xml file in Solaris versions 11 and higher.
+      # The service will be removed automatically, if the command
+      # svcadm restart manifest-import
+      # will be executed
+
+    fi
     return 0;
 }