diff --git a/doc/EN/installation.org b/doc/EN/installation.org index c63c445c..be2b4577 100644 --- a/doc/EN/installation.org +++ b/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' diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz index a46ca8a1..d576dc8f 100644 Binary files a/man/freedombone-image.1.gz and b/man/freedombone-image.1.gz differ diff --git a/src/freedombone-image b/src/freedombone-image index b364e2a1..c72000e3 100755 --- a/src/freedombone-image +++ b/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:' diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index a68dc516..e20d39dc 100755 --- a/src/freedombone-image-customise +++ b/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" \ diff --git a/src/freedombone-image-make b/src/freedombone-image-make index 6a1be29f..8861f9d4 100755 --- a/src/freedombone-image-make +++ b/src/freedombone-image-make @@ -126,11 +126,6 @@ case "$MACHINE" in --roottype btrfs \ " ;; - virtualbox) - extra_opts="\ - --grub \ - --roottype btrfs \ -" ;; qemu) extra_opts="\ --grub \ diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile index cd5920da..57d4d188 100755 --- a/src/freedombone-image-makefile +++ b/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 diff --git a/website/EN/installation.html b/website/EN/installation.html index 1c043898..913b0311 100644 --- a/website/EN/installation.html +++ b/website/EN/installation.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
- +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 freedombone-image command.
@@ -347,15 +347,6 @@ If you prefer an advanced installation with all of the options available then us-To build a 64bit Virtualbox image: -
- -freedombone-image -t virtualbox-amd64 -s 8G --
To build a 64bit Qemu image:
@@ -380,9 +371,9 @@ If the image build fails with an error such as "Error reading from server. ReBefore installing Freedombone you will need a few things.
@@ -396,17 +387,17 @@ Before installing Freedombone you will need a few things.There are three install options: Laptop/Desktop/Netbook, SBC and Virtual Machine.
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:
@@ -424,9 +415,9 @@ freedombone menuconfigCurrently the following boards are supported:
@@ -504,11 +495,11 @@ Using the password 'freedombone'. Take a note of the new login password and then-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:
-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.
@@ -527,42 +514,42 @@ The default login will be username 'fbone' and password 'freedombone'. Take a noDuring 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
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.
-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 Keydrives. +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 Keydrives.
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.
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.
@@ -680,16 +667,16 @@ On your internet router, typically under firewall settings, open the following pAfter 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:
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 done from the Disk Utility application. Then plug it into the Freedombone system, then from your local machine run:
@@ -704,9 +691,9 @@ Select Administrator controls then Backup and Restore then BackThis 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 can be done from the Disk Utility application. Plug it into the Freedombone system then from your local machine run the following commands:
@@ -726,9 +713,9 @@ Fragments are randomly assigned and so you will need at least three or four keydYou can configure laptops or desktop machines which connect to the Freedombone server in the following way. This alters encryption settings to improve overall security.
@@ -745,9 +732,9 @@ freedombone-clientTo administer the system after installation log in via ssh, become the root user and then launch the control panel.