Changeset 9190 in vbox

Timestamp:

May 28, 2008 8:44:35 AM (16 years ago)

Author:

vboxsync

Message:

synced debian/, use vboxdrv and vboxnet from the Installer directory

Location:

trunk

Files:

• debian/VBox.sh (modified) (1 diff)
• debian/dirs (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• debian/preinst.in (modified) (1 diff)
• debian/rules (modified) (1 diff)
• debian/templates (modified) (1 diff)
• debian/vboxdrv.init.in (deleted)
• debian/vboxnet.init.in (deleted)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/vboxdrv.sh.in (modified) (3 diffs)

trunk/debian/VBox.sh

@@ -96 +96 @@
   VirtualBox)
     exec "/usr/lib/virtualbox-ose/VirtualBox" "$@"
-  ;;
+    ;;
   VBoxManage)
     exec "/usr/lib/virtualbox-ose/VBoxManage" "$@"
-  ;;
+    ;;
   VBoxSDL)
     exec "/usr/lib/virtualbox-ose/VBoxSDL" "$@"
-  ;;
+    ;;
   VBoxVRDP)
     exec "/usr/lib/virtualbox-ose/VBoxVRDP" "$@"
-  ;;
+    ;;
   VBoxHeadless)
     exec "/usr/lib/virtualbox-ose/VBoxHeadless" "$@"
-  ;;
+    ;;
   *)
     echo "Unknown application - $APP"
-  ;;
+    ;;
 esac

trunk/debian/dirs

@@ -2 +2 @@
 /etc/vbox
 /etc/init.d
+/usr/src
 /usr/lib/virtualbox-ose

trunk/debian/postinst

@@ -28 +28 @@
   rm /etc/init.d/virtualbox
   update-rc.d virtualbox remove >/dev/null
+fi
+if [ -f /etc/vbox/vbox.cfg ]; then
+  echo "Found old version of /etc/vbox/vbox.cfg, removing."
+  rm /etc/vbox/vbox.cfg
 fi
 

trunk/debian/preinst.in

@@ -32 +32 @@
 fi
 
+# check for old installation
+if [ -r /etc/vbox/vbox.cfg ]; then
+  . /etc/vbox/vbox.cfg
+  if [ "x$INSTALL_DIR" != "x" -a -d "$INSTALL_DIR" ]; then
+    db_fset virtualbox/old-installation-found seen false || true
+    db_input high virtualbox/old-installation-found || true
+    db_go || true
+    exit 1
+  fi
+  # we will remove that file in postinst
+fi
+
 # check for old vboxdrv modules
 if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then

trunk/debian/rules

@@ -202 +202 @@
         dh_installmenu
         $(if $(NOMODS),,dh_installmodules)
-        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g;' \
-            debian/vboxdrv.init.in > debian/vboxdrv.init
+        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g; s|%PACKAGE%|virtualbox-ose|g;' \
+            src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init
         sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge,$(debrel)),yes,)|g;' \
-            debian/vboxnet.init.in > debian/vboxnet.init
+            src/VBox/Installer/linux/vboxnet.sh.in > debian/vboxnet.init
         dh_installinit --name=vboxdrv
         dh_installinit --name=vboxnet

trunk/debian/templates

@@ -52 +52 @@
  merge all snapshots and saved states before you proceed because VM states are version
  specific.
+
+Template: virtualbox-ose/old-installation-found
+Type: note
+Description: Old installation found
+ An old installation of VirtualBox was found. To install this package the old package
+ has to be removed first. Have a look at /etc/vbox/vbox.cfg determine the installation
+ directory of the previous installation. After uninstalling the old package remove the file
+ /etc/vbox/vbox.cfg.

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

@@ -207 +207 @@
 
 $(PATH_TARGET)/vboxdrv.sh: vboxdrv.sh.in
-        $(QUIET)$(SED_EXT) -e "s|%NOLSB%|yes|g" $< > $@
+        $(QUIET)$(SED_EXT) -e "s|%NOLSB%|yes|g; s|%PACKAGE%|virtualbox|g" $< > $@
 
 $(PATH_TARGET)/vboxnet.sh: vboxnet.sh.in

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

@@ -41 +41 @@
     BUILDINTMP="$INSTALL_DIR/src/build_in_tmp"
 else
-    VBOXMANAGE="/usr/lib/virtualbox/VBoxManage"
-    BUILDINTMP="/usr/share/virtualbox/src/build_in_tmp"
+    VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage"
+    BUILDINTMP="/usr/share/%PACKAGE%/src/build_in_tmp"
 fi
 
@@ -55 +55 @@
 fi
 
-[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
+[ -r /etc/default/%PACKAGE% ] && . /etc/default/%PACKAGE%
 
 if [ -z "$NOLSB" ]; then
@@ -197 +197 @@
 }
 
-# enter the following variables in /etc/default/virtualbox:
+# enter the following variables in /etc/default/%PACKAGE%:
 #   SHUTDOWN_USERS="foo bar"  
 #     check for running VMs of user foo and user bar