Deprecate VirtualBox support

It's a mostly but not entirely free system which according to the Debian wiki requires a non-free compiler to build. VirtualBox also isn't available on Parabola. If it becomes a fully free system at some time in future then this patch can be reverted.

doc/EN/installation.org

@@ -62,12 +62,6 @@ If you prefer an advanced installation with all of the options available then us
 freedombone-image -t beaglebone -s 8G --minimal no
 #+END_SRC
 
-To build a 64bit Virtualbox image:
-
-#+BEGIN_SRC bash
-freedombone-image -t virtualbox-amd64 -s 8G
-#+END_SRC
-
 To build a 64bit Qemu image:
 
 #+BEGIN_SRC bash
@@ -158,14 +152,12 @@ Using the password 'freedombone'. Take a note of the new login password and then
 
 ** As a Virtual Machine
 
-Virtualbox and Qemu are supported. You can run a 64 bit Qemu image with:
+Qemu is currently supported, since it's s fully free software system. You can run a 64 bit Qemu image with:
 
 #+BEGIN_SRC bash
 qemu-system-x86_64 -m 1G filename.img
 #+END_SRC
 
-If you are using Virtualbox then add a new VM and select the Freedombone *vdi* image.
-
 The default login will be username 'fbone' and password 'freedombone'. Take a note of the new login password and then you can proceed through the rest of the installation.
 
 * Social Key Management - the 'Unforgettable Key'

src/freedombone-image

@@ -503,9 +503,6 @@ EXPECTED_EXTENSION='xz'
 if [[ $IMAGE_TYPE == "qemu"* ]]; then
     EXPECTED_EXTENSION='qcow2'
 fi
-if [[ $IMAGE_TYPE == "virtualbox"* ]]; then
-    EXPECTED_EXTENSION='vdi'
-fi
 
 shopt -s nullglob
 imgfiles=(build/${PROJECT_NAME}*.${EXPECTED_EXTENSION})
@@ -537,7 +534,7 @@ Image was created.
 
 You will be able to log into it with:
 "
-    if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
+    if [[ $IMAGE_TYPE != "qemu"* ]]; then
         echo $"    ssh $USERNAME@$DEFAULT_DOMAIN_NAME -p $SSH_PORT
 
 Password: $PASSWORD
@@ -577,7 +574,7 @@ echo $"Username: $USERNAME
 Password: $PASSWORD" > ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
 chmod 600 ${CURR_DIR}/${PROJECT_NAME}_login_credentials.txt
 
-if [[ $IMAGE_TYPE != "virtualbox"* && $IMAGE_TYPE != "qemu"* ]]; then
+if [[ $IMAGE_TYPE != "qemu"* ]]; then
     echo ''
     if [[ $VARIANT != 'meshclient' && $VARIANT != 'meshusb' ]]; then
         echo $'You can copy the image to a microSD card with:'

src/freedombone-image-customise

@@ -965,11 +965,6 @@ echo $username:$password | chroot "$rootdir" /usr/sbin/chpasswd
 chroot "$rootdir" adduser $username sudo
 
 case "$MACHINE" in
-    virtualbox)
-        # hide irrelevant console keyboard messages.
-        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
-             >> /etc/init.d/rc.local
-        ;;
     qemu)
         # hide irrelevant console keyboard messages.
         echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \

src/freedombone-image-make

@@ -126,11 +126,6 @@ case "$MACHINE" in
  --roottype btrfs \
 "
         ;;
-    virtualbox)
-        extra_opts="\
- --grub \
- --roottype btrfs \
-"   ;;
     qemu)
         extra_opts="\
  --grub \

src/freedombone-image-makefile

@@ -188,55 +188,6 @@ apu: prep
 	$(SIGN)
 	@echo "Build complete."
 
-# build a virtualbox image
-virtualbox: virtualbox-i386
-
-virtualbox-i386: prep
-	$(eval ARCHITECTURE = i386)
-	$(eval MACHINE = virtualbox)
-	$(MAKE_IMAGE)
-	# Convert image to vdi hard drive
-	VBoxManage convertdd $(NAME).img $(NAME).vdi
-	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
-	@echo ""
-	$(SIGN)
-	@echo "Build complete."
-
-virtualbox-amd64: prep
-	$(eval ARCHITECTURE = amd64)
-	$(eval MACHINE = virtualbox)
-	$(MAKE_IMAGE)
-	# Convert image to vdi hard drive
-	VBoxManage convertdd $(NAME).img $(NAME).vdi
-	@rm -f $(ARCHIVE)
-	$(XZ) $(IMAGE)
-	@echo ""
-	$(SIGN)
-	@echo "Build complete."
-
-test: test-virtualbox
-
-test-virtualbox: virtualbox
-	$(eval VM_NAME = $(PROJECT_NAME)-test)
-	VBoxManage createvm --name $(VM_NAME) --ostype "Debian" --register
-	VBoxManage storagectl $(VM_NAME) --name "SATA Controller" --add sata \
-		 --controller IntelAHCI
-	VBoxManage storageattach $(VM_NAME) --storagectl "SATA Controller" \
-		--port 0 --device 0 --type hdd --medium $(NAME).vdi
-	VBoxManage modifyvm $(VM_NAME) --pae on --memory 1024 --vram 128 \
-		--nic1 nat --natpf1 ,tcp,,$(TEST_SSH_PORT),,22
-	VBoxManage startvm $(VM_NAME) --type headless
-	sleep $(TEST_FIRSTRUN_WAIT_TIME) # wait for first-run to complete
-	echo frdm |sshpass -p frdm ssh -o UserKnownHostsFile=/dev/null \
-		-o StrictHostKeyChecking=no -t -t \
-		-p $(TEST_SSH_PORT) fbx@127.0.0.1 \
-		"sudo plinth --diagnose" \
-		|tee build/$(VM_NAME)-results_$(TODAY).log
-	VBoxManage controlvm $(VM_NAME) poweroff
-	VBoxManage modifyvm $(VM_NAME) --hda none
-	VBoxManage unregistervm $(VM_NAME) --delete
-
 # build a qemu image
 qemu: qemu-i386
 

website/EN/installation.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2016-09-22 Thu 16:51 -->
+<!-- 2016-10-14 Fri 16:11 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title></title>
@@ -255,11 +255,11 @@ for the JavaScript code in this tag.
 </colgroup>
 <tbody>
 <tr>
-<td class="org-left"><a href="#orgd79c22b">Building an image for a Single Board Computer or Virtual Machine</a></td>
+<td class="org-left"><a href="#org7b3d684">Building an image for a Single Board Computer or Virtual Machine</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org55bbed6">Checklist</a></td>
+<td class="org-left"><a href="#org955c60b">Checklist</a></td>
 </tr>
 
 <tr>
@@ -267,34 +267,34 @@ for the JavaScript code in this tag.
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org017cb16">Installation</a></td>
+<td class="org-left"><a href="#orgd4678eb">Installation</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org11c44aa">Social Key Management - the 'Unforgettable Key'</a></td>
+<td class="org-left"><a href="#org23e93ff">Social Key Management - the 'Unforgettable Key'</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org90d37f2">Final Setup</a></td>
+<td class="org-left"><a href="#orgc8c45e3">Final Setup</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#orge4309c7">Keydrives</a></td>
+<td class="org-left"><a href="#org5f418b6">Keydrives</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org0b60a26">On Client Machines</a></td>
+<td class="org-left"><a href="#org542028e">On Client Machines</a></td>
 </tr>
 
 <tr>
-<td class="org-left"><a href="#org9c63345">Administering the system</a></td>
+<td class="org-left"><a href="#org3f1ed1f">Administering the system</a></td>
 </tr>
 </tbody>
 </table>
 
-<div id="outline-container-orgd79c22b" class="outline-2">
-<h2 id="orgd79c22b">Building an image for a Single Board Computer or Virtual Machine</h2>
-<div class="outline-text-2" id="text-orgd79c22b">
+<div id="outline-container-org7b3d684" class="outline-2">
+<h2 id="org7b3d684">Building an image for a Single Board Computer or Virtual Machine</h2>
+<div class="outline-text-2" id="text-org7b3d684">
 <p>
 You don't have to trust images downloaded from random internet locations signed with untrusted keys. You can build one from scratch yourself, and this is the recommended procedure for maximum security. For guidance on how to build images see the manpage for the <b>freedombone-image</b> command.
 </p>
@@ -348,15 +348,6 @@ If you prefer an advanced installation with all of the options available then us
 </div>
 
 <p>
-To build a 64bit Virtualbox image:
-</p>
-
-<div class="org-src-container">
-<pre class="src src-bash">freedombone-image -t virtualbox-amd64 -s 8G
-</pre>
-</div>
-
-<p>
 To build a 64bit Qemu image:
 </p>
 
@@ -380,9 +371,9 @@ If the image build fails with an error such as "<i>Error reading from server. Re
 </div>
 </div>
 
-<div id="outline-container-org55bbed6" class="outline-2">
-<h2 id="org55bbed6">Checklist</h2>
-<div class="outline-text-2" id="text-org55bbed6">
+<div id="outline-container-org955c60b" class="outline-2">
+<h2 id="org955c60b">Checklist</h2>
+<div class="outline-text-2" id="text-org955c60b">
 <p>
 Before installing Freedombone you will need a few things.
 </p>
@@ -396,17 +387,17 @@ Before installing Freedombone you will need a few things.
 </ul>
 </div>
 </div>
-<div id="outline-container-org017cb16" class="outline-2">
-<h2 id="org017cb16">Installation</h2>
-<div class="outline-text-2" id="text-org017cb16">
+<div id="outline-container-orgd4678eb" class="outline-2">
+<h2 id="orgd4678eb">Installation</h2>
+<div class="outline-text-2" id="text-orgd4678eb">
 <p>
 There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
 </p>
 </div>
 
-<div id="outline-container-orgba36f85" class="outline-3">
-<h3 id="orgba36f85">On a Laptop, Netbook or Desktop machine</h3>
-<div class="outline-text-3" id="text-orgba36f85">
+<div id="outline-container-orgb37e388" class="outline-3">
+<h3 id="orgb37e388">On a Laptop, Netbook or Desktop machine</h3>
+<div class="outline-text-3" id="text-orgb37e388">
 <p>
 If you have an existing system, such as an old laptop or netbook which you can leave running as a server, then install a new version of Debian Jessie onto it. During the Debian install you won't need the print server or the desktop environment, and unchecking those will reduce the attack surface. Once Debian enter the following commands:
 </p>
@@ -424,9 +415,9 @@ freedombone menuconfig
 </div>
 </div>
 
-<div id="outline-container-org7010e61" class="outline-3">
-<h3 id="org7010e61">On a single board computer (SBC)</h3>
-<div class="outline-text-3" id="text-org7010e61">
+<div id="outline-container-orgd247df0" class="outline-3">
+<h3 id="orgd247df0">On a single board computer (SBC)</h3>
+<div class="outline-text-3" id="text-orgd247df0">
 <p>
 Currently the following boards are supported:
 </p>
@@ -504,11 +495,11 @@ Using the password 'freedombone'. Take a note of the new login password and then
 </div>
 </div>
 
-<div id="outline-container-org9eb1542" class="outline-3">
-<h3 id="org9eb1542">As a Virtual Machine</h3>
-<div class="outline-text-3" id="text-org9eb1542">
+<div id="outline-container-org84fbe0a" class="outline-3">
+<h3 id="org84fbe0a">As a Virtual Machine</h3>
+<div class="outline-text-3" id="text-org84fbe0a">
 <p>
-Virtualbox and Qemu are supported. You can run a 64 bit Qemu image with:
+Qemu is currently supported, since it's s fully free software system. You can run a 64 bit Qemu image with:
 </p>
 
 <div class="org-src-container">
@@ -517,52 +508,48 @@ Virtualbox and Qemu are supported. You can run a 64 bit Qemu image with:
 </div>
 
 <p>
-If you are using Virtualbox then add a new VM and select the Freedombone <b>vdi</b> image.
-</p>
-
-<p>
 The default login will be username 'fbone' and password 'freedombone'. Take a note of the new login password and then you can proceed through the rest of the installation.
 </p>
 </div>
 </div>
 </div>
 
-<div id="outline-container-org11c44aa" class="outline-2">
-<h2 id="org11c44aa">Social Key Management - the 'Unforgettable Key'</h2>
-<div class="outline-text-2" id="text-org11c44aa">
+<div id="outline-container-org23e93ff" class="outline-2">
+<h2 id="org23e93ff">Social Key Management - the 'Unforgettable Key'</h2>
+<div class="outline-text-2" id="text-org23e93ff">
 <p>
 During the install procedure you will be asked if you wish to import GPG keys. If you don't already possess GPG keys then just select "Ok" and they will be generated during the install. If you do already have GPG keys then there are a few possibilities
 </p>
 </div>
 
-<div id="outline-container-orgbf3c5bf" class="outline-3">
-<h3 id="orgbf3c5bf">You have the gnupg keyring on an encrypted USB drive</h3>
-<div class="outline-text-3" id="text-orgbf3c5bf">
+<div id="outline-container-orgff516ed" class="outline-3">
+<h3 id="orgff516ed">You have the gnupg keyring on an encrypted USB drive</h3>
+<div class="outline-text-3" id="text-orgff516ed">
 <p>
 If you previously made a master keydrive containing the full keyring (the .gnupg directory). This is the most straightforward case, but not as secure as splitting the key into fragments.
 </p>
 </div>
 </div>
-<div id="outline-container-org17a4ad3" class="outline-3">
-<h3 id="org17a4ad3">You have a number of key fragments on USB drives retrieved from friends</h3>
-<div class="outline-text-3" id="text-org17a4ad3">
+<div id="outline-container-orga588ce7" class="outline-3">
+<h3 id="orga588ce7">You have a number of key fragments on USB drives retrieved from friends</h3>
+<div class="outline-text-3" id="text-orga588ce7">
 <p>
-If you previously made some USB drives containing key fragments then retrieve them from your friends and plug them in one after the other. After the last drive has been read then remove it and just select "Ok". The system will then try to reconstruct the key. For this to work you will need to have previously made three or more <a href="#orge4309c7">Keydrives</a>.
+If you previously made some USB drives containing key fragments then retrieve them from your friends and plug them in one after the other. After the last drive has been read then remove it and just select "Ok". The system will then try to reconstruct the key. For this to work you will need to have previously made three or more <a href="#org5f418b6">Keydrives</a>.
 </p>
 </div>
 </div>
-<div id="outline-container-orgd982332" class="outline-3">
-<h3 id="orgd982332">You can specify some ssh login details for friends servers containing key fragments</h3>
-<div class="outline-text-3" id="text-orgd982332">
+<div id="outline-container-org45458e2" class="outline-3">
+<h3 id="org45458e2">You can specify some ssh login details for friends servers containing key fragments</h3>
+<div class="outline-text-3" id="text-org45458e2">
 <p>
 Enter three or more sets of login details and the installer will try to retrieve key fragments and then assemble them into the full key. This only works if you previously were using remote backups and had social key management enabled.
 </p>
 </div>
 </div>
 </div>
-<div id="outline-container-org90d37f2" class="outline-2">
-<h2 id="org90d37f2">Final Setup</h2>
-<div class="outline-text-2" id="text-org90d37f2">
+<div id="outline-container-orgc8c45e3" class="outline-2">
+<h2 id="orgc8c45e3">Final Setup</h2>
+<div class="outline-text-2" id="text-orgc8c45e3">
 <p>
 Any manual post-installation setup instructions or passwords can be found in /home/username/README. You should remove any passwords from that file and store them within a password manager such as KeepassX.
 </p>
@@ -680,16 +667,16 @@ On your internet router, typically under firewall settings, open the following p
 </div>
 </div>
 
-<div id="outline-container-orge4309c7" class="outline-2">
-<h2 id="orge4309c7">Keydrives</h2>
-<div class="outline-text-2" id="text-orge4309c7">
+<div id="outline-container-org5f418b6" class="outline-2">
+<h2 id="org5f418b6">Keydrives</h2>
+<div class="outline-text-2" id="text-org5f418b6">
 <p>
 After installing for the first time it's a good idea to create some keydrives. These will store your gpg key so that if all else fails you will still be able to restore from backup. There are two ways to do this:
 </p>
 </div>
-<div id="outline-container-org3f9bab9" class="outline-3">
-<h3 id="org3f9bab9">Master Keydrive</h3>
-<div class="outline-text-3" id="text-org3f9bab9">
+<div id="outline-container-org94c4265" class="outline-3">
+<h3 id="org94c4265">Master Keydrive</h3>
+<div class="outline-text-3" id="text-org94c4265">
 <p>
 This is the traditional security model in which you carry your full keyring on an encrypted USB drive. To make a master keydrive first format a USB drive as a LUKS encrypted drive. In Ubuntu this can be <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">done from the <i>Disk Utility</i> application</a>. Then plug it into the Freedombone system, then from your local machine run:
 </p>
@@ -704,9 +691,9 @@ Select <i>Administrator controls</i> then <i>Backup and Restore</i> then <i>Back
 </p>
 </div>
 </div>
-<div id="outline-container-orgad83839" class="outline-3">
-<h3 id="orgad83839">Fragment keydrives</h3>
-<div class="outline-text-3" id="text-orgad83839">
+<div id="outline-container-org4ff71c3" class="outline-3">
+<h3 id="org4ff71c3">Fragment keydrives</h3>
+<div class="outline-text-3" id="text-org4ff71c3">
 <p>
 This breaks your GPG key into a number of fragments and randomly selects one to add to the USB drive. First format a USB drive as a LUKS encrypted drive. In Ubuntu this <a href="https://help.ubuntu.com/community/EncryptedFilesystemsOnRemovableStorage">can be done from the <i>Disk Utility</i> application</a>. Plug it into the Freedombone system then from your local machine run the following commands:
 </p>
@@ -726,9 +713,9 @@ Fragments are randomly assigned and so you will need at least three or four keyd
 </div>
 </div>
 </div>
-<div id="outline-container-org0b60a26" class="outline-2">
-<h2 id="org0b60a26">On Client Machines</h2>
-<div class="outline-text-2" id="text-org0b60a26">
+<div id="outline-container-org542028e" class="outline-2">
+<h2 id="org542028e">On Client Machines</h2>
+<div class="outline-text-2" id="text-org542028e">
 <p>
 You can configure laptops or desktop machines which connect to the Freedombone server in the following way. This alters encryption settings to improve overall security.
 </p>
@@ -745,9 +732,9 @@ freedombone-client
 </div>
 </div>
 
-<div id="outline-container-org9c63345" class="outline-2">
-<h2 id="org9c63345">Administering the system</h2>
-<div class="outline-text-2" id="text-org9c63345">
+<div id="outline-container-org3f1ed1f" class="outline-2">
+<h2 id="org3f1ed1f">Administering the system</h2>
+<div class="outline-text-2" id="text-org3f1ed1f">
 <p>
 To administer the system after installation log in via ssh, become the root user and then launch the control panel.
 </p>