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

Timestamp:

Dec 2, 2010 12:35:37 PM (14 years ago)

Author:

vboxsync

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

68403

Message:

Linux deb/rpm: more fixes

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/postrm (modified) (1 diff)
• debian/prerm.in (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• vboxweb-service.sh.in (modified) (1 diff)

trunk/src/VBox/Installer/linux/debian/postrm

@@ -27 +27 @@
   update-rc.d vboxnet remove >/dev/null || exit $?
 fi
+if [ "$1" = "purge" -a ! -f /etc/init.d/vboxweb-service ] ; then
+  update-rc.d vboxweb-service remove >/dev/null || exit $?
+fi
 
 #DEBHELPER#

trunk/src/VBox/Installer/linux/debian/prerm.in

@@ -23 +23 @@
 rm -f /etc/vbox/license_agreed
 rm -f /etc/vbox/module_not_compiled
+
+# remove our USB device tree
+rm -rf /dev/vboxusb 2> /dev/null
 
 # defaults
@@ -62 +65 @@
 fi
 
-# Stop vboxnet/vboxdrv manually as we use our own error handling in postrm
+# stop vboxnet/vboxdrv manually as we use our own error handling in postrm
 if [ -x "/etc/init.d/vboxdrv" ]; then
   if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then

trunk/src/VBox/Installer/linux/debian/rules

@@ -294 +294 @@
             usr/share/virtualbox/src/vboxhost   usr/src/vboxhost-$(ver)
         dh_desktop
-        dh_installmenu
         $(if $(NOMODS),,dh_installmodules)
         sed \

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -385 +385 @@
   rm -f /etc/vbox/license_agreed
   rm -f /etc/vbox/module_not_compiled
+  # remove our USB device tree
+  rm -rf /dev/vboxusb 2> /dev/null
 fi
 DKMS=`which dkms 2>/dev/null`

trunk/src/VBox/Installer/linux/vboxweb-service.sh.in

@@ -354 +354 @@
     restart
     ;;
+force-reload)
+    restart
+    ;;
 status)
     status