From 5f0d21d6b6cdd73909d255994f6caca3b0aecf45 Mon Sep 17 00:00:00 2001
From: Kevin Velickovic <kevin.velickovic@gmail.com>
Date: Mon, 20 Jul 2015 16:39:09 +0200
Subject: [PATCH] rawdata-downloader: * Complete rewrite

---
 src/rawdata-downloader/Makefile               |   10 +-
 src/rawdata-downloader/src/bin/backup-module  |  171 ---
 .../src/bin/build-modules-file                |  476 --------
 src/rawdata-downloader/src/bin/connect-module |  461 --------
 src/rawdata-downloader/src/bin/format-camera  |  262 -----
 src/rawdata-downloader/src/bin/format-module  |   43 -
 .../src/bin/get-module-master_timestamp       |  108 --
 .../src/bin/process-modules                   |  263 -----
 .../src/bin/rawdata-compare                   |    3 -
 .../src/bin/rawdata-downloader                |  183 ---
 .../src/bin/rawdata-toolbox.sh                |  582 ----------
 src/rawdata-downloader/src/rawdata-downloader | 1012 +++++++++++++++++
 .../src/system-tools/Makefile                 |    7 -
 .../etc/defaults/rawdata-downloader           |    0
 .../udev/rules.d/90-rawdata-downloader.rules  |    2 -
 .../usr/sbin/scsi-disk-udev-eventhandler      |   49 -
 .../var/spool/rawdata-downloader/.gitignore   |    1 -
 17 files changed, 1015 insertions(+), 2618 deletions(-)
 delete mode 100755 src/rawdata-downloader/src/bin/backup-module
 delete mode 100755 src/rawdata-downloader/src/bin/build-modules-file
 delete mode 100755 src/rawdata-downloader/src/bin/connect-module
 delete mode 100755 src/rawdata-downloader/src/bin/format-camera
 delete mode 100755 src/rawdata-downloader/src/bin/format-module
 delete mode 100755 src/rawdata-downloader/src/bin/get-module-master_timestamp
 delete mode 100755 src/rawdata-downloader/src/bin/process-modules
 delete mode 100755 src/rawdata-downloader/src/bin/rawdata-compare
 delete mode 100755 src/rawdata-downloader/src/bin/rawdata-downloader
 delete mode 100755 src/rawdata-downloader/src/bin/rawdata-toolbox.sh
 create mode 100755 src/rawdata-downloader/src/rawdata-downloader
 delete mode 100644 src/rawdata-downloader/src/system-tools/Makefile
 delete mode 100644 src/rawdata-downloader/src/system-tools/etc/defaults/rawdata-downloader
 delete mode 100644 src/rawdata-downloader/src/system-tools/etc/udev/rules.d/90-rawdata-downloader.rules
 delete mode 100755 src/rawdata-downloader/src/system-tools/usr/sbin/scsi-disk-udev-eventhandler
 delete mode 100644 src/rawdata-downloader/src/system-tools/var/spool/rawdata-downloader/.gitignore

diff --git a/src/rawdata-downloader/Makefile b/src/rawdata-downloader/Makefile
index 81fb1b0..3cb0bd3 100644
--- a/src/rawdata-downloader/Makefile
+++ b/src/rawdata-downloader/Makefile
@@ -1,14 +1,10 @@
+
 #
 #   make - synchronize
 #
 
-    all:directories install
-    
-    install:
-	cp -rv src/bin . 
-
-    install-system-tools:
-	${MAKE} -C src/system-tools install
+    all:directories
+	cp src/rawdata-downloader bin/rawdata-downloader
 
 #
 #   make - directories
diff --git a/src/rawdata-downloader/src/bin/backup-module b/src/rawdata-downloader/src/bin/backup-module
deleted file mode 100755
index 5813f84..0000000
--- a/src/rawdata-downloader/src/bin/backup-module
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/bash
-#
-# backup-module - backup eyesis module ssd 
-# This script is intended to be used as the <script> parameter for process-modules
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-PARTNUM=1
-PARTITION=${DEVICE}$PARTNUM
-MODULE_INDEX=$MODULE
-FSTYPE=ext2
-
-# create mountpoint directory
-PARTITION_MOUNTPOINT=/mnt/$(basename $PARTITION)
-mkdir -p $PARTITION_MOUNTPOINT 2>&1 | logstdout ${LINENO}
-[ ${PIPESTATUS[0]} -ne 0 ] && return 1
-
-# disable NCQ
-if [ -n "$DISABLE_NCQ" ] ; then
-  log ${LINENO} info: disabling NCQ $SERIAL ${DEVICE}$PARTNUM
-  echo 1 > /sys/block/$(basename $DEVICE)/device/queue_depth
-fi
-
-# if process is exiting, just wait for kill
-[ -n "$QUITTING_TMP" ] &&  while [ "$(cat $QUITTING_TMP)" -eq 1 ] ; do sleep 100000 ; done
-
-log ${LINENO} info: checking module $MODULE disk integrity
-
-# check / repair filesystem (-p is safe)
-fsck -p $PARTITION | logstdout ${LINENO}
-if [ ${PIPESTATUS[0]} -gt 1 ] ; then
-  log ${LINENO} error: "fsck failed for module $MODULE_INDEX"
-  return 1
-fi
-
-# if fsck -p fails, we could make a disk image and fsck -y the disk image,
-# then mount it 
-#
-# fsck exit code is the sum of the following conditions
-#            0    - No errors
-#            1    - Filesystem errors corrected
-#            2    - System should be rebooted
-#            4    - Filesystem errors left uncorrected
-#            8    - Operational error
-#            16   - Usage or syntax error
-#            32   - Fsck canceled by user request
-#            128  - Shared-library error
-
-# mount device read-only
-log ${LINENO} info: mount disk of module $MODULE_INDEX on $PARTITION_MOUNTPOINT
-mount -t $FSTYPE -o ro $PARTITION $PARTITION_MOUNTPOINT 2>&1 | logstdout ${LINENO}
-if [ ${PIPESTATUS[0]} -ne 0 ] ; then
-   log ${LINENO} error: "mount disk failed for module $MODULE_INDEX"
-   return 1
-fi
-
-# set destination folder
-if [ -z "$MASTER_TS" ] ; then
-  log ${LINENO} error: master timestamp undefined
-  return 1
-fi
-
-DESTINATION=$MOUNTPOINT/rawdata/$MACADDR/master
-RSYNCDEST=$DESTINATION/$MASTER_TS/mov/$MODULE_INDEX
-
-# create destination folder
-mkdir -p "$RSYNCDEST" 2>&1 | logstdout ${LINENO}
-if [ ${PIPESTATUS[0]} -ne 0 ] ; then
-  return 1
-fi
-
-case "$PROCESSMODULES_PARENT_SCRIPT" in
-
-  rawdata-downloader)
-    log ${LINENO} info: backup disk of module $MODULE_INDEX
-
-    rsync \
-      --exclude='lost+found' \
-      --exclude='**nodownload*' \
-      --archive \
-      --inplace \
-      --verbose \
-      $PARTITION_MOUNTPOINT/ $RSYNCDEST 2>&1 | logstdout ${LINENO} "$RSYNCDEST : "
-
-      EXIT_CODE=${PIPESTATUS[0]}
-
-    ;;
-
-  rawdata-compare)
-    log ${LINENO} info: "comparing content of module $MODULE_INDEX with corresponding files in $RSYNCDEST"
-    RSYNC_OUT=$(mktemp /tmp/rsync_XXXXXXX.tmp)
-
-    rsync \
-      --exclude='lost+found' \
-      --exclude='**nodownload*' \
-      --archive \
-      --dry-run \
-      --checksum \
-      --itemize-changes \
-      $PARTITION_MOUNTPOINT/ $RSYNCDEST 2>&1 | grep -v -e '^\.' | tee $RSYNC_OUT | logstdout ${LINENO}
-
-      EXIT_CODE=${PIPESTATUS[0]}
-
-      if [ $EXIT_CODE -eq 0 ] ; then
-
-        # if rsync output has a line not beginnig with '.'
-        # (see rsync --itemize-change option documentation)
-        # then something would be updated by rsync
-        if [ -s $RSYNC_OUT ] ; then
-          log ${LINENO} error: "content of module $MODULE_INDEX differs from corresponding files in $RSYNCDEST"
-          cat $RSYNC_OUT | logstdout ${LINENO}
-          EXIT_CODE=1
-        fi
-
-      fi
-
-      rm $RSYNC_OUT
-
-    ;;
-
-  *)
-    # unexpected error
-    log ${LINENO} "error: unexpected parent script: \"$PROCESSMODULES_PARENT_SCRIPT\""
-    EXIT_CODE=1
-    ;;
-
-esac
-
-
-# unmount device
-log ${LINENO} info: unmounting $PARTITION_MOUNTPOINT
-umount $PARTITION_MOUNTPOINT 2>&1 | logstdout ${LINENO}
-if [ ${PIPESTATUS[0]} -ne 0 ] ; then
-   log ${LINENO} warning: unmounting $PARTITION_MOUNTPOINT failed
-fi
-
-echo $DESTINATION/$MASTER_TS
-
-return $EXIT_CODE
diff --git a/src/rawdata-downloader/src/bin/build-modules-file b/src/rawdata-downloader/src/bin/build-modules-file
deleted file mode 100755
index 5fb82a8..0000000
--- a/src/rawdata-downloader/src/bin/build-modules-file
+++ /dev/null
@@ -1,476 +0,0 @@
-#!/bin/bash
-#
-# rawdata-procedures - Camera raw data procedures
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-#set -e
-
-LOG_HEADER=$(basename $0)
-
-. $(dirname $0)/rawdata-toolbox.sh
-
-init() {
-  export MOUNTPOINT=/data
-  export HOTSWAP_USING_SYS=yes
-  export BASE_IP=192.168.0
-  export MASTER_IP=221
-  export _MUXES="224 228"
-  export _MUX_SSD_COUNT="4 5"
-  export SPOOL=/var/spool/rawdata-downloader
-
-  [ -f /etc/defaults/rawdata-downloader ] && . /etc/defaults/rawdata-downloader
-
-  # parse command line options
-  if ! options=$(getopt -o hm:I:i:vdp -l help,mountpoint:,baseip:,masterip:,verbose,debug,proc -- "$@")
-  then
-      # something went wrong, getopt will put out an error message for us
-      exit 1
-  fi
-
-  eval set -- "$options"
-
-  while [ $# -gt 0 ] ; do
-      case $1 in
-      -h|--help) usage 1 ;;
-      -m|--mountpoint) MOUNTPOINT=$2 ; shift ;;
-      -I|--baseip) BASE_IP=$2 ; shift ;;
-      -i|--masterip) MASTER_IP=$2 ; shift ;;
-      -M|--muxes) _MUXES="$2" ; shift ;;
-      -c|--ssdcount) _MUX_SSD_COUNT="$2" ; shift ;;
-      -v|--verbose) VERBOSE=-v ;;
-      -d|--debug) DEBUG=-d ;;
-      -p|--proc) HOTSWAP_USING_SYS= ;;
-      (--) shift; break;;
-      (-*) echo "$(basename $0): error - unrecognized option $1" 1>&2; exit 1;;
-      (*) break;;
-      esac
-      shift
-  done
-
-  export MODULES_COUNT=$(get_module_count)
-
-  assert_root
-
-  mkdir -p $SPOOL || exit 1
-
-  debugmode_update
-  checkdependencies
-  get_camera_macaddr
-
-}
-
-checkdependencies() {
-  assertcommands inotifywait arp wget ssh sshall /usr/sbin/scsi-disk-udev-eventhandler
-  if [ ! -f /etc/udev/rules.d/90-rawdata-downloader.rules ] ; then
-    echo file not found: /etc/udev/rules.d/90-rawdata-downloader.rules >&2
-    exit 1
-  fi
-}
-
-usage() {
-cat << EOF
-SYNOPSIS:
-
-  $(basename $0) [OPTION ...]
-  
-DESCRIPTION: 
-    
-  Build the modules file that map the module number with the associated
-  multiplexer index, disk index, and disk serial.
-
-OPTIONS SUMMARY:
-  
-  -h|--help                   display this
-  -v|--verbose                verbose output
-  -m|--mountpoint <path>      parent location of the 'camera' directory
-  -I|--baseip <base_ip>       base ip, defaults to 192.168.0
-  -i|--masterip <master_ip>   master camera ip, defaults to 221
-  -M|--muxes "<mux_ip> ..."   esata multiplexer ip list, defaults to "224 228"
-  -x|--ssdcount "<n> ..."     esata multiplexers disk count, defaults to "4 5"
-  -d|--debug                  debug mode
-  -p|--proc                   hotswap using proc
-
-EOF
-  exit $1
-}
-
-# add "<module_index> <mux_index> <ssd_index> <ssd_serial>" entry to MODULES_FILE
-save_module_address() {
-  local MUX_INDEX=$1
-  local REMOTE_SSD_INDEX=$2
-  local SSD_SERIAL=$3
-  grep -q -E -e " $SSD_SERIAL\$" $MODULES_FILE && return 0
-  echo $(get_module_index $SSD_SERIAL) $MUX_INDEX $REMOTE_SSD_INDEX $SSD_SERIAL >> $MODULES_FILE
-  MODULES_FILE_TMP=/tmp/$(basename $MODULES_FILE).$$
-  sort -u $MODULES_FILE > $MODULES_FILE_TMP
-  cat $MODULES_FILE_TMP > $MODULES_FILE
-  rm $MODULES_FILE_TMP
-}
-
-# check that specified module address match saved one
-check_module_address() {
-  local MUX_INDEX=$1
-  local REMOTE_SSD_INDEX=$2
-  local SSD_SERIAL=$3
-  # ignore if not in modules file
-  grep -q -E -e "^[0-9]+ $MUX_INDEX $REMOTE_SSD_INDEX " $MODULES_FILE || return 0
-  # return error if serial is not matching saved one for mux/ssd pair
-  grep -q -E -e " $MUX_INDEX $REMOTE_SSD_INDEX $SSD_SERIAL\$" $MODULES_FILE
-}
-
-# wait udev generated files in spool folder, then validate and save module address
-wait_and_register() {
-
-  log ${LINENO} info: wait_and_register
-
-  local FIFO=$(mktmp -u).$$
-  mkfifo $FIFO
-  inotifywait -m -e close_write $SPOOL > $FIFO 2>&1
-  local INOTIFY_PID=$!
-
-  local l
-  while read l ; do
-
-    log ${LINENO} debug: INOTIFY $SPOOL $l
-
-    local event=($l)
-
-    # 1st string from inotifywait is not $SPOOL then it is from stderr
-    [ "${event[0]}" != "$SPOOl" ] && continue
-
-    # second string returned by inotifywait is filename (disk serial)
-    local SSD_SERIAL=${event[2]}
-
-    # get spool filename
-    local UDEVINFO=$SPOOL/${event[2]}
-
-    # get scsi host from spool filename
-    local SCSIHOST=$(get_hbtl $UDEVINFO)
-    [ -z "$SCSIHOST" ] && killtree -KILL $MYPID
-
-    # get saved connecting disk info
-    local DISK_CONNECTING_INFO=($(cat $DISK_CONNECTING_TMP))
-    local MUX_INDEX=${DISK_CONNECTING_INFO[0]}
-    local REMOTE_SSD_INDEX=${DISK_CONNECTING_INFO[1]}
-    local ISRETRY=${DISK_CONNECTING_INFO[2]}
-    local DEVICE=$(grep DEVNAME "$UDEVINFO" | cut -f 2 -d '=')
-
-    log ${LINENO} info: device_connected $MUX_INDEX $REMOTE_SSD_INDEX $SCSIHOST $SSD_SERIAL $DEVICE
-
-    # assert previously saved module address match the connecting disk
-    check_module_address $MUX_INDEX $REMOTE_SSD_INDEX $SSD_SERIAL 2>&1 | logstdout ${LINENO}
-    if [ ${PIPESTATUS[0]} -ne 0 ] ; then
-      log ${LINENO} error: "saved serial for mux $MUX_INDEX ssd $REMOTE_SSD_INDEX is not matching $SSD_SERIAL"
-      killtree -KILL $MYPID
-    fi
-
-    # cache camera module address (mux index, ssd index)
-    save_module_address $MUX_INDEX $REMOTE_SSD_INDEX $SSD_SERIAL 2>&1 | logstdout ${LINENO}
-
-    # cache mux index and scsi host association
-    save_scsihost $MUX_INDEX $SCSIHOST
-
-    # if disk is already connected, ignore
-    [ -f $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connected ] && continue
-
-    log ${LINENO} info: unpause connect queue
-    touch $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting || killtree -KILL $MYPID
-
-    # set already connected flag
-    touch $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connected || killtree -KILL $MYPID
-    echo $SCSIHOST $SSD_SERIAL $DEVICE > $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connected
-
-    enqueue_next_ssd $MUX_INDEX $REMOTE_SSD_INDEX $SCSIHOST $SSD_SERIAL $DEVICE $ISRETRY &
-
-  done < $FIFO
-
-  kill -TERM $INOTIFY_PID > /dev/null 2>&1 
-}
-
-# enqueue next ssd for this mux
-enqueue_next_ssd() {
-  local MUXES=($_MUXES)
-  local MUX_SSD_COUNT=($_MUX_SSD_COUNT)
-  local MUX_INDEX=$1
-  local REMOTE_SSD_INDEX=$2
-  local SCSIHOST="$3 $4 $5 $6"
-  local SSD_SERIAL=$7
-  local DEVICE=$8
-  local ISRETRY=$9
-
-  # quit if already processed - should not happend
-  if [ -f $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_processed ] ; then
-    log ${LINENO} error: already processed
-    killtree -KILL $MYPID
-  fi
-
-  # sync filesystems
-  log ${LINENO} info: syncing
-  sync
-
-  remove_scsi_device
-
-  # remove flag
-  rm $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connected || killtree -KILL $MYPID
-
-  # set processed flag
-  touch $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_processed || killtree -KILL $MYPID
-  echo $SCSIHOST $SSD_SERIAL $DEVICE $STATUS > $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_processed
-
-  # add serial to processed list
-  echo $SSD_SERIAL >> $SSD_SERIAL_DONE_TMP
-
-  # show progression
-  local SSD_SERIAL_DONE_COUNT=$(sort -u $SSD_SERIAL_DONE_TMP | wc -l)
-  log ${LINENO} info: registration_done_count $SSD_SERIAL_DONE_COUNT
-
-  # enqueue this mux's next ssd for backup (ignore this step for retries)
-  if [ "$ISRETRY" = "" -a $REMOTE_SSD_INDEX -lt ${MUX_SSD_COUNT[$MUX_INDEX]} ] ; then
-    log ${LINENO} debug: enqueue mux $MUX_INDEX ssd $((REMOTE_SSD_INDEX+1))
-    echo $MUX_INDEX $((REMOTE_SSD_INDEX+1)) >> $CONNECT_Q_TMP
-
-  else
-    # it is a retry or MUX_SSD_COUNT has been reached
-    if ! is_any_ssd_left_in_queue_for_mux $MUX_INDEX ; then
-      MUX_DONE=$(cat $MUX_DONE_TMP)
-      echo $((++MUX_DONE)) > $MUX_DONE_TMP
-    fi
-    log ${LINENO} info: mux_done_count $MUX_DONE
-
-  fi
-
-  # exit when all muxes have been processed
-  if [ "$MUX_DONE" = "${#MUXES[@]}" ] ; then
-
-    if [ $(sort -u $SSD_SERIAL_DONE_TMP | wc -l) -eq $MODULES_COUNT ] ; then
-      log ${LINENO} info: "SUCCESS - all modules processed successfuly"
-      log ${LINENO} info: exit_status 0
-      echo 0 > $EXIT_CODE_TMP
-
-    else
-      log ${LINENO} error: "FAILURE - some modules could not be processed"
-      log ${LINENO} error: exit_status 1
-      echo 1 > $EXIT_CODE_TMP
-
-    fi
-
-    killtree -KILL $MYPID
-
-  fi
-}
-
-is_any_ssd_left_in_queue_for_mux() {
-   export MUX_INDEX=$1
-   QSEQ=$(cat $QSEQ_TMP)
-   tail -n +$(($QSEQ+1)) $CONNECT_Q_TMP | cut -f 1 -d ' ' | grep -q -e '^'$MUX_INDEX'$'
-}
-
-# switch esata connections sequentially reading from $CONNECT_Q_TMP
-connect_q_run() {
-
-  log ${LINENO} info: "connect_q_run"
-
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-  tail -f $CONNECT_Q_TMP > $FIFO 2>&1 &
-  local TAIL_PID=$!
-
-  while read INDEXES ; do
-
-    # increment queue sequence number
-    echo $((++QSEQ)) > $QSEQ_TMP
-
-    # parse queue request
-    INDEXES=($INDEXES)
-    MUX_INDEX=${INDEXES[0]}
-    REMOTE_SSD_INDEX=${INDEXES[1]}
-    ISRETRY=${INDEXES[2]}
-
-    # requeue again if other disk of this mux is already connected
-    if [ -f $TMP/${MUX_INDEX}_*_connected ] ; then
-      echo $MUX_INDEX $REMOTE_SSD_INDEX $ISRETRY >> $CONNECT_Q_TMP
-      sleep 10
-      continue
-    fi
-
-    log ${LINENO} debug: connect_q_run processing mux $MUX_INDEX ssd $REMOTE_SSD_INDEX
-
-    while true ; do
-
-      # before requesting disk connection, setup inotifywait and timemout to pause queue until disk is connected or timeout occurs
-      touch $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting || killtree -KILL $MYPID
-
-      INOTIFY_STDERR=$(mktemp)
-      timeout -k 10 30 inotifywait -e close_write $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting > /dev/null 2> $INOTIFY_STDERR &
-      TIMEOUTPID=$!
-      wait_regexp $INOTIFY_STDERR "Watches established" 2>&1 | grep -v -e INOTIFY_STDERR | logstdout ${LINENO}
-
-      # before requesting disk connection, save connecting disk info
-      echo $MUX_INDEX $REMOTE_SSD_INDEX $ISRETRY > $DISK_CONNECTING_TMP
-
-      # request disk connection
-      log ${LINENO} info: requesting sata disk mux $MUX_INDEX index $REMOTE_SSD_INDEX
-      log ${LINENO} debug: wget http://$BASE_IP.${MUXES[$MUX_INDEX]}/103697.php?c:host4=ssd$REMOTE_SSD_INDEX
-      wget -q http://$BASE_IP.${MUXES[$MUX_INDEX]}/103697.php?c:host4=ssd$REMOTE_SSD_INDEX -O - > /dev/null || killtree -KILL $MYPID
-
-      sleep 10
-      add_scsi_device
-
-      # wait for inotifywait and timeout setup above
-      log ${LINENO} info: waiting for mux $MUX_INDEX disk $REMOTE_SSD_INDEX
-      wait $TIMEOUTPID
-      timeout_status=$?
-
-      log ${LINENO} debug: timeout status $timeout_status wating for mux $MUX_INDEX disk $REMOTE_SSD_INDEX
-
-      rm $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting
-
-      # exit loop if there was no timeout
-      [ "$timeout_status" != "124" ] && break
-
-      # timeout on retry ? exit
-      [ -n "$ISRETRY" ] && killtree -KILL $MYPID
-
-      # re-enqueue this mux/ssd pair for later
-      log ${LINENO} debug: requeue mux $MUX_INDEX index $REMOTE_SSD_INDEX single
-      echo $MUX_INDEX $REMOTE_SSD_INDEX isretry >> $CONNECT_Q_TMP
-
-      # ask next ssd index for this mux
-      [ $REMOTE_SSD_INDEX -lt ${MUX_SSD_COUNT[$MUX_INDEX]} ] || break
-      ((++REMOTE_SSD_INDEX))
-
-    done
-  done < $FIFO
-  kill -TERM $TAIL_PID > /dev/null 2>&1
-  rm $FIFO
-}
-
-########### main script
-
-SCSIHOST=()
-
-init "$@"
-
-[ -z "$MOUNTPOINT" ] && MOUNTPOINT=$1 && shift
-
-if [ -z "$MOUNTPOINT" -o "$#" -gt 0 ] ; then
-  usage 1
-fi
-
-checkdependencies
-
-TMP=/tmp/rawdata-downloader/$MACADDR/$$
-mkdir -p $TMP
-
-# create shared variables and inter-process storage
-export EXIT_CODE_TMP=$(mktemp --tmpdir=$TMP)
-export DISK_CONNECTING_TMP=$(mktemp --tmpdir=$TMP)
-export SSD_SERIAL_TMP=$(mktemp --tmpdir=$TMP)
-export REMOVED_DEVICES=$(mktemp --tmpdir=$TMP)
-export CONNECT_Q_TMP=$(mktemp --tmpdir=$TMP)
-export MUX_DONE_TMP=$(mktemp --tmpdir=$TMP)
-export QSEQ_TMP=$(mktemp --tmpdir=$TMP)
-export SSD_SERIAL_DONE_TMP=$(mktemp --tmpdir=$TMP)
-export REMOVED_SCSI_TMP=$TMP/../removed_scsi
-
-echo 1 > $EXIT_CODE_TMP
-echo 0 > $QSEQ_TMP
-echo 0 > $MUX_DONE_TMP
-touch $REMOVED_SCSI_TMP
-
-wait_until_camera_awake
-
-# clear scsi hosts cache if modification time older than camera uptime
-export SCSIHOST_TMP=$TMP/../scsihosts
-if [ -f $SCSIHOST_TMP ] ; then
-  if [ $CAMERA_UPTIME -lt $(modtime $SCSIHOST_TMP) ] ; then
-    echo -n > $SCSIHOST_TMP
-  fi
-else
-  touch $SCSIHOST_TMP
-fi
-
-# set destination folder
-DEST="$MOUNTPOINT/$(echo $MACADDR | tr 'a-f' 'A-F')"
-
-mkdir -p "$DEST/rawdata-downloader" || exit 1
-export MODULES_FILE="$DEST/rawdata-downloader/modules"
-
-export SSHALL_HOSTS=$(build_sshall_login_list)
-
-get_camera_ssd_serials
-
-log ${LINENO} info: got ${#SSD_SERIAL[@]} SSD serials
-
-[ ${#SSD_SERIAL[@]} -ne $MODULES_COUNT ] && exit 1
-
-rm $SSD_SERIAL_TMP
-
-# unmount camera ssd
-log ${LINENO} info: umount CF
-umount_all 2>&1 | logstdout ${LINENO}
-
-# wait for disks and register modules in background
-wait_and_register &
-
-connect_queue_init
-
-# run queue in background
-log ${LINENO} info: starting queue processing
-connect_q_run &
-
-# wait background jobs termination
-wait
-
-# disable ctrl-c
-trap '' SIGINT
-
-# reset multiplexers
-log ${LINENO} info: resetting multiplexers
-reset_eyesis_ide
-
-restore_scsi_devices
-
-EXIT_CODE=$(cat $EXIT_CODE_TMP)
-
-[ $EXIT_CODE -eq 0 ] && echo $MODULES_FILE
-
-# remove temporary files
-rm $TMP -r 2> /dev/null
-
-log ${LINENO} info: exit $EXIT_CODE
-exit $EXIT_CODE
-
diff --git a/src/rawdata-downloader/src/bin/connect-module b/src/rawdata-downloader/src/bin/connect-module
deleted file mode 100755
index 4fb98d0..0000000
--- a/src/rawdata-downloader/src/bin/connect-module
+++ /dev/null
@@ -1,461 +0,0 @@
-#!/bin/bash
-#
-# connect-module - connect requested eyesis module
-#
-# Copyright (c) 2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# Contributor(s):
-#
-#       Kevin Velickovic <k.velickovic@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-#set -e
-
-MYPID=$BASHPID
-
-LOG_HEADER=connect-module
-. $(dirname $0)/rawdata-toolbox.sh
-
-# parse command line options and set environment variables
-init() {
-
-  assert_root
-  no_concurrency sleep
-
-  # set default values
-  MOUNTPOINT=/data
-  BASE_IP=192.168.0
-  MASTER_IP=221
-  _MUXES="224 228"
-  _MUX_SSD_COUNT="4 5"
-  SPOOL=/var/spool/rawdata-downloader
-
-  # load rawdata-downloader preferences
-  [ -f /etc/defaults/rawdata-downloader ] && . /etc/defaults/rawdata-downloader
-
-  # parse command line
-  if ! options=$(getopt -o hvm:I:i:M:c:nd -l help,verbose,mountpoint:,baseip:,masterip,muxes,ssdcount,no-checklist,debug: -- "$@")
-  then
-      # something went wrong, getopt will put out an error message for us
-      exit 1
-  fi
-
-  eval set -- "$options"
-
-  while [ $# -gt 0 ] ; do
-      case $1 in
-      -h|--help) usage 1 ;;
-      -v|--verbose) VERBOSE=-v ;;
-      -m|--mountpoint) MOUNTPOINT=$2 ; shift ;;
-      -I|--baseip) BASE_IP=$2 ; shift ;;
-      -i|--masterip) MASTER_IP=$2 ; shift ;;
-      -M|--muxes) _MUXES="$2" ; shift ;;
-      -c|--ssdcount) _MUX_SSD_COUNT="$2" ; shift ;;
-      -n|--no-checklist) NO_CHECKLIST=true ;;
-      -d|--debug) DEBUG=1 ;;
-      (--) shift; break;;
-      (-*) echo "$(basename $0): error - unrecognized option $1" 1>&2; exit 1;;
-      (*) break;;
-      esac
-      shift
-  done
-
-  MODULES_COUNT=$(get_module_count)
-
-  get_camera_macaddr
-  get_modules_file
-
-  # remaining parameter is the requested module number
-  [ -z "$MODULE" ] && MODULE=$1 && shift
-
-  # ... or die
-  if [ -z "$MODULE" ] ; then
-    usage 1
-  fi
-
-  # ... or die
-  [ $# -gt 0 ] && usage 1
-
-  mkdir -p $SPOOL || exit 1
-
-  debugmode_update
-
-}
-
-checkdependencies() {
-  assertcommands inotifywait arp wget ssh sshall /usr/sbin/scsi-disk-udev-eventhandler
-  if [ ! -f /etc/udev/rules.d/90-rawdata-downloader.rules ] ; then
-    echo file not found: /etc/udev/rules.d/90-rawdata-downloader.rules >&2
-    exit 1
-  fi
-}
-
-usage() {
-  cat >&2 << EOF
-
-SYNOPSIS:
-
-  $(basename $0) [OPTION ...] <camera_module_index>
-
-DESCRIPTION: 
-  
-  Request the Eysesis4PI esata multiplexer to activate the SSD related to
-  the specified camera module index, and return the device path.
-
-OPTIONS SUMMARY:
-
-  -h|--help                   display this
-  -v|--verbose                verbose output
-  -d|--debug                  enable debugging mode
-  -m|--mountpoint <path>      parent location of the 'camera' directory
-  -I|--baseip <base_ip>       base ip, defaults to 192.168.0
-  -i|--masterip <master_ip>   master camera ip, defaults to 221
-  -M|--muxes "<mux_ip> ..."   esata multiplexer ip list, defaults to "224 228"
-  -c|--diskcount "<n> ..."     esata multiplexers disk count, defaults to "4 5"
-  -n|--nochecklist            dont check camera uptime first
-  <camera_module_index>       the camera module index wanted
-
-EOF
-  exit $1
-}
-
-get_local_disk_serials() {
-  for DEV in $(ls /dev/sd* | egrep -v '[0-9]$') ; do
-    echo $DEV,$(hdparm -i $DEV | sed -r -n -e 's/.*SerialNo=([^ ]+).*/\1/p')
-  done
-}
-
-# get module info (mux index serial) from module number
-get_module_info() {
-  local MODULE_NUMBER=$1
-  grep -E -e "^$MODULE_NUMBER " $MODULES_FILE
-}
-
-# compare specified module details with saved one
-check_module_address() {
-  local MUX_INDEX=$1
-  local REMOTE_SSD_INDEX=$2
-  local SERIAL=$3
-  # return error if serial is not matching saved one for mux/ssd pair
-  grep -q -E -e " $MUX_INDEX $REMOTE_SSD_INDEX $SERIAL\$" $MODULES_FILE
-}
-
-# wait udev generated file in spool folder for requested module device  before exiting
-wait_and_exit() {
-
-  log ${LINENO} debug: "waiting for udev generated file in $SPOOL"
-
-  # use FIFO instead of PIPE, to exit loop smoothly and avoid messing with environment variables
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-  inotifywait -m -e close_write $SPOOL 2>/dev/null > $FIFO &
-  local INOTIFY_PID=$!
- 
-  while read l ; do
-    log ${LINENO} debug: $SPOOL INOTIFY $l
-
-    # second string returned by inotifywait is filename (disk serial)
-    event=($l)
-    SERIAL=${event[2]}
-
-    # get spool filename
-    UDEVINFO=$SPOOL/${event[2]}
-
-    # get scsi host from spool filename
-    SCSIHOST=$(get_hbtl $UDEVINFO)
-    [ -z "$SCSIHOST" ] && killtree -KILL $MYPID
-
-    # get saved connecting disk info
-    DISK_CONNECTING_INFO=($(cat $DISK_CONNECTING_TMP))
-    _MUX_INDEX=${DISK_CONNECTING_INFO[0]}
-    _REMOTE_SSD_INDEX=${DISK_CONNECTING_INFO[1]}
-    ISRETRY=${DISK_CONNECTING_INFO[2]}
-    DEVICE=$(grep DEVNAME "$UDEVINFO" | cut -f 2 -d '=')
-
-    log ${LINENO} debug: device_connected $_MUX_INDEX $_REMOTE_SSD_INDEX $SCSIHOST $SERIAL $DEVICE
-
-    log ${LINENO} debug: unpause connect queue         
-    touch $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting || killtree -KILL $MYPID                                   
-
-    [ "$_MUX_INDEX" != "$MUX_INDEX" ] && continue
-    [ "$_REMOTE_SSD_INDEX" != "$REMOTE_SSD_INDEX" ] && continue
-
-    # assert previously saved module address match the connecting disk
-    if ! check_module_address $_MUX_INDEX $_REMOTE_SSD_INDEX $SERIAL 2>&1 | logstdout ${LINENO} ; then
-      log ${LINENO} error: invalid_address "saved serial for mux $MUX_INDEX ssd $REMOTE_SSD_INDEX is not matching  $SERIAL"
-
-    else
-      # success
-      echo $DEVICE
-      echo 0 > $EXIT_CODE_TMP
-
-    fi
-
-    # kill inotify so that break can exit loop
-    kill $INOTIFY_PID > /dev/null 2>&1
-    wait $INOTIFY_PID > /dev/null 2>&1
-
-    break
-
-  done < $FIFO
-
-  killtree -KILL $MYPID
-}
-
-wait_watches_established() {
-
-  local INOTIFY_STDERR=$1
-  local msg
-
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-  tail -f $INOTIFY_STDERR > $FIFO 2>&1 &
-  local TAIL_PID=$!
-
-  while read msg ; do
-    echo $msg | logstdout ${LINENO}
-    [[ "$msg" =~ "Watches established" ]] && break
-  done < $FIFO
-
-  kill $TAIL_PID > /dev/null 2>&1
-  wait $TAIL_PID > /dev/null 2>&1
-
-  rm $INOTIFY_STDERR $FIFO
-}
-
-# request esata connection for MUX_INDEX / REMOTE_SSD_INDEX
-request_ssd() {
-
-    local MUXES=($_MUXES)
-    MUX_INDEX=$MUX_INDEX
-
-    if [ $MUX_INDEX -gt ${#MUXES[@]} ] ; then
-      log ${LINENO} error: "mux index out of range"
-      killtree -KILL $MYPID
-    fi
-
-    REMOTE_SSD_INDEX=$REMOTE_SSD_INDEX
-    ISRETRY=
-
-    log ${LINENO} debug: going to request mux $MUX_INDEX ssd $REMOTE_SSD_INDEX
-
-    while true ; do
-
-      # before requesting disk connection, setup inotifywait and timemout to pause queue until disk is connected or timeout occurs
-      touch $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting || killtree -KILL $MYPID
-
-      INOTIFY_STDERR=$(mktemp)
-      timeout -k 10 30 inotifywait -e close_write $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting > /dev/null 2> $INOTIFY_STDERR &
-      TIMEOUTPID=$!
-      wait_watches_established $INOTIFY_STDERR 2>&1 | grep -v -e INOTIFY_STDERR | logstdout ${LINENO}
-
-      # before requesting disk connection, save connecting disk info
-      echo $MUX_INDEX $REMOTE_SSD_INDEX $ISRETRY > $DISK_CONNECTING_TMP
-
-      # request disk connection
-      log ${LINENO} debug: requesting sata disk mux $MUX_INDEX index $REMOTE_SSD_INDEX
-      log ${LINENO} debug: wget http://$BASE_IP.${MUXES[$MUX_INDEX]}/103697.php?c:host4=ssd$REMOTE_SSD_INDEX
-      wget -q http://$BASE_IP.${MUXES[$MUX_INDEX]}/103697.php?c:host4=ssd$REMOTE_SSD_INDEX -O - > /dev/null || killtree -KILL $MYPID
-
-      # wait for inotifywait and timeout setup above
-      log ${LINENO} debug: waiting for mux $MUX_INDEX disk $REMOTE_SSD_INDEX
-      wait $TIMEOUTPID 2> /dev/null
-      timeout_status=$?
-
-      log ${LINENO} debug: timeout "status $timeout_status wating for mux $MUX_INDEX disk $REMOTE_SSD_INDEX"
-
-      rm $TMP/${MUX_INDEX}_${REMOTE_SSD_INDEX}_connecting
-
-      # exit loop if there was no timeout
-      [ "$timeout_status" != "124" ] && break
-
-      # timeout on retry ? exit
-      if [ -n "$ISRETRY" ] ; then
-        log ${LINENO} error: "connection retry failed for mux $MUX_INDEX disk $REMOTE_SSD_INDEX"
-        killtree -KILL $MYPID
-      fi
-
-      ISRETRY=yes
-
-    done
-
-} # run
-
-########### main script
-
-init "$@"
-
-SCSIHOST=()
-
-checkdependencies
-
-TMP=/tmp/mount_module/$MACADDR/$$
-mkdir -p $TMP
-
-# create shared variables and inter-process storage
-MYPID=$BASHPID
-EXIT_CODE_TMP=$(mktemp --tmpdir=$TMP)
-DISK_CONNECTING_TMP=$(mktemp --tmpdir=$TMP)
-SSD_SERIAL_TMP=$TMP/../serials
-
-echo 1 > $EXIT_CODE_TMP
-
-trap "killtree -9 $MYPID yes" SIGINT SIGKILL SIGTERM SIGHUP
-
-SCSIHOST_TMP=$TMP/../scsihosts
-
-if [ -z "$NO_CHECKLIST" ] ; then
-
-  log ${LINENO} info: check camera is awake
-  wait_until_camera_awake
-
-  log ${LINENO} info: check camera ssh access
-  assert_remote_ssh_servers_functional
-
-fi
-
-touch $SCSIHOST_TMP
-
-MODULE_INFO=($(get_module_info $MODULE))
-if [ -z "$MODULE_INFO" ] ; then
-  log ${LINENO} error: "could not get info for module $MODULE" 
-  exit 1
-fi
-
-SERIAL=${MODULE_INFO[3]}
-
-# return device path if already connected
-for pair in $(get_local_disk_serials) ; do 
-
-  pair=($(echo $pair | tr ',' ' '))
-
-  # is requested module ssd is already connected ?
-  if [ "$SERIAL" == "${pair[1]}" ] ; then
-    # then print device and exit
-    echo "${pair[0]}"
-    exit 0
-  fi
-    
-done
-
-# read serials from cache
-[ -s "$SSD_SERIAL_TMP" ] && . $SSD_SERIAL_TMP
-
-# if serial is not known yet
-if [ -z "${SSD_SERIAL[$((MODULE-1))]}" ] ; then
-
-  # configure sshall login "list" for requested module
-  export SSHALL_HOSTS="root@$BASE_IP.$((MASTER_IP + MODULE - 1))"
-
-  # get camera ssd serial
-  log ${LINENO} debug: get ssd serial
-  SSD_SERIAL=()
-  export SSD_SERIAL_TMP
-  export MASTER_IP
-  export MYPID
-  touch $SSD_SERIAL_TMP || exit 1
-
-  get_remote_disk_serial /dev/hda 2>&1 | while read l ; do
-    msg=($l)
-    if [ ${msg[0]} != "sshall:" ] ; then
-      log ${LINENO} debug: get_remote_disk_serial: $l
-      continue
-    fi
-    [ ${msg[2]} = "stderr" ] && log ${LINENO} error: get_remote_disk_serial: $l
-    LOGIN=${msg[1]}
-    [ -z "$LOGIN" ] && log ${LINENO} error: get_remote_disk_serial: $l && killtree -KILL $MYPID
-    IP=$(echo $LOGIN | sed -r -n -e 's/.*@[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+).*/\1/p')
-    INDEX=$(expr $IP - $MASTER_IP)
-    WHAT=${msg[2]}
-    case "$WHAT" in
-    status)
-      STATUS=${msg[3]}
-      if [ "$STATUS" != "0" ] ; then
-        log ${LINENO} error: "$l"
-        log ${LINENO} error: "hdparm failed on camera $IP with exit code $STATUS"
-        killtree -KILL $MYPID yes
-      fi
-      ;;
-    stdout)
-      # save serial cache for parent process
-      SERIAL=${msg[3]}
-      echo SSD_SERIAL[$INDEX]=$SERIAL >> $SSD_SERIAL_TMP
-      ;;
-    esac
-  done
-
-fi
-
-# load serials cache
-. $SSD_SERIAL_TMP
-
-# assert serial returned by the camera match the one in MODULES_FILE
-if [ "${SSD_SERIAL[$((MODULE-1))]}" != "$SERIAL" ] ; then
-  log ${LINENO} error: ssd serial mismatch "(${SSD_SERIAL[$((MODULE-1))]}" '!=' "$SERIAL)"
-  exit 1
-fi
-
-# unmount camera ssd
-log ${LINENO} debug: umount CF
-umount_all 2>&1 | logstdout ${LINENO}
-
-# module address
-MUX_INDEX=${MODULE_INFO[1]}
-REMOTE_SSD_INDEX=${MODULE_INFO[2]}
-
-# run backgroud task waiting for disk
-wait_and_exit &
-
-log ${LINENO} debug: starting processing
-
-# request disk
-request_ssd &
-
-# wait background jobs termination
-wait 2> /dev/null
-
-# disable ctrl-c
-trap '' SIGINT
-
-EXIT_CODE=$(cat $EXIT_CODE_TMP)
-
-# remove temporary files
-rm $TMP/$$ -r 2> /dev/null
-
-# kill zombies
-killtree -KILL $MYPID
-
-log ${LINENO} info: exit $EXIT_CODE
-exit $EXIT_CODE
diff --git a/src/rawdata-downloader/src/bin/format-camera b/src/rawdata-downloader/src/bin/format-camera
deleted file mode 100755
index 071b36d..0000000
--- a/src/rawdata-downloader/src/bin/format-camera
+++ /dev/null
@@ -1,262 +0,0 @@
-#!/bin/bash
-
-MYPID=$BASHPID
-
-. $(dirname $0)/rawdata-toolbox.sh
-
-usage() {
-  cat >&2 << EOF
-
-SYNOPSIS:
-
-  $(basename $0) [OPTION ...]
-
-DESCRIPTION:
-
-  Format the camera hard disks, checking everything has been copied before
-
-OPTIONS SUMMARY:
-
-  -h|--help                   display this
-  -m|--mountpoint <path>      parent location of the 'camera' directory
-  -I|--baseip <base_ip>       base ip, defaults to 192.168.0
-  -i|--masterip <master_ip>   master camera ip, defaults to 221
-  -f|--force                  dont check files have been copied
-  -s|--ssh                    use ssh instead of SATA
-
-EOF
-  exit $1
-
-}
-
-init() {
-
-  # defaults
-  MOUNTPOINT=/data
-  BASE_IP=192.168.0                                                                                                                                                                                                
-  MASTER_IP=221
-
-  # load rawdata-downloader preferences
-  [ -f /etc/defaults/rawdata-downloader ] && . /etc/defaults/rawdata-downloader
-
-  # parse command line options
-  if ! options=$(getopt -o hm:i:I:fs -l help,mountpoint:,baseip:,masterip:,force,ssh -- "$@")
-  then
-      # something went wrong, getopt will put out an error message for us
-      exit 1
-  fi
-
-  eval set -- "$options"
-
-  while [ $# -gt 0 ] ; do
-      case $1 in
-      -h|--help) usage 1 ;;
-      -m|--mountpoint) MOUNTPOINT=$2 ; shift ;;
-      -I|--baseip) BASE_IP=$2 ; shift ;;
-      -i|--masterip) MASTER_IP=$2 ; shift ;;
-      -f|--force) FORCE=yes ;;
-      -s|--ssh) USE_SSH=yes ; FORCE=yes ;;
-      (--) shift; break;;
-      (-*) echo "$(basename $0): error - unrecognized option $1" 1>&2; exit 1;;
-      (*) break;;
-      esac
-      shift
-  done
-
-  if [ -n "$FORCE" ] ; then
-    while true ; do
-      echo -n "Format the camera inconditionally [yes/NO] ? "
-      read answer
-      case "$answer" in
-        yes) break ;;
-        *) exit 2 ;;
-      esac
-    done
-  fi
-
-  if [ ! -d "$MOUNTPOINT" ] ; then
-      log ${LINENO} error: "Mountpoint '$MOUNTPOINT' is not a directory"
-      usage 1
-  fi
-
-}
-
-format_using_ssh() {
-
-  log ${LINENO} info: checking camera status
-  wait_until_camera_awake
-      
-  log ${LINENO} info: checking network connectivity
-  assert_remote_ssh_servers_functional
-
-  get_camera_ssd_serials
-  log ${LINENO} info: got ${#SSD_SERIAL[@]} SSD serials
-  [ ${#SSD_SERIAL[@]} -ne $MODULES_COUNT ] && exit 1                                                                                                                                                                 
-  umount_all
-
-  sshall_mkfs
-
-  log ${LINENO} info: success
-
-  exit 0
-}
-
-sshall_mkfs() {
-  log ${LINENO} info: "sending format command"
- 
-  STATUS=()
-  SSD_SERIAL=()
- 
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-
-  HOSTS=$(build_sshall_login_list) sshall /sbin/mkfs.ext2 -q -m0 -T largefile4 /dev/hda1  > $FIFO 2>&1 & 
-  local PIPE_PID=$!
- 
-  local l
-  local msg
-  local LOGIN
-  local INDEX
-  local WHAT
-  local COUNT=0
- 
-  while read l ; do
-    msg=($l)
-    [ ${msg[0]} = "sshall:" ] || continue
-    if [ ${msg[2]} = "stderr" ] ; then
-      echo $l | grep -q "Could not determine if .dev.hda1 is mounted" || log ${LINENO} $l
-    fi
-    LOGIN=${msg[1]}
-    [ -z "$LOGIN" ] && log ${LINENO} error: sshall_mkfs: $l && killtree -KILL $MYPID
-    IP=$(echo $LOGIN | sed -r -n -e 's/.*@[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+).*/\1/p')
-    INDEX=$(expr $IP - $MASTER_IP)
-    WHAT=${msg[2]}
-    case "$WHAT" in
-    status)
-      STATUS=${msg[3]}
-      if [ "${STATUS}" != "0" ] ; then 
-        log ${LINENO} error: "mkfs failed for module $INDEX on $IP"
-        killtree -KILL $MYPID
-      else
-        log ${LINENO} info: "module $INDEX formatted successfuly"
-        ((++COUNT))
-      fi
-      ;;
-    stdout)
-      log ${LINENO} info: $l
-      ;;
-    esac
-  done < $FIFO
-
-  rm $FIFO
-  kill $PIPE_PID > /dev/null 2>&1
-
-  if [ "$COUNT" != "$MODULES_COUNT" ] ; then
-    log ${LINENO} error: "format failed !"
-    diagnostic_message
-    kill_log_tail
-    exit 1
-  fi
-}
- 
-log() {
-    echo $(date +%F_%R:%S) $LOG_HEADER $BASHPID $@ >&2
-}
-
-kill_old_job() {
-
-  local JOBNAME="$1"
-  local PIDFILE="$2"
-
-  # read PIDFILE
-  [ -s "$PIDFILE" ] && local OLDPID=$(cat $PIDFILE)
-
-  # kill running process with this id if job name matches $JOBNAME
-  if [ -n "$OLDPID" ] && [ -f /proc/$OLDPID/status ] && [ "$(grep Name /proc/$OLDPID/status 2>/dev/null | cut -f 2)" == "$JOBNAME" ] ; then
-    echo "killing old $JOBNAME process with PID $OLDPID"
-    kill $OLDPID
-  fi
-
-}
-
-kill_log_tail() {
-  # stop kernel log backup
-  kill $LOGTAIL2_PID > /dev/null 2>&1
-
-  # stop log display
-  kill $LOGTAIL_PID > /dev/null 2>&1
-}
-
-diagnostic_message() {
-  sync
-  if grep -q "ssh_servers_functional failed" $LOGFILE ; then
-    log ${LINENO} diag: "SSH CONNECTION FAILED - CHECK NETWORK CABLES AND SETTINGS"
-  fi
-  if grep -q "hdparm failed" $LOGFILE ; then
-    log ${LINENO} diag: "DISK NOT FOUND - REBOOT THE CAMERA"
-  fi
-
-  if [ -z "$USE_SSH" ] ; then
-    if grep -q "DID_BAD_TARGET" $KERNEL_LOG ; then
-      log ${LINENO} diag: "HOTSWAP FAILURE - FIX THE KERNEL OR REBOOT COMPUTER"
-    fi
-  fi
-}
-
-init "$@"
-
-LOG_DATE=$(date +%F%R%S | sed -r -e 's/[-\:]//g')
-
-if [ -z "$FORCE" ] ; then
-  # assert camera content match corresponding destination files under MOUNTPOINT
-  rawdata-compare $MOUNTPOINT || exit
-fi
-
-LOG_HEADER=$(basename $0)
-
-LOGDIR=/var/log/$LOG_HEADER
-
-# create log file
-LOGFILE=$LOGDIR/${LOG_HEADER}_${LOG_DATE}.log
-mkdir -p $(dirname $LOGFILE) || exit
-touch $LOGFILE || exit
-
-# display log file on console
-tail -f $LOGFILE | egrep -v ' debug: ' >&2 &
-LOGTAIL_PID=$!
-
-# get rid of "terminated" message on kill
-disown $LOGTAIL_PID
-
-# kill old tail process used to display log on console, if any
-LOGTAIL_PIDFILE=/var/run/${LOG_HEADER}_logger.pid
-kill_old_job tail $LOGTAIL_PIDFILE
-echo $LOGTAIL_PID > $LOGTAIL_PIDFILE
-
-if [ -n "$USE_SSH" ] ; then
-  format_using_ssh
-  exit
-fi
-
-# save /var/log/kern.log
-KERNEL_LOG=$LOGDIR/${LOG_HEADER}_${LOG_DATE}.kern.log
-touch $KERNEL_LOG || exit
-tail -f -n0 /var/log/kern.log > $KERNEL_LOG &
-LOGTAIL2_PID=$!
-
-# get rid of "terminated" message on kill
-disown $LOGTAIL2_PID
-
-# kill old tail process used to copy kern.log, if any
-LOGTAIL2_PIDFILE=/var/run/${LOG_HEADER}_logger.kern.pid
-kill_old_job tail $LOGTAIL2_PIDFILE
-echo $LOGTAIL2_PID > $LOGTAIL2_PIDFILE
-
-process-modules --all --verbose --mountpoint $MOUNTPOINT format-module 2> $LOGFILE
-
-EXIT_CODE=$?
-
-[ $EXIT_CODE -ne 0 ] && diagnostic_message
-kill_log_tail
-
-exit $EXIT_CODE
diff --git a/src/rawdata-downloader/src/bin/format-module b/src/rawdata-downloader/src/bin/format-module
deleted file mode 100755
index 9c916c9..0000000
--- a/src/rawdata-downloader/src/bin/format-module
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# format-module - reformat eyesis module
-# This script is intended to be used as the <script> parameter for process-modules
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-mkfs.ext2 -q -m0 -T largefile4 ${DEVICE}1 2>&1 | logstdout ${LINENO} mkfs $MODULE :
-EXIT_CODE=${PIPESTATUS[0]}
-NO_CHECKLIST=true
-return $EXIT_CODE
diff --git a/src/rawdata-downloader/src/bin/get-module-master_timestamp b/src/rawdata-downloader/src/bin/get-module-master_timestamp
deleted file mode 100755
index 66f3635..0000000
--- a/src/rawdata-downloader/src/bin/get-module-master_timestamp
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-#
-# get-module-master_timestamp - get master timestamp from camera module
-# This script is intended to be used as the <script> parameter for process-modules
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-PARTNUM=1
-PARTITION=${DEVICE}$PARTNUM
-MODULE_INDEX=$MODULE
-FSTYPE=ext2
-LOG_HEADER=get-module-master_timestamp
-
-# create mountpoint directory
-PARTITION_MOUNTPOINT=/mnt/$(basename $PARTITION)
-mkdir -p $PARTITION_MOUNTPOINT 2>&1 | logstdout ${LINENO}
-[ ${PIPESTATUS[0]} -ne 0 ] && return 1
-
-# disable NCQ
-if [ -n "$DISABLE_NCQ" ] ; then
-  log ${LINENO} info: disabling NCQ $SERIAL ${DEVICE}$PARTNUM
-  echo 1 > /sys/block/$(basename $DEVICE)/device/queue_depth
-fi
-
-# if process is exiting, just wait for kill
-[ -n "$QUITTING_TMP" ] &&  while [ "$(cat $QUITTING_TMP)" -eq 1 ] ; do sleep 100000 ; done
-
-log ${LINENO} info: checking module $MODULE disk integrity
-
-# check / repair filesystem (-p is safe)
-fsck -p $PARTITION | logstdout ${LINENO}
-if [ ${PIPESTATUS[0]} -gt 1 ] ; then
-  log ${LINENO} error: "fsck failed for module $MODULE_INDEX"
-  return 1
-fi
-
-# if fsck -p fails, we could make a disk image and fsck -y the disk image,
-# then mount it 
-#
-# fsck exit code is the sum of the following conditions
-#            0    - No errors
-#            1    - Filesystem errors corrected
-#            2    - System should be rebooted
-#            4    - Filesystem errors left uncorrected
-#            8    - Operational error
-#            16   - Usage or syntax error
-#            32   - Fsck canceled by user request
-#            128  - Shared-library error
-
-# mount device read-only
-log ${LINENO} info: mount disk of module $MODULE_INDEX on $PARTITION_MOUNTPOINT
-mount -t $FSTYPE -o ro $PARTITION $PARTITION_MOUNTPOINT 2>&1 | logstdout ${LINENO}
-if [ ${PIPESTATUS[0]} -ne 0 ] ; then
-   log ${LINENO} error: "mount disk failed for module $MODULE_INDEX"
-   return 1
-fi
-
-log ${LINENO} info: search for master timestamp
-MASTER_TS=$(get_master_timestamp $PARTITION_MOUNTPOINT)
-
-if [ -z "$MASTER_TS" ] ; then
-  log ${LINENO} error: "cannot get master timestamp from $PARTITION_MOUNTPOINT"
-
-  # unmount partition on failure
-  log ${LINENO} info: unmounting $PARTITION_MOUNTPOINT
-  umount $PARTITION_MOUNTPOINT 2>&1 | logstdout ${LINENO}
-  if [ ${PIPESTATUS[0]} -ne 0 ] ; then
-     log ${LINENO} error: "unmounting $PARTITION_MOUNTPOINT failed"
-  fi
-
-  return 1
-
-fi
-
-echo $MASTER_TS
-log ${LINENO} info: master timestamp is $MASTER_TS
diff --git a/src/rawdata-downloader/src/bin/process-modules b/src/rawdata-downloader/src/bin/process-modules
deleted file mode 100755
index da5d269..0000000
--- a/src/rawdata-downloader/src/bin/process-modules
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/bin/bash
-#
-# process-modules - run the specified command for every Eyesis4PI module specified
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-
-export PROCESSMODULES_PARENT_SCRIPT=$LOG_PREFIX
-export LOG_PREFIX=$(basename $0)
-
-. $(dirname $0)/rawdata-toolbox.sh                                                                                    
-__PROCESS_ALL_DISKS__=$(basename $0)
-
-export MYPID=$BASHPID
-
-trap "killtree -9 $MYPID yes" SIGINT SIGKILL SIGTERM SIGHUP
-
-# parse command line and set default values
-init() {
-
-  # defaults
-  MOUNTPOINT=/data
-  BASE_IP=192.168.0
-  MASTER_IP=221
-  VERBOSE=-v
-
-  # load rawdata-downloader preferences
-  [ -f /etc/defaults/rawdata-downloader ] && . /etc/defaults/rawdata-downloader
-
-  # parse command line options
-  if ! options=$(getopt -o hm:I:i:vdas -l help,mountpoint:,baseip:,masterip:,verbose,debug,all,sequentially -- "$@")
-  then
-      # something went wrong, getopt will put out an error message for us
-      exit 1
-  fi
-
-  eval set -- "$options"
-
-  while [ $# -gt 0 ] ; do
-      case $1 in
-      -h|--help) usage 1 ;;
-      -m|--mountpoint) MOUNTPOINT=$2 ; shift ;;
-      -v|--verbose) VERBOSE=-v ;;
-      -I|--baseip) BASE_IP=$2 ; shift ;;
-      -i|--masterip) MASTER_IP=$2 ; shift ;;
-      -d|--debug) DEBUG=-d ;;
-      -a|--all) ALL=yes ;;
-      -s|--sequentially) SEQUENTIALLY=yes ;;
-      (--) shift; break;;
-      (-*) echo "$(basename $0): error - unrecognized option $1" 1>&2; exit 1;;
-      (*) break;;
-      esac
-      shift
-  done
-
-  debugmode_update
-  get_camera_macaddr
-  get_modules_file
-
-  TMPDIR=/tmp/$__PROCESS_ALL_DISKS__/$$
-  mkdir -p $TMPDIR || exit
-
-  PROCESSED_LIST=$(mktemp --tmpdir=$TMPDIR)
-
-  if [ $# -eq 0 ] ; then
-    log ${LINENO} error: "missing parameter: <script>"
-    usage 1
-  fi
-  CHILD_SCRIPT=$(which $1)
-  shift
-
-  if [ ! -f "$CHILD_SCRIPT" ] ; then
-    log ${LINENO} error: "script not found: $CHILD_SCRIPT"
-    exit 1
-  fi
-
-  # set modules count from modules file if --all specified,
-  if [ -n "$ALL" ] ; then
-
-    if [ $# -gt 0 ] ; then
-      log ${LINENO} error: "extra parameters: $@"
-      usage 1
-    fi
-
-    MODULES_COUNT=$(cat $MODULES_FILE | wc -l)
-
-  else
-
-    # get module list and count from command line
-
-    if [ $# -eq 0 ] ; then
-      log ${LINENO} error: "missing parameter: <module_index>"
-      usage 1
-    fi
-
-    MODULE_LIST=$@
-    MODULES_COUNT=$#
-
-  fi
-
-}
-
-usage() {
-  cat >&2 << EOF
-
-SYNOPSIS:
-
-  $(basename $0) [OPTION ...] <script> [ -a|--all | <module_index> ...]"
-
-DESCRIPTION: 
-  
-  Source the specified script for every Eyesis4PI module specified
-
-OPTIONS SUMMARY:
-
-  -h|--help                   display this
-  -v|--verbose                verbose output
-  -m|--mountpoint <path>      parent location of the 'camera' directory
-  -I|--baseip <base_ip>       base ip, defaults to 192.168.0
-  -i|--masterip <master_ip>   master camera ip, defaults to 221
-  -a|--all                    process all modules
-  <script>                    script to be sourced
-  <module_index>              camera module index (mutually exclusive with -a)
-
-EOF
-  exit $1
-}
-
-# source $CHILD_SCRIPT for each module index specified as parameter
-process_module_list() {
-
-  module_list=$@
-
-  for MODULE in $module_list  ; do
-
-    log ${LINENO} info: module $MODULE connecting
-
-    # request module to multiplexer and get device path
-    DEVICE=$(connect-module $VERBOSE $NOCHECKLIST $MODULE --mountpoint $MOUNTPOINT)
-    if [ -z "$DEVICE" ] ; then
-      log ${LINENO} error: failed to connect esata multiplexer $(get_mux_index $MODULE) to module $MODULE
-      killtree -KILL $MYPID yes
-      break
-    fi
-
-    log ${LINENO} info: module $MODULE connecting : success
-    # dont lose time with camera checklist before requesting next modules
-    NOCHECKLIST=--no-checklist
-
-    # if already mounted, try to unmount device
-    if mount | grep -q ${DEVICE}1 ; then
-      log ${LINENO} info: unmount ${DEVICE}1
-      if ! umount ${DEVICE}1 2>/dev/null || umount -f ${DEVICE}1 2>/dev/null ; then
-        log ${LINENO} error: "could not unmount ${DEVICE}"
-        killtree -KILL $MYPID yes
-        break
-      fi
-    fi
-
-    # run specified script using "source" so that it can access to everything defined here
-    log ${LINENO} info: "module $MODULE $CHILD_SCRIPT"
-
-    LOG_PREFIX=$(basename $CHILD_SCRIPT)
-
-    source $CHILD_SCRIPT
-    EXIT_CODE=$?
-
-    # reset log prefix
-    LOG_PREFIX=$(basename $0)
-
-    if [ $EXIT_CODE -eq 0 ] ; then
-      log ${LINENO} info: "module $MODULE $CHILD_SCRIPT : success"
-      echo "${MODULE}" >> $PROCESSED_LIST
-    else
-      log ${LINENO} error: "module $MODULE $CHILD_SCRIPT : failed"
-      killtree -KILL $MYPID yes
-      break
-    fi
-
-  done
-
-}
-
-main() {
-
-  init "$@"
-
-  _muxindex=0
-
-  if [ -n "$ALL" ] ; then
-
-    # process all modules
-    while true ; do
-      module_list=$(get_modules_list_for_multiplexer $_muxindex)
-      [ -z "$module_list" ] && break
-      process_module_list $module_list &
-
-      # wait for background process here if processing muxes sequentially
-      [ -n "$SEQUENTIALLY" ] && wait
-
-      ((++_muxindex))
-
-    done
-
-    # wait for background processes here if processing all muxes in parallel
-    [ -z "$SEQUENTIALLY" ] && wait
-
-  else
-    # process specified modules
-    process_module_list $MODULE_LIST &
-    wait
-
-  fi
-
-  # display processing status and exit
-  #
-
-  PROCESSED_COUNT=$(cat $PROCESSED_LIST | wc -l)
-  rm $PROCESSED_LIST
-
-  if [ "$MODULES_COUNT" != "$PROCESSED_COUNT" ] ; then
-    log ${LINENO} error: failed: $PROCESSED_COUNT disks processed $PROCESSED_COUNT
-    exit 1
-  fi
-
-  log ${LINENO} info: success: $PROCESSED_COUNT disks processed
-  exit 0
-
-}
-
-main "$@"
diff --git a/src/rawdata-downloader/src/bin/rawdata-compare b/src/rawdata-downloader/src/bin/rawdata-compare
deleted file mode 100755
index 0124451..0000000
--- a/src/rawdata-downloader/src/bin/rawdata-compare
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-source $(dirname $0)/rawdata-downloader
diff --git a/src/rawdata-downloader/src/bin/rawdata-downloader b/src/rawdata-downloader/src/bin/rawdata-downloader
deleted file mode 100755
index 22eb801..0000000
--- a/src/rawdata-downloader/src/bin/rawdata-downloader
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/bin/bash
-#
-# rawdata-procedures - Camera raw data procedures
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# Contributor(s):
-#
-#       Kevin Velickovic <k.velickovic@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-
-# WARNING: this file is either run directly or sourced from rawdata-compare
-
-_UID=$UID
-_GID=1000
-
-export LOG_PREFIX=$(basename $0)
-
-LOGDIR=/var/log/$LOG_PREFIX
-mkdir -p $LOGDIR || exit
-
-log() {
-  echo $(date +%F_%R:%S) $LOG_PREFIX $BASHPID $@ >&2
-}
-
-# format stdin for logginG
-logstdout() {
-  while read l ; do
-    echo $(date +%F_%R:%S) $LOG_PREFIX $BASHPID $@ $l >&2
-  done
-}
-
-kill_old_job() {
-
-  local JOBNAME="$1"
-  local PIDFILE="$2"
-
-  # read PIDFILE
-  [ -s "$PIDFILE" ] && local OLDPID=$(cat $PIDFILE)
-
-  # kill running process with this id if job name matches $JOBNAME
-  if [ -n "$OLDPID" ] && [ -f /proc/$OLDPID/status ] && [ "$(grep Name /proc/$OLDPID/status 2>/dev/null | cut -f 2)" == "$JOBNAME" ] ; then
-    echo "killing old $JOBNAME process with PID $OLDPID"
-    kill $OLDPID
-  fi
-
-}
-
-kill_log_tail() {
-  # stop kernel log backup
-  kill $LOGTAIL2_PID > /dev/null 2>&1
-
-  # stop log display
-  kill $LOGTAIL_PID > /dev/null 2>&1
-}
-
-diagnostic_message() {
-  sync
-  if grep -q "ssh_servers_functional failed" $RAWDATA_DOWNLOADER_LOG ; then
-    log ${LINENO} diag: "SSH CONNECTION FAILED - CHECK NETWORK CABLES AND SETTINGS"
-  fi
-  if grep -q "hdparm failed" $RAWDATA_DOWNLOADER_LOG ; then
-    log ${LINENO} diag: "DISK NOT FOUND - REBOOT THE CAMERA"
-  fi
-  if grep -q "DID_BAD_TARGET" $KERNEL_LOG ; then
-    log ${LINENO} diag: "HOTSWAP FAILURE - FIX THE KERNEL OR REBOOT COMPUTER"
-  fi
-}
-
-export MOUNTPOINT=$1
-
-[ -z "$MOUNTPOINT" ] && exit 1
-
-# create log file
-[ -z "$LOG_DATE" ] && LOG_DATE=$(date +%F%R%S | sed -r -e 's/[-\:]//g')
-RAWDATA_DOWNLOADER_LOG=$LOGDIR/${LOG_PREFIX}_${LOG_DATE}.log
-touch $RAWDATA_DOWNLOADER_LOG || exit
-
-# display rawdata-downloader log file on console
-tail -f $RAWDATA_DOWNLOADER_LOG >&2 &
-LOGTAIL_PID=$!
-
-# get rid of "terminated" message on kill
-disown $LOGTAIL_PID
-
-# kill old tail process used to display log on console, if any
-LOGTAIL_PIDFILE=/var/run/${LOG_PREFIX}_logger.pid
-kill_old_job tail $LOGTAIL_PIDFILE
-echo $LOGTAIL_PID > $LOGTAIL_PIDFILE
-
-# save /var/log/kern.log
-KERNEL_LOG=$LOGDIR/${LOG_PREFIX}_${LOG_DATE}.kern.log
-touch $KERNEL_LOG || exit
-tail -f -n0 /var/log/kern.log > $KERNEL_LOG &
-LOGTAIL2_PID=$!
-
-# get rid of "terminated" message on kill
-disown $LOGTAIL2_PID
-
-# kill old tail process used to copy kern.log, if any
-LOGTAIL2_PIDFILE=/var/run/${LOG_PREFIX}_logger.kern.pid
-kill_old_job tail $LOGTAIL2_PIDFILE
-echo $LOGTAIL2_PID > $LOGTAIL2_PIDFILE
-
-# get the master timestamp from module 1
-export MASTER_TS=$(process-modules --verbose --mountpoint $MOUNTPOINT get-module-master_timestamp 1 2> $RAWDATA_DOWNLOADER_LOG)
-
-# ... or die
-STATUS=$?
-if [ -z "$MASTER_TS" -o $STATUS -ne 0 ] ; then
-  log ${LINENO} error: "could not get the master timestamp"
-  diagnostic_message
-  kill_log_tail
-  exit 1
-fi
-
-# after getting master timestamp from module 1, no need to check camera uptime anymore
-export NOCHECKLIST=--no-checklist
-
-# download rawdata from camera modules
-DEST=$(process-modules --all --verbose --mountpoint $MOUNTPOINT backup-module 2>> $RAWDATA_DOWNLOADER_LOG)
-
-EXIT_CODE=$?
-
-kill_log_tail
-
-# Check exit code
-if [ $EXIT_CODE -ne 0 ] ; then
-  log ${LINENO} error: process-modules exited with code $EXIT_CODE
-  diagnostic_message
-  exit $EXIT_CODE
-fi
-
-# exit here if we are not backuping
-[ "$(basename $0)" == "rawdata-compare" ] && exit
-
-# set permissions for directories
-chown $_UID.$_GID $DEST $DEST/mov
-chown -R $_UID.$_GID $DEST/mov
-chmod 0777 $DEST/mov
-chmod -R 0777 $DEST/mov
-
-# Decompose destination
-IFS='/' read -a DEST_DECOMPOSED <<< "$DEST"
-
-# Extract MAC address
-MAC_ADDR=${DEST_DECOMPOSED[${#DEST_DECOMPOSED} - 3]}
-
-# return mac address and first timestamp
-echo $MAC_ADDR $MASTER_TS
diff --git a/src/rawdata-downloader/src/bin/rawdata-toolbox.sh b/src/rawdata-downloader/src/bin/rawdata-toolbox.sh
deleted file mode 100755
index 380c4e2..0000000
--- a/src/rawdata-downloader/src/bin/rawdata-toolbox.sh
+++ /dev/null
@@ -1,582 +0,0 @@
-#!/bin/bash
-#
-# rawdata-toolbox.sh - rawdata-downloader library
-#
-# Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-
-trap "killtree -9 $MYPID yes" SIGINT SIGKILL SIGTERM SIGHUP
-
-# get camera MAC address using BASE_IP and MASTER_IP
-get_camera_macaddr() {
-
-  # do nothing if already set
-  [ -n "$MACADDR" ] && return
-
-  if ! ping -w 5 -c 1 $BASE_IP.$MASTER_IP > /dev/null ; then
-    log ${LINENO} error: unable to ping $BASE_IP.$MASTER_IP
-    exit 1
-  fi
-
-  MACADDR=$(macaddr $BASE_IP.$MASTER_IP | tr 'a-f' 'A-F')
-  if [ -z "$MACADDR" ] ; then
-    log ${LINENO} error: "unable to get MAC address for $BASE_IP.$MASTER_IP"
-    exit 1
-  fi
-}
-
-debugmode_update() {
-  if [ -n "$DEBUG" ] ; then
-    set -x
-    set -v
-    PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
-  else
-    set +x
-    set +v
-    PS4='+'
-  fi
-}
-
-get_modules_list_for_multiplexer() {
-  local multiplexer=$1
-  local line
-  grep -E -e "^[0-9]+ $multiplexer " $MODULES_FILE | while read line; do
-    line=($line)
-    [ "${line[1]}" == "$multiplexer" ] && echo ${line[0]}
-  done
-}
-
-# return MAC address for givent IP
-macaddr() {
-  local _ADDR=$1
-  arp -n $_ADDR | awk '/[0-9a-f]+:/{gsub(":","-",$3);print $3}'
-}
-
-# kill child processes, and optionally the root process
-killtree() {
-
-    # disable ctrl-c
-    trap '' SIGINT
-
-    local _pid=$2
-    local _sig=$1
-    local killroot=$3
-
-    # stop parents children production between child killing and parent killing
-    #[ "${_pid}" != "$MYPID" ] && kill -STOP ${_pid}
-    for _child in $(ps -o pid --no-headers --ppid ${_pid} 2>/dev/null); do
-        killtree ${_sig} ${_child} yes
-    done
-    [ -n "$killroot" ] && (kill ${_sig} ${_pid} >/dev/null 2>&1 && wait ${_pid} > /dev/null 2>&1) > /dev/null 2>&1
-}
-
-# send log message to stderr
-log() {
-  local _LOG_PREFIX
-  local LINE
-  local MSGLEVEL
-
-  if [ -n "$LOG_PREFIX" ] ; then
-    _LOG_PREFIX="$LOG_PREFIX"
-  else
-    _LOG_PREFIX="$(basename $0)"
-  fi
-
-  # first argument should be line number
-  LINE=$1
-  shift
-
-  # second argument should be message log level (info:, error:, debug:)
-  if [[ "$1" =~ :$ ]] ; then
-    MSGLEVEL=$1
-    shift
-  else
-    # log level defaults to debug:
-    MSGLEVEL=debug:
-  fi
-
-  # only if WHAT begins with "error" or in VERBOSE mode
-  shopt -s nocasematch
-  [[ -n "$VERBOSE" || "$MSGLEVEL" =~ ^error ]] && echo $(date +%F_%R:%S) $_LOG_PREFIX $BASHPID $LINE $MSGLEVEL $@ >&2
-  shopt -u nocasematch
-}
-
-# format stdout as log messages
-logstdout() {
-  local _LOG_PREFIX
-  local LINE
-  local MSGLEVEL
-
-  if [ -n "$LOG_PREFIX" ] ; then
-    _LOG_PREFIX="$LOG_PREFIX"
-  else
-    _LOG_PREFIX="$(basename $0)"
-  fi
-
-  # first argument should be line number
-  LINE=$1
-  shift
-
-  # second argument should be message log level (info:, error:, debug:)
-  if [[ "$1" =~ :$ ]] ; then
-    MSGLEVEL=$1
-    shift
-  else
-    # log level defaults to debug:
-    MSGLEVEL=debug:
-  fi
-
-  shopt -s nocasematch
-  while read l ; do
-    [[ -n "$VERBOSE" || "$MSGLEVEL" =~ ^error ]] && echo $(date +%F_%R:%S) $_LOG_PREFIX $BASHPID $LINE $MSGLEVEL $@ $l >&2
-  done
-  shopt -u nocasematch
-}
-
-# return multiplexer index for given module
-get_mux_index() {
-  local module=$1
-  grep -E -e "^$module " $MODULES_FILE | cut -f 2 -d ' '
-}
-
-# remove scsi host (will be added in connect_q_run after requesting connection for next ssd of this mux)
-remove_scsi_device() {
-  [ -n "$REMOVE_SCSI_DEVICE" ] || return
-  if [ -n "$HOTSWAP_USING_SYS" ] ; then
-    log ${LINENO} info: set device $DEVICE  offline and delete it
-    echo offline | tee /sys/block/$(basename $DEVICE)/device/state 2>&1 | logstdout ${LINENO}
-    echo 1 | tee /sys/block/$(basename $DEVICE)/device/delete 2>&1 | logstdout ${LINENO}
-  else
-    log ${LINENO} info: removing device mux $MUX_INDEX index $REMOTE_SSD_INDEX
-    echo "scsi remove-single-device $SCSIHOST" | tee /proc/scsi/scsi 2>&1 | logstdout ${LINENO}
-  fi
-  echo $SCSIHOST >> $REMOVED_SCSI_TMP
-}
-
-# add scsi device, if previously removed
-add_scsi_device() {
-  [ -n "$REMOVE_SCSI_DEVICE" ] || return
-  hbtl=$(get_scsihost $MUX_INDEX)
-  if [ -n "$hbtl" ] ; then
-    log ${LINENO} info: "adding scsi device using values from cache"
-    if [ -n "$HOTSWAP_USING_SYS" ] ; then
-      hbtl=($hbtl)
-      echo "${hbtl[1]} ${hbtl[2]} ${hbtl[3]}" | tee /sys/class/scsi_host/host${hbtl[0]}/scan 2>&1 | logstdout ${LINENO}
-    else
-      echo "scsi add-single-device $hbtl" | tee /proc/scsi/scsi 2>&1 | logstdout ${LINENO}
-    fi
-  fi
-}
-
-# add previously removed scsi devices
-restore_scsi_devices() {
-  local htbl
-  if [ -z "$HOTSWAP_USING_SYS" ] ; then
-    sort -u $REMOVED_SCSI_TMP | while read hbtl ; do
-      log ${LINENO} info: "adding previously removed scsi devices"
-      echo "scsi add-single-device $hbtl" | tee /proc/scsi/scsi 2>&1 | logstdout ${LINENO}
-      sed -r -i -e "/^$hbtl\$/d" $REMOVED_SCSI_TMP
-    done
-  fi
-}
-
-# assert user is root
-assert_root() {
-  if [ $UID -ne 0 ] ; then
-    echo error: $(basename $0) must be run as root >&2
-    exit 1
-  fi
-}
-
-# exit if specified commands not in path
-assertcommands() {
-  while [ $# -ne 0 ] ; do
-    local CMD=$1
-    shift
-    [ -z "$(which $CMD)" ] && echo command $CMD not found && exit 1
-  done
-}
-
-# exit if modules file not found
-assert_modulesfile() {
-  if [ ! -f $MODULES_FILE ] ; then
-    log ${LINENO} error: file not found: $MODULES_FILE
-    log ${LINENO} error: "=> run 'build-modules-file -m <mount_point>' first"
-    exit 1
-  fi
-}
-
-# reset multiplexers
-reset_eyesis_ide() {
-  log ${LINENO} info: reset eyesis_ide
-  local MUXES=($_MUXES)
-  for (( i=0 ; $i < ${#MUXES[@]} ; ++i )) do
-    log ${LINENO} info: wget http://$BASE_IP.${MUXES[$i]}/eyesis_ide.php
-    wget -q http://$BASE_IP.${MUXES[$i]}/eyesis_ide.php -O - > /dev/null || exit 1
-  done
-}
-
-get_camera_uptime() {
-  ssh root@$BASE_IP.$MASTER_IP cat /proc/uptime | cut -f 1 -d '.'
-}
-
-# sleep until camera uptime is greater than 180sec
-wait_until_camera_awake() {
-
-  log ${LINENO} info: get camera uptime
-  CAMERA_UPTIME=$(get_camera_uptime)
-  if [ -z "$CAMERA_UPTIME" ] ; then
-    log ${LINENO} error: cannot get camera uptime
-    exit 1
-  fi
-
-  if [ $CAMERA_UPTIME -lt 180 ] ; then
-    log ${LINENO} info: "wait $((180-CAMERA_UPTIME)) seconds for camera wake up"
-    sleep $((180-CAMERA_UPTIME))
-  fi
-}
-
-build_sshall_login_list() {
-  for (( i=0 ; $i < $MODULES_COUNT ; ++i )) ; do
-    echo -n " root@$BASE_IP.$((MASTER_IP + i))"
-  done
-  set +x
-}
-
-# delay script execution or exit if another instance is running yet
-# check whether the camera ssh server is functional for SSHALL_HOSTS
-# or die
-assert_remote_ssh_servers_functional() {
-
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-  HOSTS=$(build_sshall_login_list) sshall true > $FIFO 2>&1 &
-  local count=0
-
-  while read l ; do
-    msg=($l)
-    if [ ${msg[0]} != "sshall:" ] ; then
-      log ${LINENO} debug: check_remote_ssh_servers: $l
-      continue
-    fi
-    [ ${msg[2]} = "stderr" ] && log ${LINENO} info: check_remote_ssh_servers: $l
-    LOGIN=${msg[1]}
-    [ -z "$LOGIN" ] && log ${LINENO} error: check_remote_ssh_servers: $l && killtree -KILL $MYPID
-    WHAT=${msg[2]}
-    case "$WHAT" in
-    status)
-      STATUS=${msg[3]}
-      if [ "$STATUS" != "0" ] ; then
-        log ${LINENO} error: "$l"
-        log ${LINENO} error: "ssh failed for camera $IP with exit code $STATUS"
-        killtree -KILL $MYPID yes
-      else
-        ((++count))
-      fi
-      ;;
-    esac
-  done < $FIFO
-
-  if [ "$count" == "$MODULES_COUNT" ] ; then
-    log ${LINENO} info: "remote ssh server functional on every modules"
-  else
-    log ${LINENO} error: "assert_remote_ssh_servers_functional failed"
-    log ${LINENO} error: "check network cables or reboot the camera"
-    killtree -KILL $MYPID yes
-  fi
-
-  rm $FIFO
-}
-
-# run hdparm on SSHALL_HOSTS (using sshall) for specified device
-get_remote_disk_serial() {
-  local dev=$1
-  HOSTS=$(build_sshall_login_list) sshall /sbin/hdparm -i $dev \| sed -r -n -e "'s/.*SerialNo=([^ ]+).*/\1/p'"
-}
-
-# fill SSD_SERIAL and STATUS arrays for logins listed in SSHALL_HOSTS variable
-get_camera_ssd_serials() {
-  # get camera ssd serials
-  log ${LINENO} info: get ssd serials
-
-  STATUS=()
-  SSD_SERIAL=()
-
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-  get_remote_disk_serial /dev/hda > $FIFO 2>&1 &
-  local PIPE_PID=$!
-
-  local l
-  local msg
-  local LOGIN
-  local INDEX
-  local WHAT
-  local SERIAL
-
-  while read l ; do
-    msg=($l)
-    [ ${msg[0]} = "sshall:" ] || continue
-    [ ${msg[2]} = "stderr" ] && log ${LINENO} info: get_remote_disk_serial: $l
-    LOGIN=${msg[1]}
-    [ -z "$LOGIN" ] && log ${LINENO} error: get_remote_disk_serial: $l && killtree -KILL $MYPID
-    IP=$(echo $LOGIN | sed -r -n -e 's/.*@[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+).*/\1/p')
-    INDEX=$(expr $IP - $MASTER_IP)
-    WHAT=${msg[2]}
-    case "$WHAT" in
-    status)
-      STATUS[$INDEX]=${msg[3]}
-      [ "${STATUS[$INDEX]}" != "0" ] && log ${LINENO} error: get_remote_serial: $IP && killtree -KILL $MYPID
-      ;;
-    stdout)
-      SERIAL=${msg[3]}
-      SSD_SERIAL[$INDEX]=$SERIAL
-      ;;
-    esac
-  done < $FIFO
-
-  kill $PIPE_PID > /dev/null 2>&1
-}
-
-# unmount /usr/html/CF for SSHALL_HOSTS
-umount_cf() {
-  HOSTS=$(build_sshall_login_list) sshall << 'EOF'
-if grep -q ' /usr/html/CF ' /proc/mounts ; then
-  sync
-  umount /usr/html/CF || exit 1
-  sync
-fi
-exit 0
-EOF
-}
-
-# wrapper for umount_cf
-umount_all() {
-  umount_cf 2>&1 | tee | while read l ; do
-    msg=($l)
-    [ ${msg[0]} = "sshall:" ] || continue
-    LOGIN=${msg[1]}
-    [ -z "$LOGIN" ] && echo error: umount_all: $l && killtree -KILL $MYPID yes
-    WHAT=${msg[2]}
-    [ "$WHAT" != "status" ] && continue
-    IP=$(echo $LOGIN | sed -r -n -e 's/.*@[0-9]+\.[0-9]+\.[0-9]+\.([0-9]+).*/\1/p')
-    INDEX=$(expr $IP - $MASTER_IP)
-    STATUS=${msg[3]}
-    if [ "$STATUS" != "0" ] ; then
-      log ${LINENO} error: "could not unmount disk on module $INDEX ($IP)"
-      killtree -KILL $MYPID yes
-    fi
-  done
-}
-
-# queue first ssd for each mux, in connect queue
-connect_queue_init() {
-  local i
-  local MUXES=($_MUXES)
-  for (( i=0 ; i < ${#MUXES[@]} ; ++i )) ; do
-    echo $i 1 >> $CONNECT_Q_TMP
-  done
-}
-
-# return array index of ssd serial
-get_ssd_index() {
-  local _SERIAL=$1
-  local i
-  for (( i=0 ; $i < ${#SSD_SERIAL[@]} ; ++i )) ; do
-    if [ "${SSD_SERIAL[$i]}" = "$_SERIAL" ] ; then
-      echo $i
-      break
-    fi
-  done
-}
-
-# retrun number of seconds since last modification of specified file
-modtime() {
-  local filename="$1"
-  expr $(date +%s) - $(stat -c %Y "$filename")
-}
-
-# cache scsi address associated with mux index
-save_scsihost() {
-  local MUX_INDEX=$1
-  shift
-  local SCSIHOST=$@
-  grep -q $MUX_INDEX $SCSIHOST_TMP || echo $MUX_INDEX $SCSIHOST >> $SCSIHOST_TMP
-}
-
-# read cached scsi address associated with mux index
-get_scsihost() {
-  local MUX_INDEX=$1
-  grep $MUX_INDEX $SCSIHOST_TMP | sed -r -e 's/^[0-9]+ (.*)/\1/'
-}
-
-# get module number for ssd serial
-get_module_index() {
-  local SERIAL=$1
-  echo $(($(get_ssd_index $SERIAL)+1))
-}
-
-# return modules list for given multiplexer
-get_modules_list_for_multiplexer() {
-  local multiplexer=$1
-  local line
-  grep -E -e "^[0-9]+ $multiplexer " $MODULES_FILE | while read line; do
-    line=($line)
-    [ "${line[1]}" == "$multiplexer" ] && echo ${line[0]}
-  done
-}
-
-# log every line in specified file, until specified regexp is matched
-wait_regexp() {
-
-  local TMP_INPUT=$1
-  local REGEXP="$2"
-  local msg
-
-  local FIFO=$(mktemp -u).$$
-  mkfifo $FIFO
-  tail -f $TMP_INPUT > $FIFO 2>&1 &
-  local TAIL_PID=$!
-
-  while read msg ; do
-    echo $msg | logstdout ${LINENO}
-    [[ "$msg" =~ "$REGEXP" ]] && break
-  done < $FIFO
-
-  kill $TAIL_PID > /dev/null 2>&1
-
-  rm $TMP_INPUT $FIFO
-}
-
-no_concurrency() {
-
-  local ACTION=$1
-  local PIDFILE="$2"
-
-  local NAME=$(basename $0)
-
-  [ -z "$PIDFILE" ] && PIDFILE=/var/run/$NAME.pid
-
-  # wait for concurrent process exit
-  [ -s "$PIDFILE" ] && OLDPID=$(cat $PIDFILE)
-  [ -n "$OLDPID" -a "$OLDPID" != "$$" ] && while kill -0 $OLDPID 2>/dev/null && [ "$(grep Name /proc/$OLDPID/status 2>/dev/null | cut -f 2)" == "$NAME" ] ; do
-    case $ACTION in
-      sleep)
-        sleep 1
-        OLDPID=$(cat $PIDFILE)
-      ;;
-      *) killtree -KILL $MYPID yes ;;
-    esac
-  done
-
-  # lock this process
-  echo $$ > $PIDFILE
-
-}
-
-# return scsi address (host bus target lun) from specified UDEVINFO line
-get_hbtl() {
-  grep DEVPATH= $1 | sed -r -n -e 's#.*/([0-9]:[0-9]:[0-9]:[0-9])/.*#\1#' -e T -e 's/:/ /gp'
-}
-
-get_master_timestamp() {
-
-  local DESTINATION=$MOUNTPOINT/rawdata/$MACADDR/master
-  if [ -z "$DESTINATION" ] ; then
-    log ${LINENO} error: "Destination not specified"
-    exit 1
-  fi
-  log ${LINENO} info: get the oldest MOV file on $PARTITION_MOUNTPOINT
-  CAM_OLDEST_MOV=$(basename `find $PARTITION_MOUNTPOINT/ -iname '*.mov' | sort | head -n1` 2>/dev/null)
-
-  if [ -z "$CAM_OLDEST_MOV" ] ; then
-    log ${LINENO} error: no MOV file found on $PARTITION_MOUNTPOINT
-    killtree -TERM $MYPID yes
-  fi
-
-  log ${LINENO} info: extract the master timestamp from file $CAM_OLDEST_MOV
-  MASTER_TS=${CAM_OLDEST_MOV%%_*}
-
-  log ${LINENO} info: get the most recent master timestamp directory on $DESTINATION
-  DEST_NEWEST_TS=$(basename `find $DESTINATION/ -maxdepth 1 -type d | grep -E -e '^[0-9]+$' | sort | tail -n1` 2>/dev/null)
-
-  # If MOVs older than CAM_OLDEST_MOV were deleted manually on the camera,
-  # maybe CAM_OLDEST_MOV is already in the the last segment directory.
-  # In that case, reuse this directory. (This should not happend if the camera
-  # has been reformatted properly according to the standard procedure)
-  if [ -f "$DESTINATION/$DEST_NEWEST_TS/mov/$MODULE_INDEX/$CAM_OLDEST_MOV" ]; then
-      log ${LINENO} info: "Reusing existing master $DEST_NEWEST_TS"
-      MASTER_TS=$DEST_NEWEST_TS
-
-  else
-      log ${LINENO} info: "Allocating new master $MASTER_TS"
-  fi
-
-  echo "$MASTER_TS"
-}
-
-is_array() {
-   local variable_name="$1"
-   [[ "$(declare -p $variable_name) 2>/dev/null" =~ "declare -a" ]]
-}
-
-get_module_count() {
-
-  local MUX_SSD_COUNT=($_MUX_SSD_COUNT)                         
-  local MUXES=($_MUXES)                         
-  local TOTAL=0                                 
-  local i
-
-  if [ ${#MUX_SSD_COUNT[@]} -ne ${#MUXES[@]} ] ; then
-    log ${LINENO} error: "mux list and ssd count list length mismatch"
-    killall -KILL $MYPID
-  fi
-
-  for (( i=0; i<${#MUX_SSD_COUNT[@]} ; ++i )) ; do    
-    ((TOTAL+=${MUX_SSD_COUNT[i]}))
-  done                                                                                                                
-
-  echo $TOTAL
-}
-
-get_modules_file() {
-  MODULES_FILE=$MOUNTPOINT/camera/$MACADDR/rawdata-downloader/modules
-  if ! [ -f "$MODULES_FILE" ] ; then
-    log ${LINENO} error: "file not found: $MODULES_FILE"
-    log ${LINENO} error: "run build-modules-file first or specify the proper mountpoint with -m"
-    exit 1
-  fi
-}
-
diff --git a/src/rawdata-downloader/src/rawdata-downloader b/src/rawdata-downloader/src/rawdata-downloader
new file mode 100755
index 0000000..e114804
--- /dev/null
+++ b/src/rawdata-downloader/src/rawdata-downloader
@@ -0,0 +1,1012 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+  rawdata-procedures - Camera raw data procedures
+
+  Copyright (c) 2013-2015 FOXEL SA - http://foxel.ch
+  Please read <http://foxel.ch/license> for more information.
+
+
+  Author(s):
+
+       Kevin Velickovic <k.velickovic@foxel.ch>
+
+
+  This file is part of the FOXEL project <http://foxel.ch>.
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+  Additional Terms:
+
+       You are required to preserve legal notices and author attributions in
+       that material or in the Appropriate Legal Notices displayed by works
+       containing it.
+
+       You are required to attribute the work as explained in the "Usage and
+       Attribution" section of <http://foxel.ch/license>.
+"""
+
+import glob
+import json
+import os
+import re
+import select
+import subprocess
+import sys
+import time
+import urllib2
+from datetime import datetime
+
+# Global variables
+MODE_DOWNLOAD = 1
+MODE_VERIFY   = 2
+MODE_FORMAT   = 3
+
+MODAL_NAMES = {
+    1: "Download",
+    2: "Verify",
+    3: "Format"
+}
+
+# Function to print debug messages
+def ShowMessage(Message, Type=0, Halt=0):
+
+    NO_COLORS = 0
+
+    # Flush stdout
+    sys.stdout.flush()
+
+    # Get current date
+    DateNow = datetime.now().strftime("%H:%M:%S")
+
+    # Get script name
+    scriptName = "%s :" % os.path.basename(__file__)
+
+    # Display proper message
+    if Type == 0:
+        if NO_COLORS:
+            sys.stderr.write("[%s] [INFO] %s %s\n" % (DateNow, scriptName, Message))
+        else:
+            sys.stderr.write("[%s] \033[32m[INFO]\033[39m %s %s\n" % (DateNow, scriptName, Message))
+    elif Type == 1:
+        if NO_COLORS:
+            sys.stderr.write("[%s] [WARNING] %s %s\n" % (DateNow, scriptName, Message))
+        else:
+            sys.stderr.write("[%s] \033[33m[WARNING]\033[39m %s %s\n" % (DateNow, scriptName, Message))
+    elif Type == 2:
+        if NO_COLORS:
+            sys.stderr.write("[%s] [ERROR] %s %s\n" % (DateNow, scriptName, Message))
+        else:
+            sys.stderr.write("[%s] \033[31m[ERROR]\033[39m %s %s\n" % (DateNow, scriptName, Message))
+    elif Type == 3:
+        if NO_COLORS:
+            sys.stderr.write("[%s] [DEBUG] %s %s\n" % (DateNow, scriptName, Message))
+        else:
+            sys.stderr.write("[%s] \033[34m[DEBUG]\033[39m %s %s\n" % (DateNow, scriptName, Message))
+
+    # Flush stdout
+    sys.stdout.flush()
+
+    # Halt program if requested
+    if Halt:
+        sys.exit()
+
+# Function to execute a system command
+def execCommand(command):
+
+    # Execute command
+    return subprocess.call(command, shell=True)
+
+# Function to execute a command and return its output
+def runProcess(exe):
+
+    # Open command
+    p = subprocess.Popen(exe, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
+
+    # Loop
+    while(True):
+
+        # Initiate poll
+        retcode = p.poll() #returns None while subprocess is running
+
+        # Read one line from stdout
+        line = p.stdout.readline()
+
+        # Yeld line
+        yield line
+
+        # If process closes exit loop
+        if(retcode is not None):
+            break
+
+# Function to list only directories of a folder
+def list_directories( path ):
+
+    # Output container
+    Results = []
+
+    # Iterate over folder elements
+    for e in glob.glob( "%s/*" % path ):
+
+        # Check if element is a directory
+        if os.path.isdir( e ):
+
+            # Append element
+            Results.append( e )
+
+    # Return results
+    return Results
+
+# Function to retrieve mount point of a disk on the local system by its serial
+def find_disk_by_serial( modules_file ):
+
+    # List connected SCSI disks
+    connected_disks = glob.glob("/dev/sd*")
+
+    # Iterate over connected disks
+    for local_disk in connected_disks:
+
+        # Read serial of SCSI device
+        local_disk_serial = os.popen("udevadm info --query=all --name=%s | grep ID_SERIAL_SHORT | cut -d'=' -f2" % local_disk).read()
+
+        # Iterate over possible modules ( 1 - 9 )
+        for module in range( 1, 10 ):
+
+            # Extract corresponding module serial from JSON modules file data
+            module_serial = str( modules_file[ 'modules' ][ str( module ) ][ 'serial' ] )
+
+            # Comparte serial
+            if module_serial in local_disk_serial:
+
+                # Return data
+                return [module, local_disk]
+
+# Function to get mac address from camera
+def get_camera_mac():
+
+    # Loop variables
+    retries_max_url   = 3
+    retries_count_url = 0
+
+    while True:
+
+        # Check if retries exceed limit
+        if retries_count_url >= retries_max_url:
+
+            # Exit loop
+            return
+
+        # Catch errors
+        try:
+
+            # Send querry
+            data = urllib2.urlopen( "http://192.168.0.221/phpshell.php?command=echo%20MacAddr%20$(cat%20/sys/class/net/eth0/address)", timeout=10)
+
+            # Check if mac address is not empty
+            if not data:
+
+                # Exit function
+                return
+
+            # Iterate over output lines
+            for line in data:
+
+                # Extract mac address
+                exp_data = re.search( r'.*MacAddr\s(.*)\<.*', line )
+
+                # Check if mac address is valid
+                if exp_data:
+
+                    # Return mac address
+                    return exp_data.group( 1 ).upper().replace(':', '-')
+
+            # Exit loop
+            break
+
+        except:
+
+            # Debug output
+            ShowMessage("Failed to send querry, camera offline ? or this machine is not on the 192.168.0/24 subnet ?, retrying... (%d of %d)" % (retries_count_url + 1, retries_max_url), 1)
+
+            # Increment retries
+            retries_count_url += 1
+
+            # Sleep 5s
+            time.sleep( 5 )
+
+# Function to get camera uptime in minutes
+def get_camera_uptime():
+
+    # Loop variables
+    retries_max_url   = 3
+    retries_count_url = 0
+
+    while True:
+
+        # Check if retries exceed limit
+        if retries_count_url >= retries_max_url:
+
+            # Exit loop
+            return
+
+        # Catch errors
+        try:
+
+            # Send querry
+            data = urllib2.urlopen( "http://192.168.0.221/phpshell.php?command=cat%20/proc/uptime%20|%20cut%20-d'%20'%20-f1", timeout=10)
+
+            # Check if mac address is not empty
+            if not data:
+
+                # Exit function
+                return
+
+            # Iterate over output lines
+            for line in data:
+
+                # Extract uptime
+                exp_data = re.search( r'(\d+\.\d+)\<\/textarea\>.*', line )
+
+                # Check if mac address is valid
+                if exp_data:
+
+                    # Return mac address
+                    return float( exp_data.group( 1 ) )
+
+            # Exit loop
+            break
+
+        except:
+
+            # Debug output
+            ShowMessage("Failed to send querry, camera offline ? or this machine is not on the 192.168.0/24 subnet ?, retrying... (%d of %d)" % (retries_count_url + 1, retries_max_url), 1)
+
+            # Increment retries
+            retries_count_url += 1
+
+            # Sleep 5s
+            time.sleep( 5 )
+
+# Function to format a specified disk
+def format_disk( disk_id, disk_path, modules_file ):
+
+    # Verify is path is a partition not the entire disk
+    if disk_path[ -1 ].isdigit():
+
+        # Debug output
+        ShowMessage("Verifying serials before format...")
+
+        # Read serial of SCSI device
+        disk_serial = os.popen("udevadm info --query=all --name=%s | grep ID_SERIAL_SHORT | cut -d'=' -f2" % disk_path).read()
+
+        # Extract corresponding module serial from JSON modules file data
+        module_serial = str( modules_file[ 'modules' ][ str( disk_id ) ][ 'serial' ] )
+
+        # Perform a serial verification before format
+        if module_serial in disk_serial:
+
+            # Debug output
+            ShowMessage( "Formatting %s..." % disk_path )
+
+            # Execute format and return output
+            return execCommand( "sudo mkfs.ext2 -q -m0 -T largefile4 %s 1>&2" % disk_path )
+
+    # Return failure
+    return 1
+
+# Function to connect a specified ssd from a specified mux
+def connect_disk( mux, disk, modules_file ):
+
+    # Establish kernel log watcher
+    f = subprocess.Popen(['tail','-F', "/var/log/kern.log", '-n', '0'],\
+            stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    p = select.poll()
+    p.register(f.stdout)
+
+    # Debug output
+    ShowMessage("Sending querry to the camera...")
+
+    # Loop variables
+    retries_max_url   = 3
+    retries_count_url = 0
+
+    while True:
+
+        # Check if retries exceed limit
+        if retries_count_url >= retries_max_url:
+
+            # Exit loop
+            return
+
+        # Catch errors
+        try:
+
+            # Ask the Eyesis to connect the disk
+            urllib2.urlopen( "http://192.168.0.%d/103697.php?c:host4=%s" % ( mux, disk ), timeout = 10)
+
+            # Exit loop
+            break
+
+        except:
+
+            # Debug output
+            ShowMessage("Failed to send querry, camera offline ? or this machine is not on the 192.168.0/24 subnet ?, retrying... (%d of %d)" % (retries_count_url + 1, retries_max_url), 1)
+
+            # Increment retries
+            retries_count_url += 1
+
+            # Sleep 5s
+            time.sleep( 5 )
+
+    # Loop variables
+    timeout_counter = 0
+    timeout_limit   = 20
+    retries_max     = 3
+    retries_count   = 0
+
+    # Debug output
+    ShowMessage("Waiting for system...")
+
+    # Loop
+    while True:
+
+        # Check if timeout excedeed
+        if timeout_counter >= timeout_limit:
+
+            # Check if retries exceed limit
+            if retries_count >= retries_max:
+
+                # Exit loop
+                break
+
+            else:
+
+                # Debug output
+                ShowMessage("Timeout connecting %s on multiplexer %d..., verify SATA cables connection, retrying... (%d of %d)" % (disk, mux, retries_count + 1, retries_max), 1)
+
+                # Increment retries counter
+                retries_count  += 1
+
+                # Reset timeout counter
+                timeout_counter = 0
+
+        # Check if kernel output are available
+        if p.poll(1):
+
+            # Extract line
+            line = f.stdout.readline()
+
+            # Check if event is an SCSI attach event
+            if "Attached scsi" in line:
+
+                # Debug output
+                ShowMessage("Disk attached, waiting 5s for initialisation...")
+
+                # Wait 5 seconds for device initialisation
+                time.sleep( 5 )
+
+                # Find mount point and module of disk
+                mount_point = find_disk_by_serial( modules_file )
+
+                # Check if disk is correctily mounted
+                if mount_point:
+
+                    # Return data
+                    return  mount_point
+
+                else:
+
+                    ShowMessage("Cannot find disk or serial mismatch!", 1)
+
+        # Sleep 100ms
+        time.sleep( 0.1 )
+
+        # Increment timeout counter
+        timeout_counter += 0.1
+
+# Function to disconnect a specified mux
+def disconnect_disk( mux_base_addr, skip_check=0 ):
+
+    # Debug output
+    ShowMessage("Disconnecting multiplexer %d..." % (mux_base_addr))
+
+    # Local variables
+    f = None
+    p = None
+
+    # Check if skip checks requested
+    if not skip_check:
+
+        # Establish kernel log watcher
+        f = subprocess.Popen(['tail','-F', "/var/log/kern.log", '-n', '0'],\
+                stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+        p = select.poll()
+        p.register(f.stdout)
+
+    # Debug output
+    ShowMessage("Sending querry to the camera...")
+
+    # Loop variables
+    retries_max_url   = 3
+    retries_count_url = 0
+
+    while True:
+
+        # Check if retries exceed limit
+        if retries_count_url >= retries_max_url:
+
+            # Exit loop
+            return
+
+        # Catch errors
+        try:
+
+            # Ask the Eyesis to reset the mux
+            urllib2.urlopen( "http://192.168.0.%d/eyesis_ide.php" % ( mux_base_addr ), timeout=10 )
+
+            # Exit loop
+            break
+
+        except:
+
+            # Debug output
+            ShowMessage("Failed to send querry, camera offline ? or this machine is not on the 192.168.0/24 subnet ?, retrying... (%d of %d)" % (retries_count_url + 1, retries_max_url), 1)
+
+            # Increment retries
+            retries_count_url += 1
+
+            # Sleep 5s
+            time.sleep( 5 )
+
+    # Check if skip checks requested
+    if skip_check:
+
+        # Exit function
+        return
+
+    # Loop variables
+    timeout_counter = 0
+    timeout_limit   = 30
+
+    # Debug output
+    ShowMessage("Waiting for system...")
+
+    # Loop
+    while True:
+
+        # Check if timeout excedeed
+        if timeout_counter >= timeout_limit:
+
+            # Debug output
+            ShowMessage("Timeout disconnecting multiplexer %d..., verify SATA cables connection" % (mux_base_addr), 2)
+
+            # Exit loop
+            break
+
+        # Check if kernel output are available
+        if p.poll(1):
+
+            # Extract line
+            line = f.stdout.readline()
+
+            # Check if event is an SCSI attach event
+            if "Stopping disk" in line:
+
+                # Exit loop
+                break
+
+        # Sleep 100ms
+        time.sleep( 0.1 )
+
+        # Increment timeout counter
+        timeout_counter += 0.1
+
+# Function to download data from the camera
+def download_data( source_folder, destination_folder, module_index ):
+
+    # Compute destination folder
+    dest_folder = "%s/mov/%d" % (destination_folder, module_index)
+
+    # Check if destination folder exists
+    if not os.path.isdir( dest_folder ):
+
+        # Create destination folder
+        os.makedirs( dest_folder )
+
+    # Copy files with rsync
+    return execCommand("rsync -a -b -c --progress --exclude 'lost+found' %s/* %s 1>&2" % (source_folder, dest_folder))
+
+# Function to download data from the camera
+def verify_data( source_folder, destination_folder, module_index ):
+
+    # Compute destination folder
+    dest_folder = "%s/mov/%d/" % (destination_folder, module_index)
+
+    # Check if destination folder exists
+    if not os.path.isdir( dest_folder ):
+
+        # Create destination folder
+        os.makedirs( dest_folder )
+
+    # Error flag container
+    errored = False
+
+    # Verify files with rsync
+    for line in runProcess( "rsync --exclude 'lost+found' --archive --dry-run --checksum --itemize-changes %s/ %s" % (source_folder, dest_folder) ):
+
+        # Extract rsync output
+        exp_data = re.match( r'(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)\s(.*)', line )
+
+        # Check if regex matched
+        if exp_data:
+
+            # Check if rsync output is invalid
+            if not '.' in exp_data.group( 1 ):
+
+                # Mark as invalid
+                errored = True
+
+    # Return result
+    return (1 if errored else 0)
+
+# Function to get master timestamp
+def get_master_timestamp( source_folder, masters_folder ):
+
+    # List mov files on camera
+    camera_mov_list = sorted( glob.glob( "%s/*.mov" % source_folder ) )
+
+    # Check if camera is not empty
+    if camera_mov_list:
+
+        # Get oldest mov filename on the camera
+        camera_oldest_mov = os.path.basename( camera_mov_list[ 0 ] )
+
+        # Extract timestamp from mov file name
+        camera_oldest_mov_timestamp = camera_oldest_mov[ :-4 ]
+
+        # List master timestamps on the destination storage
+        destination_masters = sorted( list_directories( masters_folder ) )
+
+        # Check if destination storage have masters
+        if destination_masters:
+
+            # Get the newest master on the destination storage
+            destination_newest_timestamp = os.path.basename( destination_masters[ -1 ] )
+
+            # Check if oldest mov on the camera exists on the newest downloaded master
+            if os.path.isfile( "%s/%s/mov/1/%s" % ( masters_folder, destination_newest_timestamp, camera_oldest_mov ) ):
+
+                # Debug output
+                ShowMessage("Master %s resumed" % destination_newest_timestamp.split( '_' )[ 0 ] )
+
+                # Return timestamp
+                return destination_newest_timestamp.split( '_' )[ 0 ]
+
+            else:
+
+                # Debug output
+                ShowMessage("Master %s allocated" % camera_oldest_mov_timestamp.split( '_' )[ 0 ] )
+
+                # Return timestamp
+                return camera_oldest_mov_timestamp.split( '_' )[ 0 ]
+
+        else:
+
+            # Debug output
+            ShowMessage("Master %s allocated" % camera_oldest_mov_timestamp.split( '_' )[ 0 ] )
+
+            # Return timestamp
+            return camera_oldest_mov_timestamp.split( '_' )[ 0 ]
+
+def process_data( modules_file, masters_folder, working_mode=MODE_DOWNLOAD ):
+
+    # Local variables
+    master_timestamp = None
+    destination_folder = None
+
+    # Iterate over possible muxes
+    for module in sorted( modules_file[ 'modules' ].items() ):
+
+        # Extract mux informations
+        module_mux  = module[ 1 ][ 'mux' ]
+        module_disk = module[ 1 ][ 'disk' ]
+
+        # Loop variables
+        retries_count = 0
+        retries_max   = 3
+        retries_loop  = 1
+
+        # Download loop
+        while retries_loop:
+
+            # Check if is a retry
+            if retries_count > 0:
+
+                # Debug output
+                ShowMessage("Resetting mux %d..." % module_mux)
+
+                # Disconnect disk
+                disconnect_disk( module_mux, 1 )
+
+                # Debug output
+                ShowMessage("Waiting 10s...")
+
+                # Wait 10s
+                time.sleep( 10 )
+
+            # Check if retries exceed limit
+            if retries_count >= retries_max:
+
+                # Debug output
+                ShowMessage("%s failed!" % MODAL_NAMES[ working_mode ], 2)
+                return False
+
+            # Debug output
+            ShowMessage("Connecting disk of module %s..." % ( module[ 0 ] ))
+
+            # Connect disk
+            connected_disk = connect_disk( module_mux, module_disk, modules_file )
+
+            # Check connection status
+            if not connected_disk:
+
+                # Debug output
+                ShowMessage("%s failed." % MODAL_NAMES[ working_mode ], 2)
+                return False
+
+            # Debug output
+            ShowMessage("Module %s connected as %s!" % ( module[ 0 ], connected_disk[ 1 ] ) )
+
+            # Debug output
+            ShowMessage("Running FSCK on %s..." % ( connected_disk[ 1 ] ) )
+
+            if working_mode != MODE_FORMAT:
+
+                # Repair disk
+                execCommand("sudo fsck -p %s 1>&2" % (connected_disk[ 1 ]))
+
+                # Debug output
+                ShowMessage("Mounting %s to /mnt/rawdata-downloader..." % ( connected_disk[ 1 ] ) )
+
+                # Mount disk on local computer
+                execCommand("sudo mount %s /mnt/rawdata-downloader/ 1>&2" % (connected_disk[ 1 ]))
+
+            # Check if mode is download or verify
+            if (working_mode == MODE_DOWNLOAD) or (working_mode == MODE_VERIFY):
+
+                # Check if folders are initialized
+                if not master_timestamp and not destination_folder:
+
+                    # Check if connected module is the first module (1)
+                    if connected_disk[ 0 ] == 1:
+
+                        # Debug output
+                        ShowMessage("Allocating new master...")
+
+                        # Get master timestamp
+                        master_timestamp = get_master_timestamp( "/mnt/rawdata-downloader", masters_folder )
+
+                        # Check if master is null (camera is empty)
+                        if not master_timestamp:
+
+                            # Debug output
+                            ShowMessage("Camera have no MOV files!", 1)
+
+                            # Disconnect disk
+                            disconnect_disk( module_mux )
+
+                            # Exit function
+                            return False
+
+                        # Compute destination folder
+                        destination_folder = "%s/%s" % ( masters_folder, master_timestamp )
+                    else:
+
+                        # Debug output
+                        ShowMessage("Mux 224 ssd1 is not module 1!", 2)
+                        return False
+
+            # Debug output
+            ShowMessage("%s data of module %d..." % (MODAL_NAMES[ working_mode ], connected_disk[ 0 ]))
+
+            # Action container
+            action = None
+
+            # Check if in download mode
+            if working_mode == MODE_DOWNLOAD:
+
+                # Execute action
+                action = download_data( "/mnt/rawdata-downloader", destination_folder, connected_disk[ 0 ] )
+
+            # Check if in verify mode
+            elif working_mode == MODE_VERIFY:
+
+                # Execute action
+                action = verify_data( "/mnt/rawdata-downloader", destination_folder, connected_disk[ 0 ] )
+
+            # Check if in format mode
+            elif working_mode == MODE_FORMAT:
+
+                # Execute action
+                action = format_disk( connected_disk[ 0 ], connected_disk[ 1 ], modules_file )
+
+            # Check action success
+            if action != 0:
+
+                # Check if mode is verify or format
+                if (working_mode == MODE_VERIFY) or (working_mode == MODE_FORMAT):
+
+                    # Debug output
+                    ShowMessage("%s failed" % (MODAL_NAMES[ working_mode ]), 2)
+
+                    # Return failure
+                    return False
+
+                else:
+
+                    # Debug output
+                    ShowMessage("%s failed, Retrying... (%d of %d)" % (MODAL_NAMES[ working_mode ], retries_count + 1, retries_max), 1)
+
+                    # Increment retries counter
+                    retries_count  += 1
+
+            else:
+
+                # Stop retry loop
+                retries_loop = 0
+
+                # Reset retries counter
+                retries_count = 0
+
+                # Debug output
+                ShowMessage("Module %d %s OK" % (connected_disk[ 0 ], MODAL_NAMES[ working_mode ]))
+
+        # Wait 1 sec
+        time.sleep( 1 )
+
+        # Check if mode is not format
+        if working_mode != MODE_FORMAT:
+
+            # Unmount local storage
+            execCommand("sudo umount /mnt/rawdata-downloader/ 1>&2")
+
+        # Disconnect disk
+        disconnect_disk( module_mux )
+
+        # Debug output
+        ShowMessage("Mux %d disconnected" % module_mux)
+
+    # Return success ( Master timestamp )
+    return master_timestamp
+
+# Usage display function
+def _usage():
+    print """
+    Usage: %s [OPTIONS]
+
+    [Required arguments]
+    --mount-point            Base mount directory
+
+    [Optional arguments]
+    --verify                 Verify if all files from camera are properly downloaded
+    --format                 Just format camera (implies --verify before)
+    --format-after-download  Format camera after download (implies --verify before)
+    --help                   Show this message
+
+    """ % os.path.basename( sys.argv[0] )
+
+# Program entry point function
+def main(argv):
+
+    # Parse arguments
+    Arguments = {}
+    Argv_Concat = ' '.join(argv)
+    Argv_Flags = Argv_Concat.split('--')
+
+    # Iterate over source args
+    for i in Argv_Flags:
+
+        # Check length
+        if len(i) > 0:
+
+            # Split by first space
+            splited = i.split(' ', 1)
+
+            # Check if argument contains value
+            if len(splited) > 1:
+                Arguments[splited[0]] = (None if not splited[1] else splited[1].strip())
+            else:
+                Arguments[splited[0]] =  None
+
+    # Arguments variables
+    __MountPoint__            = (None if not 'mount-point' in Arguments else Arguments['mount-point'].rstrip('/'))
+    __Format__                = (1 if 'format' in Arguments else 0)
+    __Format_After_Download__ = (1 if 'format-after-download' in Arguments else 0)
+    __Verify__                = (1 if 'verify' in Arguments else 0)
+    __Help__                  = (1 if 'help' in Arguments else 0)
+
+    # Arguments check
+    if (not __MountPoint__) or __Help__:
+        _usage()
+        sys.exit(0)
+
+    # Debug output
+    ShowMessage("Checking camera uptime...")
+
+    # Get camera uptime
+    camera_uptime = get_camera_uptime()
+
+    # Check if command succeeded
+    if camera_uptime:
+
+        # Debug output
+        ShowMessage( "Camera is up since %.2f minute(s)" % ( camera_uptime / 60.0 )  )
+
+    else:
+
+        # Exit function
+        return False
+
+    # Check if uptime is less than 3min
+    if camera_uptime < ( 3.0 * 60.0 ):
+
+        # Determine time to sleep
+        sleep_time = ( ( ( 3.0 * 60.0 ) - camera_uptime ) )
+
+        # Debug output
+        ShowMessage( "Waiting %.2f minute(s) for camera initialisation..." % ( sleep_time / 60.0 )  )
+
+        # Wait for initialisation
+        time.sleep( sleep_time )
+
+    # Debug output
+    ShowMessage("Asking camera for MAC address...")
+
+    # Get camera mac address
+    __CameraMAC__ = get_camera_mac()
+
+    # Debug output
+    ShowMessage("Camera MAC: %s" % __CameraMAC__)
+
+    # Check if camera mac is valid
+    if not __CameraMAC__:
+
+        # Debug output
+        ShowMessage("Failed to get camera mac address, camera offline ? or this machine is not on the 192.168.0/24 subnet ?", 2, 1)
+
+    # Compute paths
+    __Masters_Folder__ = "%s/rawdata/%s/master" % ( __MountPoint__, __CameraMAC__ )
+    __Modules_File__   = "%s/camera/%s/rawdata-downloader/modules.json" % ( __MountPoint__, __CameraMAC__ )
+
+    # Local variables
+    master_timestamp = None
+    modules_file = []
+
+    # Check modules file presence
+    if os.path.isfile( __Modules_File__ ):
+
+        # Open and read json modules file
+        with open( __Modules_File__ ) as data_file:
+            modules_file = json.load(data_file)
+
+    else:
+
+        # Debug output
+        ShowMessage("modules.json not found, did you ran rawdata-downloader-build-modules script once ?", 2, 1)
+
+    # Debug output
+    ShowMessage("Resetting multiplexers...")
+
+    # Reset multiplexers
+    # Iterate over possible muxes
+    for mux in modules_file[ 'multiplexers' ].items():
+
+        # Extract mux informations
+        mux_id = int( mux[0] )
+
+        # Debug output
+        ShowMessage("Resetting mux %d..." % mux_id)
+
+        # Disconnect disk
+        disconnect_disk( mux_id, 1 )
+
+    # Debug output
+    ShowMessage("Waiting 10s...")
+
+    # Wait 10s
+    time.sleep( 10 )
+
+    # Process state container
+    action_state = False
+
+    # Check if format mode requested
+    if __Format__:
+
+        # Debug output
+        ShowMessage("Starting verification...")
+
+        # Check if action 'Verify' succeeded
+        if process_data( modules_file, __Masters_Folder__, MODE_VERIFY ):
+
+            # Debug output
+            ShowMessage("Starting format...")
+
+            # Execute action 'Format'
+            if process_data( modules_file, __Masters_Folder__, MODE_FORMAT ):
+
+                # Flag success
+                action_state = True
+
+    else:
+
+        # Check verify flag
+        if __Verify__:
+
+            # Execute action 'Download'
+            if process_data( modules_file, __Masters_Folder__, MODE_DOWNLOAD ):
+
+                # Flag success
+                action_state = True
+
+        else:
+
+            # Debug output
+            ShowMessage("Starting download...")
+
+            # Execute action 'Download'
+            master_timestamp = process_data( modules_file, __Masters_Folder__, MODE_DOWNLOAD )
+
+            # Check if download succeeded
+            if master_timestamp:
+
+                # Flag success
+                action_state = True
+
+            # Check if format after download mode requested
+            if __Format_After_Download__:
+
+                # Debug output
+                ShowMessage("Starting verification...")
+
+                # Check if action 'Verify' succeeded
+                if process_data( modules_file, __Masters_Folder__, MODE_VERIFY ):
+
+                    # Debug output
+                    ShowMessage("Starting format...")
+
+                    # Execute action 'Format'
+                    process_data( modules_file, __Masters_Folder__, MODE_FORMAT )
+
+                    # Flag success
+                    action_state = True
+
+    # Check process state
+    if action_state:
+
+        # Debug output
+        ShowMessage("Completed.")
+
+        # Output needed informations for rawdata-procedures
+        print( "%s %s" % ( __CameraMAC__, master_timestamp ) )
+
+    else:
+
+        # Debug output
+        ShowMessage("Failed.", 2)
+
+# Program entry point
+if __name__ == "__main__":
+    main(sys.argv[1:])
diff --git a/src/rawdata-downloader/src/system-tools/Makefile b/src/rawdata-downloader/src/system-tools/Makefile
deleted file mode 100644
index 065fc6e..0000000
--- a/src/rawdata-downloader/src/system-tools/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-INSTALL_PREFIX=/
-
-all:
-
-install:
-	cp -rv ./usr/sbin ${INSTALL_PREFIX}/usr
-	cp -rv ./etc ./var ${INSTALL_PREFIX}
diff --git a/src/rawdata-downloader/src/system-tools/etc/defaults/rawdata-downloader b/src/rawdata-downloader/src/system-tools/etc/defaults/rawdata-downloader
deleted file mode 100644
index e69de29..0000000
diff --git a/src/rawdata-downloader/src/system-tools/etc/udev/rules.d/90-rawdata-downloader.rules b/src/rawdata-downloader/src/system-tools/etc/udev/rules.d/90-rawdata-downloader.rules
deleted file mode 100644
index 197124e..0000000
--- a/src/rawdata-downloader/src/system-tools/etc/udev/rules.d/90-rawdata-downloader.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="sd*", RUN+="/usr/sbin/scsi-disk-udev-eventhandler"
-
diff --git a/src/rawdata-downloader/src/system-tools/usr/sbin/scsi-disk-udev-eventhandler b/src/rawdata-downloader/src/system-tools/usr/sbin/scsi-disk-udev-eventhandler
deleted file mode 100755
index a9d9ea0..0000000
--- a/src/rawdata-downloader/src/system-tools/usr/sbin/scsi-disk-udev-eventhandler
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-# rawdata-procedures - Camera raw data procedures
-#
-# Copyright (c) 2013-2014 FOXEL SA - http://foxel.ch
-# Please read <http://foxel.ch/license> for more information.
-#
-#
-# Author(s):
-#
-#       Luc Deschenaux <l.deschenaux@foxel.ch>
-#
-#
-# This file is part of the FOXEL project <http://foxel.ch>.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Additional Terms:
-#
-#       You are required to preserve legal notices and author attributions in
-#       that material or in the Appropriate Legal Notices displayed by works
-#       containing it.
-#
-#       You are required to attribute the work as explained in the "Usage and
-#       Attribution" section of <http://foxel.ch/license>.
-
-SPOOL=/var/spool/rawdata-downloader
-
-[ -f /etc/defaults/rawdata-downloader ] && . /etc/defaults/rawdata-downloader
-
-mkdir -p $SPOOL || exit
-
-case "$ACTION" in
-add)
-  [ "$DEVTYPE" = "disk" ] && /usr/bin/env | grep  -E -v -e '^PATH=' -e '^_=' -e '^PWD=' -e '^SEQNUM=' -e '^SHLVL=' > $SPOOL/$ID_SERIAL_SHORT
-  ;;
-esac
-
diff --git a/src/rawdata-downloader/src/system-tools/var/spool/rawdata-downloader/.gitignore b/src/rawdata-downloader/src/system-tools/var/spool/rawdata-downloader/.gitignore
deleted file mode 100644
index 2d2bfd3..0000000
--- a/src/rawdata-downloader/src/system-tools/var/spool/rawdata-downloader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-:::