Changeset 8867

Timestamp:

05/16/08 06:50:01 (3 months ago)

Author:

vboxsync

Message:

Solaris installer: Added desktop entry for launching VirtualBox.

Files:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (4 diffs)
• trunk/src/VBox/Installer/solaris/makepackage.sh (modified) (1 diff)
• trunk/src/VBox/Installer/solaris/postinstall.sh (modified) (1 diff)
• trunk/src/VBox/Installer/solaris/vboxdrv.sh (modified) (1 diff)
• trunk/src/VBox/Installer/solaris/virtualbox.desktop (added)

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

@@ -49 +49 @@
-solaris-doc_MODE = a+r,u+w
-solaris-doc_SOURCES = \
-
+
+
-
-#
@@ -107 +108 @@
-        $(if $(VBOX_WITH_QTGUI),qtgcc/lib/libqt-mt.so.3,) \
-        $(if $(VBOX_WITH_QTGUI),qtgcc/bin/qtconfig,) \
+        $(if $(VBOX_WITH_QTGUI),virtualbox.desktop,) \
+        VBox.png \
-        autoresponse \
-        vboxdrv.conf \
@@ -181 +184 @@
-                vboxdevlink.sed \
-                VBox.sh \
+                virtualbox.desktop \
-                sdkfiles \
-                $(PATH_ROOT)/doc/ReadMe-Solaris.txt \
@@ -280 +284 @@
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/vboxdrv.sh                                                   $(SOLARIS_INST_DIR)/vboxdrv.sh
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/VBox.sh                                                      $(SOLARIS_INST_DIR)/VBox.sh
+        $(QUIET)$(if $(VBOX_WITH_QTGUI),$(INSTALL) -m 0644 $(PATH_CURRENT)/virtualbox.desktop                   $(SOLARIS_INST_DIR)/virtualbox.desktop,)
+        $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/VBox.png                                                         $(SOLARIS_INST_DIR)/VBox.png
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/postinstall.sh                                               $(SOLARIS_INST_DIR)/postinstall.sh
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/preremove.sh                                                 $(SOLARIS_INST_DIR)/preremove.sh

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

@@ -73 +73 @@
-$VBOX_AWK 'NF == 6 && $3 == "opt/VirtualBox/vboxdrv.conf=vboxdrv.conf" { $3 = "platform/i86pc/kernel/drv/vboxdrv.conf=vboxdrv.conf" } { print }' prototype2 > prototype
-
+# 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
+
+
-rm prototype2
-

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

@@ -49 +49 @@
-/usr/sbin/installf -f $PKGINST
-
+# We need to touch the desktop link inorder to add it to the menu right away
+if test -f /usr/share/applications/virtualbox.desktop; then
+    touch /usr/share/applications/virtualbox.desktop
+fi
+
+# create /dev link for vboxdrv (only possible from global zone)
-if test "$currentzone" = "global"; then
-    /usr/sbin/devfsadm -i vboxdrv

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

@@ -76 +76 @@
-            abort "## Failed to load VirtualBox kernel module."
-        elif test -c "/devices/pseudo/$MODNAME@0:$MODNAME"; then
-successfully 
+
-        else
-            abort "Aborting due to attach failure."