diff -u virtualbox-ose-3.2.8-dfsg/debian/README.source virtualbox-ose-3.2.8-dfsg/debian/README.source --- virtualbox-ose-3.2.8-dfsg/debian/README.source +++ virtualbox-ose-3.2.8-dfsg/debian/README.source @@ -26,0 +27,16 @@ + + +Generating manpages +=================== + +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxHeadless | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxHeadless.1 +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxManage | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxManage.1 +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxSDL | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxSDL.1 +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info --no-discard-stderr vboxwebsrv | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > vboxwebsrv.1 +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VirtualBox | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VirtualBox.1 +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --help-option="-help" --no-info --no-discard-stderr vdfuse | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > vdfuse.1 + +help2man --section=1 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxClient | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxClient.1 +help2man --section=8 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxService | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxService.8 +help2man --section=8 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info VBoxControl | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > VBoxControl.8 +help2man --section=8 --name="x86 virtualization solution" --version-string="VERSION_STRING" --no-info mount.vboxsf | sed -r 's/( VERSION_STRING|( Version)? [0-9]\.[0-9]\.[0-9]_OSE)//g' > mount.vboxsf.8 diff -u virtualbox-ose-3.2.8-dfsg/debian/changelog virtualbox-ose-3.2.8-dfsg/debian/changelog --- virtualbox-ose-3.2.8-dfsg/debian/changelog +++ virtualbox-ose-3.2.8-dfsg/debian/changelog @@ -1,3 +1,30 @@ +virtualbox-ose (3.2.8-dfsg-2ubuntu1) maverick; urgency=low + + * Merge from Debian unstable (LP: #637320), remaining changes: + - VirtualBox should go in Accessories, not in System tools. (LP: #288590) + - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop + - Add Apport hook. + - debian/virtualbox-ose.files/source_virtualbox-ose.py + - debian/virtualbox-ose.install + - Drop *-source packages. + + -- Felix Geyer Mon, 13 Sep 2010 17:48:14 +0200 + +virtualbox-ose (3.2.8-dfsg-2) unstable; urgency=high + + * Fix FTBFS with recent libdrm-dev versions. (Closes: #594599) + * Make the kernel modules buildable with kernel 2.6.36. + (Closes: #594602; LP: #619497) + - Add 25-vboxnetadp_kernel_2.6.36.patch + - Add 26-vboxsf_kernel_2.6.36.patch + * Silently enable the host I/O cache when the image is on an ext4/XFS + partition. No need to warn users about it. (Closes: #595050) + - Add 27-hide-host-cache-warning.patch + * Recompiled to fix incorrectly generated dependencies. (Closes: #595715) + * Add man pages for all commands. (Closes: #440609; LP: #610895) + + -- Felix Geyer Mon, 13 Sep 2010 11:29:12 +0200 + virtualbox-ose (3.2.8-dfsg-1ubuntu1) maverick; urgency=low * Merge from Debian unstable (LP: #618934), remaining changes: diff -u virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose.links virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose.links --- virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose.links +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose.links @@ -7,0 +8,4 @@ + +/usr/share/man/man1/VBoxHeadless.1 /usr/share/man/man1/vboxheadless.1 +/usr/share/man/man1/VBoxManage.1 /usr/share/man/man1/vboxmanage.1 +/usr/share/man/man1/VBoxSDL.1 /usr/share/man/man1/vboxsdl.1 diff -u virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-qt.links virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-qt.links --- virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-qt.links +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-qt.links @@ -4,0 +5,2 @@ + +/usr/share/man/man1/VirtualBox.1 /usr/share/man/man1/virtualbox.1 diff -u virtualbox-ose-3.2.8-dfsg/debian/patches/series virtualbox-ose-3.2.8-dfsg/debian/patches/series --- virtualbox-ose-3.2.8-dfsg/debian/patches/series +++ virtualbox-ose-3.2.8-dfsg/debian/patches/series @@ -11,0 +12,3 @@ +25-vboxnetadp_kernel_2.6.36.patch +26-vboxsf_kernel_2.6.36.patch +27-hide-host-cache-warning.patch diff -u virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch --- virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch +++ virtualbox-ose-3.2.8-dfsg/debian/patches/18-system-xorg.patch @@ -4,7 +4,7 @@ diff -urNad virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/common/crOpenGL/Makefile.kmk virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk --- virtualbox-ose-3.1.0-dfsg~/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2009-10-07 11:27:13.000000000 +0200 +++ virtualbox-ose-3.1.0-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2009-10-07 13:44:19.145463290 +0200 -@@ -63,16 +63,11 @@ +@@ -63,16 +63,12 @@ VBoxOGL_INCS = . if1of ($(KBUILD_TARGET), linux solaris freebsd) VBoxOGL_INCS += \ @@ -21,7 +21,8 @@ + /usr/include/pixman-1 \ $(VBOX_MESA_INCS) \ - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 -+ /usr/include/drm ++ /usr/include/drm \ ++ /usr/include/libdrm VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif @@ -217,7 +218,7 @@ vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -261,6 +252,21 @@ +@@ -261,6 +252,22 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) @@ -227,7 +228,8 @@ + /usr/include/x11 \ + /usr/include/pixman-1 \ + /usr/include/X11/dri \ -+ /usr/include/drm ++ /usr/include/drm \ ++ /usr/include/libdrm +DLLS += vboxvideo_drv_$(XSERVER_VERSION) + +# required for lenny backports only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/virtualbox-ose-fuse.manpages +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-fuse.manpages @@ -0,0 +1 @@ +debian/manpages/vdfuse.1 only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/virtualbox-ose.manpages +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose.manpages @@ -0,0 +1,4 @@ +debian/manpages/VBoxHeadless.1 +debian/manpages/VBoxManage.1 +debian/manpages/VBoxSDL.1 +debian/manpages/vboxwebsrv.1 only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/virtualbox-ose-guest-utils.manpages +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-guest-utils.manpages @@ -0,0 +1,3 @@ +debian/manpages/VBoxService.8 +debian/manpages/VBoxControl.8 +debian/manpages/mount.vboxsf.8 only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/virtualbox-ose-guest-x11.manpages +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-guest-x11.manpages @@ -0,0 +1 @@ +debian/manpages/VBoxClient.1 only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/virtualbox-ose-qt.manpages +++ virtualbox-ose-3.2.8-dfsg/debian/virtualbox-ose-qt.manpages @@ -0,0 +1 @@ +debian/manpages/VirtualBox.1 only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/patches/27-hide-host-cache-warning.patch +++ virtualbox-ose-3.2.8-dfsg/debian/patches/27-hide-host-cache-warning.patch @@ -0,0 +1,45 @@ +Description: Silently enable the host I/O cache when the image is on an ext4/XFS partition. + No need to warn users about it. +Author: Felix Geyer + +diff --git a/src/VBox/Main/ConsoleImpl2.cpp b/src/VBox/Main/ConsoleImpl2.cpp +--- a/src/VBox/Main/ConsoleImpl2.cpp ++++ b/src/VBox/Main/ConsoleImpl2.cpp +@@ -2533,18 +2533,6 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, + && ( enmFsTypeFile == RTFSTYPE_EXT4 + || enmFsTypeFile == RTFSTYPE_XFS)) + { +- setVMRuntimeErrorCallbackF(pVM, this, 0, +- "Ext4PartitionDetected", +- N_("The host I/O cache for at least one controller is disabled " +- "and the medium '%ls' for this VM " +- "is located on an %s partition. There is a known Linux " +- "kernel bug which can lead to the corruption of the virtual " +- "disk image under these conditions.\n" +- "Either enable the host I/O cache permanently in the VM " +- "settings or put the disk image and the snapshot folder " +- "onto a different file system.\n" +- "The host I/O cache will now be enabled for this medium"), +- strFile.raw(), enmFsTypeFile == RTFSTYPE_EXT4 ? "ext4" : "xfs"); + fUseHostIOCache = true; + } + else if ( (uCaps & MediumFormatCapabilities_Asynchronous) +@@ -2553,18 +2541,6 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, + || enmFsTypeSnap == RTFSTYPE_XFS) + && !mfSnapshotFolderExt4WarningShown) + { +- setVMRuntimeErrorCallbackF(pVM, this, 0, +- "Ext4PartitionDetected", +- N_("The host I/O cache for at least one controller is disabled " +- "and the snapshot folder for this VM " +- "is located on an %s partition. There is a known Linux " +- "kernel bug which can lead to the corruption of the virtual " +- "disk image under these conditions.\n" +- "Either enable the host I/O cache permanently in the VM " +- "settings or put the disk image and the snapshot folder " +- "onto a different file system.\n" +- "The host I/O cache will now be enabled for this medium"), +- enmFsTypeSnap == RTFSTYPE_EXT4 ? "ext4" : "xfs"); + fUseHostIOCache = true; + mfSnapshotFolderExt4WarningShown = true; + } only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/patches/25-vboxnetadp_kernel_2.6.36.patch +++ virtualbox-ose-3.2.8-dfsg/debian/patches/25-vboxnetadp_kernel_2.6.36.patch @@ -0,0 +1,45 @@ +Description: Add support for kernel 2.6.36 +Origin: upstream, http://vbox.innotek.de/pipermail/vbox-dev/2010-August/003143.html + +--- virtualbox-ose-3.2.8-dfsg.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (revision 64881) ++++ virtualbox-ose-3.2.8-dfsg/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c (revision 64882) +@@ -60,7 +60,12 @@ + + static int VBoxNetAdpLinuxOpen(struct inode *pInode, struct file *pFilp); + static int VBoxNetAdpLinuxClose(struct inode *pInode, struct file *pFilp); +-static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp, unsigned int uCmd, unsigned long ulArg); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) ++static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp, ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ ++static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp, ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ ++ unsigned int uCmd, unsigned long ulArg); + + /******************************************************************************* + * Global Variables * +@@ -83,7 +88,11 @@ + owner: THIS_MODULE, + open: VBoxNetAdpLinuxOpen, + release: VBoxNetAdpLinuxClose, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + ioctl: VBoxNetAdpLinuxIOCtl, ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ ++ unlocked_ioctl: VBoxNetAdpLinuxIOCtlUnlocked, ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ + }; + + /** The miscdevice structure. */ +@@ -246,7 +255,12 @@ + * @param uCmd The function specified to ioctl(). + * @param ulArg The argument specified to ioctl(). + */ +-static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp, unsigned int uCmd, unsigned long ulArg) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) ++static int VBoxNetAdpLinuxIOCtl(struct inode *pInode, struct file *pFilp, ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ ++static long VBoxNetAdpLinuxIOCtlUnlocked(struct file *pFilp, ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) */ ++ unsigned int uCmd, unsigned long ulArg) + { + VBOXNETADPREQ Req; + PVBOXNETADP pAdp; only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/patches/26-vboxsf_kernel_2.6.36.patch +++ virtualbox-ose-3.2.8-dfsg/debian/patches/26-vboxsf_kernel_2.6.36.patch @@ -0,0 +1,53 @@ +Description: Add support for kernel 2.6.36 +Origin: upstream, http://vbox.innotek.de/pipermail/vbox-dev/2010-August/003143.html + +--- virtualbox-ose-3.2.8-dfsg.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 64881) ++++ virtualbox-ose-3.2.8-dfsg/src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 64882) +@@ -337,6 +337,7 @@ + } + #endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + /* this is called when vfs is about to destroy the [inode]. all + resources associated with this [inode] must be cleared here */ + static void +@@ -355,7 +356,27 @@ + kfree(sf_i); + SET_INODE_INFO(inode, NULL); + } ++#else ++static void ++sf_evict_inode(struct inode *inode) ++{ ++ struct sf_inode_info *sf_i; + ++ TRACE(); ++ truncate_inode_pages(&inode->i_data, 0); ++ end_writeback(inode); ++ ++ sf_i = GET_INODE_INFO(inode); ++ if (!sf_i) ++ return; ++ ++ BUG_ON(!sf_i->path); ++ kfree(sf_i->path); ++ kfree(sf_i); ++ SET_INODE_INFO(inode, NULL); ++} ++#endif ++ + /* this is called by vfs when it wants to populate [inode] with data. + the only thing that is known about inode at this point is its index + hence we can't do anything here, and let lookup/whatever with the +@@ -403,7 +424,11 @@ + } + + static struct super_operations sf_super_ops = { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) + .clear_inode = sf_clear_inode, ++#else ++ .evict_inode = sf_evict_inode, ++#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) + .read_inode = sf_read_inode, + #endif only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VBoxService.8 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VBoxService.8 @@ -0,0 +1,101 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXSERVICE "8" "September 2010" "VBoxService" "System Administration Utilities" +.SH NAME +VBoxService \- x86 virtualization solution +.SH DESCRIPTION +.SS "Usage:" +.TP +VBoxService +[\-f|\-\-foreground] [\-v|\-\-verbose] [\-i|\-\-interval ] +[\-\-disable\-] [\-\-enable\-] [\-h|\-?|\-\-help] +[\-\-control\-interval ] +[\-\-timesync\-interval ] [\-\-timesync\-min\-adjust ] +[\-\-timesync\-latency\-factor ] [\-\-timesync\-max\-latency ] +[\-\-timesync\-set\-threshold ] [\-\-timesync\-set\-start] +[\-\-vminfo\-interval ] +.SH OPTIONS +.TP +\fB\-i\fR | \fB\-\-interval\fR +The default interval. +.TP +\fB\-f\fR | \fB\-\-foreground\fR +Don't daemonzie the program. For debugging. +.TP +\fB\-v\fR | \fB\-\-verbose\fR +Increment the verbosity level. For debugging. +.TP +\fB\-h\fR | \-? | \fB\-\-help\fR +Show this message and exit with status 1. +.SS "Service-specific options:" +.TP +\fB\-\-enable\-control\fR +Enables the control service. (default) +.TP +\fB\-\-disable\-control\fR +Disables the control service. +.TP +\fB\-\-control\-interval\fR +Specifies the interval at which to check for +new control commands. The default is 1000 ms. +.TP +\fB\-\-enable\-timesync\fR +Enables the timesync service. (default) +.TP +\fB\-\-disable\-timesync\fR +Disables the timesync service. +.TP +\fB\-\-timesync\-interval\fR +Specifies the interval at which to synchronize the +time with the host. The default is 10000 ms. +.TP +\fB\-\-timesync\-min\-adjust\fR +The minimum absolute drift value measured in +milliseconds to make adjustments for. +The default is 1000 ms on OS/2 and 100 ms elsewhere. +.TP +\fB\-\-timesync\-latency\-factor\fR +The factor to multiply the time query latency with +to calculate the dynamic minimum adjust time. +The default is 8 times. +.TP +\fB\-\-timesync\-max\-latency\fR +The max host timer query latency to accept. +The default is 250 ms. +.TP +\fB\-\-timesync\-set\-threshold\fR +The absolute drift threshold, given as milliseconds, +where to start setting the time instead of trying to +adjust it. The default is 20 min. +.TP +\fB\-\-timesync\-set\-start\fR +Set the time when starting the time sync service. +.TP +\fB\-\-enable\-vminfo\fR +Enables the vminfo service. (default) +.TP +\fB\-\-disable\-vminfo\fR +Disables the vminfo service. +.TP +\fB\-\-vminfo\-interval\fR +Specifies the interval at which to retrieve the +VM information. The default is 10000 ms. +.TP +\fB\-\-enable\-cpuhotplug\fR +Enables the cpuhotplug service. (default) +.TP +\fB\-\-disable\-cpuhotplug\fR +Disables the cpuhotplug service. +.TP +\fB\-\-enable\-memballoon\fR +Enables the memballoon service. (default) +.TP +\fB\-\-disable\-memballoon\fR +Disables the memballoon service. +.TP +\fB\-\-enable\-vmstats\fR +Enables the vmstats service. (default) +.TP +\fB\-\-disable\-vmstats\fR +Disables the vmstats service. +.IP +Copyright (C) 2009\-2010 Oracle Corporation only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VBoxSDL.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VBoxSDL.1 @@ -0,0 +1,95 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXSDL "1" "September 2010" "VBoxSDL" "User Commands" +.SH NAME +VBoxSDL \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox SDL GUI version +(C) 2005\-2010 Oracle Corporation +All rights reserved. +.SS "Usage:" +.TP +\fB\-\-startvm\fR +Virtual machine to start, either UUID or name +.TP +\fB\-\-hda\fR +Set temporary first hard disk to file +.TP +\fB\-\-fda\fR +Set temporary first floppy disk to file +.TP +\fB\-\-cdrom\fR +Set temporary CDROM/DVD to file/device ('none' to unmount) +.TP +\fB\-\-boot\fR +Set temporary boot device (a = floppy, c = 1st HD, d = DVD, n = network) +.TP +\fB\-\-memory\fR +Set temporary memory size in megabytes +.TP +\fB\-\-vram\fR +Set temporary size of video memory in megabytes +.TP +\fB\-\-fullscreen\fR +Start VM in fullscreen mode +.TP +\fB\-\-fullscreenresize\fR +Resize the guest on fullscreen +.HP +\fB\-\-fixedmode\fR Use a fixed SDL video mode with given width, height and bits per pixel +.TP +\fB\-\-nofstoggle\fR +Forbid switching to/from fullscreen mode +.TP +\fB\-\-noresize\fR +Make the SDL frame non resizable +.TP +\fB\-\-nohostkey\fR +Disable all hostkey combinations +.TP +\fB\-\-nohostkeys\fR ... +Disable specific hostkey combinations, see below for valid keys +.TP +\fB\-\-nograbonclick\fR +Disable mouse/keyboard grabbing on mouse click w/o additions +.TP +\fB\-\-detecthostkey\fR +Get the hostkey identifier and modifier state +.HP +\fB\-\-hostkey\fR {} Set the host key to the values obtained using \fB\-\-detecthostkey\fR +.TP +\fB\-\-termacpi\fR +Send an ACPI power button event when closing the window +.TP +\fB\-\-discardstate\fR +Discard saved state (if present) and revert to last snapshot (if present) +.TP +\fB\-\-[no]rawr0\fR +Enable or disable raw ring 3 +.TP +\fB\-\-[no]rawr3\fR +Enable or disable raw ring 0 +.TP +\fB\-\-[no]patm\fR +Enable or disable PATM +.TP +\fB\-\-[no]csam\fR +Enable or disable CSAM +.TP +\fB\-\-[no]hwvirtex\fR +Permit or deny the usage of VT\-x/AMD\-V +.SS "Key bindings:" +.TP + + +f Switch to full screen / restore to previous view +h Press ACPI power button +n Take a snapshot and continue execution +p Pause / resume execution +q Power off +r VM reset +s Save state and power off +.TP + +Send +.TP +... +Send only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VBoxClient.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VBoxClient.1 @@ -0,0 +1,24 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXCLIENT "1" "September 2010" "VBoxClient" "User Commands" +.SH NAME +VBoxClient \- x86 virtualization solution +.SH SYNOPSIS +.B VBoxClient +\fI--clipboard|--display|--checkhostversion|--seamless \fR[\fI-d|--nodaemon\fR] +.SH DESCRIPTION +Start the VirtualBox X Window System guest services. +.SH OPTIONS +.TP +\fB\-\-clipboard\fR +start the shared clipboard service +.TP +\fB\-\-display\fR +start the display management service +.HP +\fB\-\-checkhostversion\fR start the host version notifier service +.TP +\fB\-\-seamless\fR +start the seamless windows service +.TP +\fB\-d\fR, \fB\-\-nodaemon\fR +continue running as a system service only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VBoxManage.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VBoxManage.1 @@ -0,0 +1,436 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXMANAGE "1" "September 2010" "VBoxManage" "User Commands" +.SH NAME +VBoxManage \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Command Line Management Interface +(C) 2005\-2010 Oracle Corporation +All rights reserved. +.PP +Usage: +.PP +VBoxManage [\-v|\-\-version] print version number and exit +VBoxManage [\-q|\-\-nologo] ... suppress the logo +.PP +VBoxManage list [\-\-long|\-l] vms|runningvms|ostypes|hostdvds|hostfloppies| +.IP +bridgedifs|hostonlyifs|dhcpservers|hostinfo| +hostcpuids|hddbackends|hdds|dvds|floppies| +usbhost|usbfilters|systemproperties +.PP +VBoxManage showvminfo | [\-\-details] [\-\-statistics] +.IP +[\-\-machinereadable] +.PP +VBoxManage showvminfo | \fB\-\-log\fR +.PP +VBoxManage registervm +.PP +VBoxManage unregistervm | [\-\-delete] +.PP +VBoxManage createvm \fB\-\-name\fR +.IP +[\-\-ostype ] +[\-\-register] +[\-\-basefolder | \fB\-\-settingsfile\fR ] +[\-\-uuid ] +.PP +VBoxManage modifyvm +.IP +[\-\-name ] +[\-\-ostype ] +[\-\-memory ] +[\-\-pagefusion on|off] +[\-\-vram ] +[\-\-acpi on|off] +[\-\-ioapic on|off] +[\-\-pae on|off] +[\-\-hpet on|off] +[\-\-hwvirtex on|off] +[\-\-nestedpaging on|off] +[\-\-largepages on|off] +[\-\-vtxvpid on|off] +[\-\-synthcpu on|off] +[\-\-cpuidset ] +[\-\-cpuidremove ] +[\-\-cpuidremoveall] +[\-\-hardwareuuid ] +[\-\-cpus ] +[\-\-cpuhotplug on|off] +[\-\-plugcpu ] +[\-\-unplugcpu ] +[\-\-rtcuseutc on|off] +[\-\-monitorcount ] +[\-\-accelerate3d on|off] +[\-\-accelerate2dvideo on|off] +[\-\-firmware bios|efi|efi32|efi64] +[\-\-bioslogofadein on|off] +[\-\-bioslogofadeout on|off] +[\-\-bioslogodisplaytime ] +[\-\-bioslogoimagepath ] +[\-\-biosbootmenu disabled|menuonly|messageandmenu] +[\-\-biossystemtimeoffset ] +[\-\-biospxedebug on|off] +[\-\-boot<1\-4> none|floppy|dvd|disk|net>] +[\-\-nic<1\-N> none|null|nat|bridged|intnet|hostonly| +.IP +vde] +.IP +[\-\-nictype<1\-N> Am79C970A|Am79C973| +.IP +82540EM|82543GC|82545EM| +virtio] +.IP +[\-\-cableconnected<1\-N> on|off] +[\-\-nictrace<1\-N> on|off] +[\-\-nictracefile<1\-N> ] +[\-\-nicspeed<1\-N> ] +[\-\-nicbootprio<1\-N> ] +[\-\-bridgeadapter<1\-N> none|] +[\-\-hostonlyadapter<1\-N> none|] +[\-\-intnet<1\-N> ] +[\-\-natnet<1\-N> |default] +[\-\-vdenet<1\-N> |default] +[\-\-natsettings<1\-N> [],[], +.IP +[],[], +[]] +.IP +[\-\-natpf<1\-N> [],tcp|udp,[], +.IP +,[],] +.IP +[\-\-natpf<1\-N> delete ] +[\-\-nattftpprefix<1\-N> ] +[\-\-nattftpfile<1\-N> ] +[\-\-nattftpserver<1\-N> ] +[\-\-natdnspassdomain<1\-N> on|off] +[\-\-natdnsproxy<1\-N> on|off] +[\-\-natdnshostresolver<1\-N> on|off] +[\-\-nataliasmode<1\-N> default|[log],[proxyonly], +.IP +[sameports]] +.IP +[\-\-macaddress<1\-N> auto|] +[\-\-mouse ps2|usb|usbtablet +[\-\-keyboard ps2|usb +[\-\-uart<1\-N> off| ] +[\-\-uartmode<1\-N> disconnected| +.IP +server | +client | +file | +] +.IP +[\-\-guestmemoryballoon ] +[\-\-gueststatisticsinterval ] +[\-\-audio none|null|oss|alsa|pulse] +[\-\-audiocontroller ac97|sb16] +[\-\-clipboard disabled|hosttoguest|guesttohost| +.IP +bidirectional] +.IP +[\-\-usb on|off] +[\-\-usbehci on|off] +[\-\-snapshotfolder default|] +[\-\-teleporter on|off] +[\-\-teleporterport ] +[\-\-teleporteraddress +[\-\-teleporterpassword ] +.PP +VBoxManage import [\-\-dry\-run|\-n] [more options] +.IP +(run with \fB\-n\fR to have options displayed +.IP +for a particular OVF) +.PP +VBoxManage export \fB\-\-output\fR|\-o +.IP +[\-\-legacy09] +[\-\-vsys ] +.IP +[\-\-product ] +[\-\-producturl ] +[\-\-vendor ] +[\-\-vendorurl ] +[\-\-version ] +[\-\-eula ] +[\-\-eulafile ] +.PP +VBoxManage startvm | +.IP +[\-\-type gui|sdl|headless] +.PP +VBoxManage controlvm | +.IP +pause|resume|reset|poweroff|savestate| +acpipowerbutton|acpisleepbutton| +keyboardputscancode [ ...]| +injectnmi| +setlinkstate<1\-N> on|off | +nic<1\-N> null|nat|bridged|intnet|hostonly +.IP +[] | +.IP +nictrace<1\-N> on|off +nictracefile<1\-N> +guestmemoryballoon ] +gueststatisticsinterval ] +usbattach |
| +usbdetach |
| +setvideomodehint [display] | +setcredentials +.IP +[\-\-allowlocallogon ] | +.IP +teleport \fB\-\-host\fR \fB\-\-port\fR +.IP +[\-\-maxdowntime ] [\-\-password password] +.IP +plugcpu +unplugcpu +.PP +VBoxManage discardstate | +.PP +VBoxManage adoptstate | +.PP +VBoxManage snapshot | +.IP +take [\-\-description ] [\-\-pause] | +delete | | +restore | | +restorecurrent | +edit ||\-\-current +.IP +[\-\-name ] +[\-\-description ] | +.IP +showvminfo | +.PP +VBoxManage openmedium disk|dvd|floppy +.IP +[\-\-type normal|immutable|writethrough| +.IP +shareable] (disk only) +.IP +[\-\-uuid ] +[\-\-parentuuid ] (disk only) +.PP +VBoxManage closemedium disk|dvd|floppy | +.IP +[\-\-delete] +.PP +VBoxManage storageattach +.IP +\fB\-\-storagectl\fR +\fB\-\-port\fR +\fB\-\-device\fR +[\-\-type dvddrive|hdd|fdd] +[\-\-medium none|emptydrive| +.IP +||host:] +.IP +[\-\-passthrough on|off] +[\-\-forceunmount] +.PP +VBoxManage storagectl +.IP +\fB\-\-name\fR +[\-\-add ide|sata|scsi|floppy|sas] +[\-\-controller LSILogic|LSILogicSAS|BusLogic| +.IP +IntelAHCI|PIIX3|PIIX4|ICH6|I82078] +.IP +[\-\-sataideemulation<1\-4> <1\-30>] +[\-\-sataportcount <1\-30>] +[\-\-hostiocache on|off] +[\-\-remove] +.PP +VBoxManage showhdinfo | +.PP +VBoxManage createhd \fB\-\-filename\fR +.IP +\fB\-\-size\fR +[\-\-format VDI|VMDK|VHD] (default: VDI) +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +[\-\-type normal|writethrough| +.IP +shareable] (default: normal) +.IP +[\-\-comment ] +[\-\-remember] +.PP +VBoxManage modifyhd | +.IP +[\-\-type normal|writethrough|immutable|shareable] +[\-\-autoreset on|off] +[\-\-compact] +.PP +VBoxManage clonehd | +.IP +[\-\-format VDI|VMDK|VHD|RAW|] +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +[\-\-type normal|writethrough|immutable|shareable] +[\-\-remember] [\-\-existing] +.PP +VBoxManage convertfromraw +.IP +[\-\-format VDI|VMDK|VHD] +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +.PP +VBoxManage convertfromraw stdin +.IP +[\-\-format VDI|VMDK|VHD] +[\-\-variant Standard,Fixed,Split2G,Stream,ESX] +.PP +VBoxManage addiscsidisk \fB\-\-server\fR | +.IP +\fB\-\-target\fR +[\-\-port ] +[\-\-lun ] +[\-\-encodedlun ] +[\-\-username ] +[\-\-password ] +[\-\-type normal|writethrough|immutable|shareable] +[\-\-intnet] +.PP +VBoxManage getextradata global|| +.IP +|enumerate +.PP +VBoxManage setextradata global|| +.IP + +[] (no value deletes key) +.PP +VBoxManage setproperty hdfolder default| | +.IP +machinefolder default| | +vrdpauthlibrary default| | +websrvauthlibrary default|null| | +loghistorycount +.PP +VBoxManage usbfilter add +.IP +\fB\-\-target\fR ||global +\fB\-\-name\fR +\fB\-\-action\fR ignore|hold (global filters only) +[\-\-active yes|no] (yes) +[\-\-vendorid ] (null) +[\-\-productid ] (null) +[\-\-revision ] (null) +[\-\-manufacturer ] (null) +[\-\-product ] (null) +[\-\-remote yes|no] (null, VM filters only) +[\-\-serialnumber ] (null) +[\-\-maskedinterfaces ] +.PP +VBoxManage usbfilter modify +.IP +\fB\-\-target\fR ||global +[\-\-name ] +[\-\-action ignore|hold] (global filters only) +[\-\-active yes|no] +[\-\-vendorid |""] +[\-\-productid |""] +[\-\-revision |""] +[\-\-manufacturer |""] +[\-\-product |""] +[\-\-remote yes|no] (null, VM filters only) +[\-\-serialnumber |""] +[\-\-maskedinterfaces ] +.PP +VBoxManage usbfilter remove +.IP +\fB\-\-target\fR ||global +.PP +VBoxManage sharedfolder add | +.IP +\fB\-\-name\fR \fB\-\-hostpath\fR +[\-\-transient] [\-\-readonly] +.PP +VBoxManage sharedfolder remove | +.IP +\fB\-\-name\fR [\-\-transient] +.PP +VBoxManage vmstatistics | [\-\-reset] +.IP +[\-\-pattern ] [\-\-descriptions] +.PP +VBoxManage guestproperty get | +.IP + [\-\-verbose] +.PP +VBoxManage guestproperty set | +.IP + [ [\-\-flags ]] +.PP +VBoxManage guestproperty enumerate | +.IP +[\-\-patterns ] +.PP +VBoxManage guestproperty wait | +.IP +[\-\-timeout ] [\-\-fail\-on\-timeout] +.PP +VBoxManage guestcontrol execute | +.IP + +\fB\-\-username\fR \fB\-\-password\fR +[\-\-arguments ""] +[\-\-environment "= [=]"] +[\-\-flags ] [\-\-timeout ] +[\-\-verbose] [\-\-wait\-for exit,stdout,stderr||] +.PP +VBoxManage metrics list [*|host| []] +.IP +(comma\-separated) +.PP +VBoxManage metrics setup +.IP +[\-\-period ] (default: 1) +[\-\-samples ] (default: 1) +[\-\-list] +[*|host| []] +.PP +VBoxManage metrics query [*|host| []] +.PP +VBoxManage metrics enable +.IP +[\-\-list] +[*|host| []] +.PP +VBoxManage metrics disable +.IP +[\-\-list] +[*|host| []] +.PP +VBoxManage metrics collect +.IP +[\-\-period ] (default: 1) +[\-\-samples ] (default: 1) +[\-\-list] +[\-\-detach] +[*|host| []] +.PP +VBoxManage hostonlyif ipconfig +.IP +[\-\-dhcp | +\fB\-\-ip\fR [\-\-netmask (def: 255.255.255.0)] | +\fB\-\-ipv6\fR [\-\-netmasklengthv6 (def: 64)]] +.PP +VBoxManage dhcpserver add|modify \fB\-\-netname\fR | +.IP +\fB\-\-ifname\fR +.IP +[\-\-ip +.IP +\fB\-\-netmask\fR +\fB\-\-lowerip\fR +\fB\-\-upperip\fR ] +.IP +[\-\-enable | \fB\-\-disable]\fR +.PP +VBoxManage dhcpserver remove \fB\-\-netname\fR | +.IP +\fB\-\-ifname\fR only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/mount.vboxsf.8 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/mount.vboxsf.8 @@ -0,0 +1,61 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH MOUNT.VBOXSF "8" "September 2010" "mount.vboxsf" "System Administration Utilities" +.SH NAME +mount.vboxsf \- x86 virtualization solution +.SH SYNOPSIS +.B mount.vboxsf +[\fIOPTIONS\fR] \fINAME MOUNTPOINT\fR +.SH DESCRIPTION +Mount the VirtualBox shared folder NAME from the host system to MOUNTPOINT. +.TP +\fB\-w\fR +mount the shared folder writably (the default) +.TP +\fB\-r\fR +mount the shared folder read\-only +.TP +\fB\-n\fR +do not create an mtab entry +.HP +\fB\-o\fR OPTION[,OPTION...] use the mount options specified +.SS "Available mount options are:" +.TP +rw +mount writably (the default) +.TP +ro +mount read only +.TP +uid=UID +set the default file owner user id to UID +.TP +gid=GID +set the default file owner group id to GID +.TP +ttl=TTL +set the "time to live" to TID for the dentry +.TP +dmode=MODE +override the mode of all directories to (octal) MODE +.TP +fmode=MODE +override the mode of all regular files to (octal) MODE +.TP +umask=UMASK +set the umask to (octal) UMASK +.TP +dmask=UMASK +set the umask applied to directories only +.TP +fmask=UMASK +set the umask applied to regular files only +.TP +iocharset CHARSET +use the character set CHARSET for I/O operations +(default set is utf8) +.TP +convertcp CHARSET +convert the folder name from CHARSET to utf8 +.SS "Less common used options:" +.IP +noexec,exec,nodev,dev,nosuid,suid only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VBoxControl.8 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VBoxControl.8 @@ -0,0 +1,21 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXCONTROL "8" "September 2010" "VBoxControl" "System Administration Utilities" +.SH NAME +VBoxControl \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Guest Additions Command Line Management Interface +(C) 2008\-2010 Oracle Corporation +All rights reserved. +.PP +Usage: +.PP +VBoxControl [\-v|\-version] print version number and exit +VBoxControl \fB\-nologo\fR ... suppress the logo +.PP +VBoxControl guestproperty get [\-verbose] +VBoxControl guestproperty set [ [\-flags ]] +VBoxControl guestproperty enumerate [\-patterns ] +VBoxControl guestproperty wait +.IP +[\-timestamp ] +[\-timeout only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/vboxwebsrv.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/vboxwebsrv.1 @@ -0,0 +1,23 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXWEBSRV "1" "September 2010" "vboxwebsrv" "User Commands" +.SH NAME +vboxwebsrv \- x86 virtualization solution +.SH SYNOPSIS +.B vboxwebsrv +[\fIoptions\fR] +.SH DESCRIPTION +Oracle VM VirtualBox web service version +(C) 2005\-2010 Oracle Corporation +All rights reserved. +.PP +Supported options (default values in brackets): +\fB\-\-help\fR, \fB\-h\fR: Print this help message and exit. +\fB\-\-background\fR, \fB\-b\fR: Run in background (daemon mode). +\fB\-\-host\fR, \fB\-H\fR: The host to bind to (localhost). +\fB\-\-port\fR, \fB\-p\fR: The port to bind to (18083). +\fB\-\-timeout\fR, \fB\-t\fR: Session timeout in seconds; 0 = disable timeouts (300). +\fB\-\-check\-interval\fR, \fB\-i\fR: Frequency of timeout checks in seconds (5). +\fB\-\-threads\fR, \fB\-T\fR: Maximum number of worker threads to run in parallel (100). +\fB\-\-keepalive\fR, \fB\-k\fR: Maximum number of requests before a socket will be closed (100). +\fB\-\-verbose\fR, \fB\-v\fR: Be verbose. +\fB\-\-logfile\fR, \fB\-F\fR: Name of file to write log to (no file). only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/vdfuse.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/vdfuse.1 @@ -0,0 +1,43 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VDFUSE "1" "September 2010" "vdfuse" "User Commands" +.SH NAME +vdfuse \- x86 virtualization solution +.SH DESCRIPTION +DESCRIPTION: This Fuse module uses the VirtualBox access library to open a +VirtualBox supported VD image file and mount it as a Fuse file system. The +mount point contains a flat directory containing the files EntireDisk, +Partition1 .. PartitionN. These can then be loop mounted to access the +underlying file systems +.PP +USAGE: vdfuse [options] \fB\-f\fR image\-file mountpoint +.TP +\fB\-h\fR +help +.TP +\fB\-r\fR +readonly +.TP +\fB\-t\fR +specify type (VDI, VMDK, VHD, or raw; default: auto) +.TP +\fB\-f\fR +VDimage file +.TP +\fB\-a\fR +allow all users to read disk +.TP +\fB\-w\fR +allow all users to read and write to disk +.TP +\fB\-g\fR +run in foreground +.TP +\fB\-v\fR +verbose +.TP +\fB\-d\fR +debug +.PP +NOTE: you must add the line "user_allow_other" (without quotes) +to /etc/fuse.confand set proper permissions on /etc/fuse.conf +for this to work. only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VirtualBox.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VirtualBox.1 @@ -0,0 +1,24 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VIRTUALBOX "1" "September 2010" "VirtualBox" "User Commands" +.SH NAME +VirtualBox \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Graphical User Interface +(C) 2005\-2010 Oracle Corporation +All rights reserved. +.SS "Usage:" +.TP +\fB\-\-startvm\fR +start a VM by specifying its UUID or name +.TP +\fB\-\-seamless\fR +switch to seamless mode during startup +.TP +\fB\-\-fullscreen\fR +switch to fullscreen mode during startup +.TP +\fB\-\-rmode\fR sdl|image +select different render mode (default is sdl) +.TP +\fB\-\-no\-startvm\-errormsgbox\fR +do not show a message box for VM start errors only in patch2: unchanged: --- virtualbox-ose-3.2.8-dfsg.orig/debian/manpages/VBoxHeadless.1 +++ virtualbox-ose-3.2.8-dfsg/debian/manpages/VBoxHeadless.1 @@ -0,0 +1,38 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. +.TH VBOXHEADLESS "1" "September 2010" "VBoxHeadless" "User Commands" +.SH NAME +VBoxHeadless \- x86 virtualization solution +.SH DESCRIPTION +Oracle VM VirtualBox Headless Interface +(C) 2008\-2010 Oracle Corporation +All rights reserved. +.SS "Usage:" +.TP +\fB\-s\fR, \fB\-startvm\fR, \fB\-\-startvm\fR +Start given VM (required argument) +.TP +\fB\-n\fR, \fB\-\-vnc\fR +Enable the built in VNC server +.TP +\fB\-m\fR, \fB\-\-vncport\fR +TCP port number to use for the VNC server +.TP +\fB\-o\fR, \fB\-\-vncpass\fR +Set the VNC server password +.TP +\fB\-c\fR, \fB\-capture\fR, \fB\-\-capture\fR +Record the VM screen output to a file +.TP +\fB\-w\fR, \fB\-\-width\fR +Frame width when recording +.TP +\fB\-h\fR, \fB\-\-height\fR +Frame height when recording +.TP +\fB\-r\fR, \fB\-\-bitrate\fR +Recording bit rate when recording +.TP +\fB\-f\fR, \fB\-\-filename\fR +File name when recording. The codec +used will be chosen based on the +file extension