Changeset 23889 in vbox for trunk/src/VBox/Installer

Timestamp:

Oct 19, 2009 8:58:07 PM (15 years ago)

Author:

vboxsync

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

53672

Message:

2nd try to fix r53634

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• vboxdrv.sh.in (modified) (2 diffs)

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

@@ -287 +287 @@
         $(QUIET)$(SED_EXT) \
                 -e "s|%NOLSB%|yes|g" \
+                -e "s|%DEBIAN%||g" \
                 -e "s|%PACKAGE%|virtualbox|g" \
                 --output $@ \

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -36 +36 @@
 LOG="/var/log/vbox-install.log"
 NOLSB=%NOLSB%
+DEBIAN=%DEBIAN%
 
 [ -f /lib/lsb/init-functions ] || NOLSB=yes
@@ -50 +51 @@
     BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxnetflt/build_in_tmp"
     BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxnetadp/build_in_tmp"
-    # silently exit if the package was uninstalled but not purged,
-    # applies to Debian packages only
-    [ -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 0
 fi
+
+# silently exit if the package was uninstalled but not purged,
+# applies to Debian packages only
+[ -n "$DEBIAN" -a -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 0
 
 if [ -n "$NOLSB" ]; then