Changeset 11358 in vbox for trunk

Timestamp:

Aug 12, 2008 2:13:23 PM (16 years ago)

Author:

vboxsync

Message:

Installer/solaris: Add SMF support for webservice. Also cleaned up makepackage.sh.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs, 1 prop)
• makepackage.sh (modified) (2 diffs, 1 prop)
• postinstall.sh (modified) (1 diff, 1 prop)
• preremove.sh (modified) (1 prop)
• smf-vboxwebsrv.sh (added)
• virtualbox-webservice.xml (added)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -127 +127 @@
         vnic_setup.sh \
         vnic_term.sh \
+        virtualbox-webservice.xml \
+        smf-vboxwebsrv.sh \
         vbox.copyright \
         ReadMe.txt
@@ -299 +301 @@
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $(PATH_BIN)/vboxwebsrv $(SOLARIS_INST_DIR)/vboxwebsrv,)
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $(PATH_BIN)/webtest    $(SOLARIS_INST_DIR)/webtest,)
+        $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(PATH_CURRENT)/virtualbox-webservice.xml         $(SOLARIS_INST_DIR)/virtualbox-webservice.xml,)
+        $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(PATH_CURRENT)/smf-vboxwebsrv.sh                 $(SOLARIS_INST_DIR)/smf-vboxwebsrv.sh,)
         $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh            $(SOLARIS_INST_DIR)/vnic_setup.sh
         $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh            $(SOLARIS_INST_DIR)/vnic_term.sh

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

@@ -51 +51 @@
 set -e
 
+# Fixup filelist using awk, the parameters must be in awk syntax
+# params: filename condition action
+filelist_fixup()
+{
+  "$VBOX_AWK" 'NF == 6 && '"$2"' { '"$3"' } { print }' "$1" > "tmp-$1"
+  mv -f "tmp-$1" "$1"
+}
+
 # prepare file list
 cd "$1"
@@ -64 +72 @@
 
 # don't grok for the sed class files
-$VBOX_AWK 'NF == 6 && $2 == "none" { $5 = "root"; $6 = "bin" } { print }' prototype > prototype2
-$VBOX_AWK 'NF == 6 && $2 == "none" { $3 = "opt/VirtualBox/"$3"="$3 } { print }' prototype2 > prototype
+filelist_fixup prototype '$2 == "none"'                                                                 '$5 = "root"; $6 = "bin"'
+filelist_fixup prototype '$2 == "none"'                                                                 '$3 = "opt/VirtualBox/"$3"="$3'
 
 # install the kernel module to the right place.
 if test "$3" = "x86"; then
-    $VBOX_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv=vboxdrv" { $3 = "platform/i86pc/kernel/drv/vboxdrv=vboxdrv"; $6 = "sys" } { print }' prototype > prototype2
+    filelist_fixup prototype '$3 == "opt/VirtualBox/vboxdrv=vboxdrv"                                    '$3 = "platform/i86pc/kernel/drv/vboxdrv=vboxdrv"; $6 = "sys"'
 else
-    $VBOX_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv=vboxdrv" { $3 = "platform/i86pc/kernel/drv/amd64/vboxdrv=vboxdrv"; $6 = "sys" } { print }' prototype > prototype2
+    filelist_fixup prototype '$3 == "opt/VirtualBox/vboxdrv=vboxdrv"'                                   '$3 = "platform/i86pc/kernel/drv/amd64/vboxdrv=vboxdrv"; $6 = "sys"'
 fi
 
-$VBOX_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv.conf=vboxdrv.conf" { $3 = "platform/i86pc/kernel/drv/vboxdrv.conf=vboxdrv.conf" } { print }' prototype2 > prototype
+filelist_fixup prototype '$3 == "opt/VirtualBox/vboxdrv.conf=vboxdrv.conf"'                             '$3 = "platform/i86pc/kernel/drv/vboxdrv.conf=vboxdrv.conf"'
 
 # desktop links and icons
-$VBOX_AWK 'NF == 6 && $3 == "opt/VirtualBox/virtualbox.desktop=virtualbox.desktop" { $3 = "usr/share/applications/virtualbox.desktop=virtualbox.desktop" } { print }' prototype > prototype2
-$VBOX_AWK 'NF == 6 && $3 == "opt/VirtualBox/VBox.png=VBox.png" { $3 = "usr/share/pixmaps/VBox.png=VBox.png" } { print }' prototype2 > prototype
+filelist_fixup prototype '$3 == "opt/VirtualBox/virtualbox.desktop=virtualbox.desktop"'                 '$3 = "usr/share/applications/virtualbox.desktop=virtualbox.desktop"'
+filelist_fixup prototype '$3 == "opt/VirtualBox/VBox.png=VBox.png"'                                     '$3 = "usr/share/pixmaps/VBox.png=VBox.png"'
 
-
-rm prototype2
+# webservice SMF manifest
+filelist_fixup prototype '$3 == "opt/VirtualBox/virtualbox-webservice.xml=virtualbox-webservice.xml"'   '$3 = "var/svc/manifest/application/virtualbox/webservice.xml=virtualbox-webservice.xml'
 
 # explicitly set timestamp to shutup warning

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

@@ -58 +58 @@
     fi
 fi
+if test -f /var/svc/manifest/application/virtualbox/webservice.xml; then
+    /usr/sbin/svccfg import /var/svc/manifest/application/virtualbox/webservice.xml
+fi
 /usr/sbin/removef $PKGINST /opt/VirtualBox/etc/devlink.tab 1>/dev/null
 /usr/sbin/removef $PKGINST /opt/VirtualBox/etc 1>/dev/null