Changeset 11962 in vbox for trunk

Timestamp:

Sep 2, 2008 8:16:19 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/vbi-installer: modunload vbi on un-install just in case the VBox installation didn't do it for some reason.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• vbi/makepackage.sh (modified) (1 diff)
• vbi/preremove.sh (added)

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

@@ -409 +409 @@
                 vbi/vboxkern.pkginfo \
                 vbi/makepackage.sh \
+                vbi/preremove.sh \
                 Makefile.kmk \
                 $(PATH_ROOT)/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi \
@@ -426 +427 @@
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_VBI_DIR)/vbox.copyright)
         $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/vbi/makepackage.sh                                           $(SOLARIS_VBI_DIR)/makepackage.sh
+        $(QUIET)$(INSTALL) -m 0755 $(PATH_CURRENT)/vbi/preremove.sh                                             $(SOLARIS_VBI_DIR)/preremove.sh
         $(call MSG_L1,Creating install package: $(VBIPKG_FILENAME).pkg)
         $(QUIET)$(SOLARIS_VBI_DIR)/makepackage.sh $(SOLARIS_VBI_DIR) $(VBIPKG_FILENAME)

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

@@ -54 +54 @@
 cd "$1"
 echo 'i pkginfo=./vboxkern.pkginfo' > prototype
+echo 'i preremove=./preremove.sh' >> prototype
 if test -f "./vbox.copyright"; then
     echo 'i copyright=./vbox.copyright' >> prototype
 fi
-find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vboxkern.pkginfo|vbox.copyright' | pkgproto >> prototype
+find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|preremove.sh|vboxkern.pkginfo|vbox.copyright' | pkgproto >> prototype
 
 $VBOX_AWK 'NF == 6 && $2 == "none" { $5 = "root"; $6 = "sys" } { print }' prototype > prototype2