Changeset 14436 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Nov 20, 2008 9:06:10 PM (16 years ago)

Author:

vboxsync

Message:

deb/rpm: fixed vboxnetflt module compilation

Location:

trunk/src/VBox/Installer/linux

Files:

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

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

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

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

@@ -32 +32 @@
 LOG="/var/log/vbox-install.log"
 NOLSB=%NOLSB%
-NETFLT=%NETFLT%
 
 [ -f /lib/lsb/init-functions ] || NOLSB=yes
@@ -183 +182 @@
         failure "Cannot change owner $GROUPNAME for device $DEVICE"
     fi
-    if [ -n "$NETFLT" ]; then
-        if ! modprobe vboxnetflt > /dev/null 2>&1; then
-            failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
-        fi
+    if ! modprobe vboxnetflt > /dev/null 2>&1; then
+        failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why"
     fi
     succ_msg
@@ -276 +273 @@
         failure "Look at $LOG to find out what went wrong"
     fi
-    if [ -n "$NETFLT" ]; then
-        if ! $BUILDVBOXNETFLT \
-            --use-module-symvers /tmp/vboxdrv-Module.symvers \
-            --no-print-directory install >> $LOG 2>&1; then
-            failure "Look at $LOG to find out what went wrong"
-        fi
+    if ! $BUILDVBOXNETFLT \
+        --use-module-symvers /tmp/vboxdrv-Module.symvers \
+        --no-print-directory install >> $LOG 2>&1; then
+        failure "Look at $LOG to find out what went wrong"
     fi
     succ_msg