summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-01-30 14:15:36 +0000
committerintrigeri <intrigeri@boum.org>2017-01-30 14:15:36 +0000
commitc80a73a3516389a6513a2422f465ddfb07682678 (patch)
treeea4cc94f9225bb2e128324c457a4ffe757b0ccde
parentbfc96da7fb49a359264941aa9e7b8889f750c09d (diff)
Remove guest utilities for VirtualBox (refs: #12048).wip/bugfix/12048-remove-virtualbox
-rw-r--r--config/chroot_apt/preferences4
-rwxr-xr-xconfig/chroot_local-hooks/50-dkms22
-rwxr-xr-xconfig/chroot_local-hooks/98-remove_unwanted_packages2
-rw-r--r--config/chroot_local-packageslists/tails-common.list5
-rw-r--r--features/step_definitions/checks.rb5
-rw-r--r--features/virtualization.feature7
-rw-r--r--wiki/src/contribute/design.mdwn3
-rw-r--r--wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn24
8 files changed, 4 insertions, 68 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 6e2d9f2..7782658 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -36,10 +36,6 @@ Package: tails-installer
Pin: origin deb.tails.boum.org
Pin-Priority: 999
-Package: virtualbox*
-Pin: release o=Debian,n=sid
-Pin-Priority: 999
-
Explanation: weirdness in chroot_apt install-binary
Package: *
Pin: release o=chroot_local-packages
diff --git a/config/chroot_local-hooks/50-dkms b/config/chroot_local-hooks/50-dkms
index 1757e2b..795adc2 100755
--- a/config/chroot_local-hooks/50-dkms
+++ b/config/chroot_local-hooks/50-dkms
@@ -13,26 +13,8 @@ apt-get install --yes build-essential dkms
# Installing the headers triggers the building of the modules for that kernel
apt-get install --yes \
"linux-headers-${KERNEL_VERSION}-amd64" \
- aufs-dkms \
- virtualbox-guest-dkms
+ aufs-dkms
-MODULES_VERSION="$(dpkg-query -W -f='${Version}\n' virtualbox-guest-dkms \
- | sed -E 's,-.*,,')"
-dkms build \
- -a amd64 -k "${KERNEL_VERSION}-amd64" \
- -m virtualbox-guest -v "$MODULES_VERSION"
-dkms install \
- -a amd64 -k "${KERNEL_VERSION}-amd64" \
- -m virtualbox-guest -v "$MODULES_VERSION"
-
-# clean the build directory
-# rm -r /var/lib/dkms/virtualbox-guest/
-
-# virtualbox-guest-dkms's postrm script deletes any previously
+# dkms modules' postrm script deletes any previously
# built binary module; let's delete it before the package gets purged.
rm /var/lib/dpkg/info/aufs-dkms.prerm
-rm /var/lib/dpkg/info/virtualbox-guest-dkms.prerm
-
-# Also copy the udev rules installed by virtualbox-guest-dkms to enable guest
-# additions by default.
-cp -a /lib/udev/rules.d/60-virtualbox-guest-dkms.rules /etc/udev/rules.d/
diff --git a/config/chroot_local-hooks/98-remove_unwanted_packages b/config/chroot_local-hooks/98-remove_unwanted_packages
index 121b1b0..3a00763 100755
--- a/config/chroot_local-hooks/98-remove_unwanted_packages
+++ b/config/chroot_local-hooks/98-remove_unwanted_packages
@@ -23,7 +23,7 @@ apt-get --yes purge \
po-debconf \
rsyslog \
libdvdcss-dev \
- equivs virtualbox-guest-dkms
+ equivs
### Deinstall a few unwanted packages that were pulled by tasksel
### since they have Priority: standard.
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index cea3371..2faead0 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -225,8 +225,6 @@ totem
unar
usbutils
vim-nox
-virtualbox-guest-utils
-virtualbox-guest-x11
wireless-tools
xdg-user-dirs-gtk
xsel
@@ -371,9 +369,6 @@ python-nautilus
python-pdfrw
python-poppler
-### Needed by virtualbox-guest-utils
-pciutils
-
### SmartCard
libccid
pcscd
diff --git a/features/step_definitions/checks.rb b/features/step_definitions/checks.rb
index 601ee8b..2f45919 100644
--- a/features/step_definitions/checks.rb
+++ b/features/step_definitions/checks.rb
@@ -101,11 +101,6 @@ When /^Tails has booted a 64-bit kernel$/ do
"Tails has not booted a 64-bit kernel.")
end
-Then /^the VirtualBox guest modules are available$/ do
- assert($vm.execute("modinfo vboxguest").success?,
- "The vboxguest module is not available.")
-end
-
Then /^the support documentation page opens in Tor Browser$/ do
if @language == 'German'
expected_title = 'Tails - Hilfe & Support'
diff --git a/features/virtualization.feature b/features/virtualization.feature
deleted file mode 100644
index 28b8a33..0000000
--- a/features/virtualization.feature
+++ /dev/null
@@ -1,7 +0,0 @@
-@product
-Feature: Virtualization support
-
- Scenario: VirtualBox guest modules are available
- Given a computer
- When I start Tails from DVD with network unplugged and I login
- Then the VirtualBox guest modules are available
diff --git a/wiki/src/contribute/design.mdwn b/wiki/src/contribute/design.mdwn
index 5185860..8540268 100644
--- a/wiki/src/contribute/design.mdwn
+++ b/wiki/src/contribute/design.mdwn
@@ -1281,8 +1281,7 @@ for an improved user experience in that environment. Due to the
closed-source nature of VMWare we try to encourage users of open VMs,
like [VirtualBox](http://virtualbox.org/) and
[QEMU](http://www.qemu.org/), by making sure that
-these also work. In the case of VirtualBox both video and input
-drivers are included, as well as the guest utilities.
+these also work.
### 3.7.2 Security concerns
diff --git a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
index 16613e2..87e15ef 100644
--- a/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
+++ b/wiki/src/doc/advanced_topics/virtualization/virtualbox.mdwn
@@ -18,19 +18,6 @@ though it does not allow to use a persistent volume.
</div>
-<div class="tip">
-
-<p>With the <a href="https://www.virtualbox.org/manual/ch04.html#sharedfolders">
-<span class="guilabel">shared folders</span></a> feature of
-<span class="application">VirtualBox</span> you can access files of your
-host system from within the guest system.</p>
-
-<p>Make sure to understand the security implications of [[accessing
-internal hard disks|encryption_and_privacy/your_data_wont_be_saved_unless_explicitly_asked]]
-from Tails before using this feature.</p>
-
-</div>
-
Security considerations for Windows and Mac OS X
================================================
@@ -73,17 +60,6 @@ To create a new virtual machine:
- **Type**: **Linux**.
- **Version**: **Other Linux (64 bit)**.
- Click **Next**.
-
- <div class="bug"><p><span class="application">VirtualBox</span> guest
- modules allow for additional features when using Tails in a virtual
- machine: shared folders, resizable display, shared clipboard, etc.</p>
-
- <p>But due to <a href="https://www.virtualbox.org/ticket/11037">a bug in
- <span class="application">VirtualBox</span></a>, the resizable display
- and shared clipboard only work in Tails if the virtual machine is configured to
- have a 32-bit processor. The shared folders work both on 32-bit and
- 64-bit guests.</p></div>
-
1. In the **Memory size** screen:
- Allocate at least 1024 MB of RAM.
- Click **Next**.