diff --git a/doc/EN/mesh.org b/doc/EN/mesh.org index a73024f7..0da9c2bc 100644 --- a/doc/EN/mesh.org +++ b/doc/EN/mesh.org @@ -148,7 +148,7 @@ And by selecting the user from the list on the left hand side the chat can begin [[file:images/mesh_text_chat.jpg]] #+END_CENTER -One important point is that by default sound and microphone is turned off. In the top right corner of the screen you can increase the sound volume and enable the microphone if you're doing voice chat or need audible notifications. +One important point is that by default the microphone is turned off. When doing voice chat you can select the microphone volume with the drop down slider in the top right corner of the screen. At present video doesn't work reliably, but text and voice chat do work well. In future IPFS or Tahoe-LAFS may be added to create a distributed filesystem for the mesh. diff --git a/img/backgrounds/freedombone_mesh_initial_background.png b/img/backgrounds/freedombone_mesh_initial_background.png new file mode 100644 index 00000000..6c7fa9b8 Binary files /dev/null and b/img/backgrounds/freedombone_mesh_initial_background.png differ diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 3a08fb73..e68dddcd 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -95,7 +95,7 @@ WIFI_NETWORKS_FILE=~/${PROJECT_NAME}-wifi.cfg INSECURE='no' # optional desktop background image for mesh -MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_background.png +MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_initial_background.png # The browser application to use BROWSER=iceweasel @@ -627,6 +627,10 @@ function mesh_client_startup_applications { echo "env | grep DBUS_SESSION_BUS_ADDRESS > /home/$MY_USERNAME/.dbus/Xdbus" >> $START_DESKTOP echo "echo 'export DBUS_SESSION_BUS_ADDRESS' >> /home/$MY_USERNAME/.dbus/Xdbus" >> $START_DESKTOP + echo '' >> $START_DESKTOP + echo "amixer set 'Master' unmute" >> $START_DESKTOP + echo "amixer set 'Master' 50%" >> $START_DESKTOP + echo '' >> $START_DESKTOP echo '' >> $START_DESKTOP echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP echo " $TAHOE_COMMAND start" >> $START_DESKTOP @@ -730,6 +734,9 @@ function configure_user_interface { # a sane editor chroot "$rootdir" apt-get -y install emacs24 + # for sound level control + chroot "$rootdir" apt-get -y install alsa-utils + # android adb to allow phones to be connected and for example transfer photos/documents chroot "$rootdir" apt-get -y install android-tools-adb diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh index ad0997a7..11dc9411 100755 --- a/src/freedombone-image-mesh +++ b/src/freedombone-image-mesh @@ -833,6 +833,14 @@ if [ -f $MESH_INSTALL_SETUP ]; then touch $FIRST_BOOT chown ${MY_USERNAME}:${MY_USERNAME} $FIRST_BOOT fi + + # set the desktop background + if [ -d /home/$MY_USERNAME/Desktop ]; then + MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_background.png + cp $MESH_DESKTOP_BACKGROUND_IMAGE /usr/share/images/desktop-base/${PROJECT_NAME}_mesh_background.png + rm /usr/share/images/desktop-base/desktop-background + ln -s /usr/share/images/desktop-base/${PROJECT_NAME}_mesh_background.png /usr/share/images/desktop-base/desktop-background + fi reboot fi fi diff --git a/website/EN/mesh.html b/website/EN/mesh.html index 23c04fd7..99add8fb 100644 --- a/website/EN/mesh.html +++ b/website/EN/mesh.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -256,12 +256,12 @@ for the JavaScript code in this tag. Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.

-
-

Ready made images

-
-
-

Client images

-
+
+

Ready made images

+
+
+

Client images

+

"Client" isn't exactly the right term, but it's a mesh peer with a user interface. These images can be copied to a USB drive, then you can plug it into a laptop/netbook/desktop machine and boot from it. You will probably also need an Atheros USB wifi dongle, because most built-in wifi usually requires proprietary firmware. In the commands below substitute /dev/sdX with the USB drive device, excluding any trailing numbers (eg. /dev/sdb).

@@ -302,16 +302,16 @@ sudo dd bs=1M -

Router images

-
+
+

Router images

+

Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.

-
-

Beaglebone Black

-
+
+

Beaglebone Black

+
sudo apt-get install xz-utils wget
@@ -333,9 +333,9 @@ If you have a few Beaglebone Blacks to use as routers then repeat the dd
 
-
-

To build the disk image yourself

-
+
+

To build the disk image yourself

+

It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.

@@ -426,9 +426,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
-
-

How to use it

-
+
+

How to use it

+

When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.

@@ -482,7 +482,7 @@ And by selecting the user from the list on the left hand side the chat can begin

-One important point is that by default sound and microphone is turned off. In the top right corner of the screen you can increase the sound volume and enable the microphone if you're doing voice chat or need audible notifications. +One important point is that by default the microphone is turned off. When doing voice chat you can select the microphone volume with the drop down slider in the top right corner of the screen.