From a3300608811441c5238911ca14e56433ea4f4c5f Mon Sep 17 00:00:00 2001
From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Wed, 12 Nov 2014 19:30:35 +0100
Subject: [PATCH] almost every thing is ready

---
 cluster/master/etc/dhcp/dhcpd.conf            | 140 ---------
 cluster/master/etc/fstab                      |  14 -
 install_debian.txt                            |  42 +++
 master/dump                                   |   1 +
 .../master => master}/etc/apt/sources.list    |   9 +-
 master/etc/bash.bashrc                        |  55 ++++
 .../master => master}/etc/chrony/chrony.conf  |   0
 .../etc/cron.d/getswitchtemp                  |   0
 {cluster/master => master}/etc/default/atftpd |   0
 {cluster/master => master}/etc/default/halt   |   0
 .../master => master}/etc/default/ntpdate     |   0
 {cluster/master => master}/etc/default/rcS    |   0
 {cluster/master => master}/etc/default/rproxy |   0
 .../master => master}/etc/default/sensord     |   0
 .../etc/default/shutdownallblades             |   0
 .../etc/default/smartmontools                 |   0
 {cluster/master => master}/etc/default/snmpd  |   0
 master/etc/default/webconfig                  |  10 +
 master/etc/dhcp/dhcpd.conf                    | 140 +++++++++
 .../etc/dhcp/dhcpd.conf.alpha                 |   0
 .../etc/dhcp/dhcpd.conf.blank                 |   2 +-
 .../etc/dhcp/dhcpd.conf.bravo                 |   0
 .../master => master}/etc/dhcp/dhcpd.conf.cl0 |   2 +-
 .../etc/dhcp/dhcpd.conf.gamma                 |   4 +-
 {cluster/master => master}/etc/exports        |   0
 master/etc/fstab                              |  11 +
 {cluster/master => master}/etc/hosts.12MHzDF  |   0
 {cluster/master => master}/etc/hosts.12MHzMDF |   0
 {cluster/master => master}/etc/hosts.30MHz    |   0
 {cluster/master => master}/etc/hosts.8MHz     |   0
 {cluster/master => master}/etc/inetd.conf     |   0
 .../master => master}/etc/init.d/etherwake    |   0
 master/etc/init.d/samba                       | 126 ++++++++
 .../etc/init.d/shutdownallblades              |   0
 .../master => master}/etc/init.d/waitslaves   |   0
 .../master => master}/etc/init.d/wakeonlan    |   0
 .../etc/initramfs-tools/scripts/tftp          |   0
 .../master => master}/etc/iptables/rules.v4   |   0
 .../master => master}/etc/logrotate.d/trc6500 |   0
 master/etc/mailname                           |   1 +
 {cluster/master => master}/etc/modules        |   0
 .../master => master}/etc/network/interfaces  |   0
 {cluster/master => master}/etc/nsswitch.conf  |   0
 master/etc/resolv.conf                        |   2 +
 .../master => master}/etc/rproxy/sites.csv    |   0
 {cluster/master => master}/etc/rsyslog.conf   |   0
 .../etc/security/limits.conf                  |   0
 .../master => master}/etc/snmp/snmpd.conf     |   0
 {cluster/master => master}/etc/ssh/ssh_config |   0
 .../master => master}/etc/ssh/sshd_config     |   0
 .../master => master}/etc/ssmtp/ssmtp.conf    |   0
 .../etc/sysctl.d/trc6500.conf                 |   0
 master/etc/timezone                           |   1 +
 master/etc/vim/vimrc                          |  53 ++++
 master/etc/webconfig/alias.csv                |  13 +
 master/home                                   |   1 +
 {bios => master/opt/bios}/+init.sh            |   0
 {bios => master/opt/bios}/SCELNX_64           | Bin
 {bios => master/opt/bios}/bios-1.0b.cfg       |   0
 {bios => master/opt/bios}/bios-1.11.cfg       |   0
 {bios => master/opt/bios}/bios-3.0.cfg        |   0
 {bios => master/opt/bios}/bios-3.10.cfg       |   0
 {bios => master/opt/bios}/dmidecode           | Bin
 {bios => master/opt/bios}/update_bios_cfg.sh  |   5 +-
 {cluster => master/opt/cluster}/Makefile      |   0
 .../opt/cluster}/bin/create_bios_tarball.sh   |   0
 .../opt/cluster}/bin/create_root_tarball.sh   |   0
 .../opt/cluster}/bin/create_slave_tarball.sh  |   0
 .../cluster}/bin/init_cluster_repository.sh   |   0
 .../opt/cluster}/bin/init_pxe_repository.sh   |   0
 {cluster => master/opt/cluster}/rec/etc/fstab |   0
 .../opt/cluster}/slave/etc/+hostname          |   0
 .../opt/cluster}/slave/etc/chrony/chrony.conf |   0
 .../opt/cluster}/slave/etc/default/atftpd     |   0
 .../opt/cluster}/slave/etc/default/etherwake  |   0
 .../opt/cluster}/slave/etc/default/hddtemp    |   0
 .../opt/cluster}/slave/etc/default/nfs-common |   0
 .../opt/cluster}/slave/etc/default/ntpdate    |   0
 .../opt/cluster}/slave/etc/default/rproxy     |   0
 .../opt/cluster}/slave/etc/default/samba      |   0
 .../slave/etc/default/shutdownallblades       |   0
 .../cluster}/slave/etc/default/smartmontools  |   0
 .../opt/cluster}/slave/etc/default/snmpd      |   0
 .../opt/cluster}/slave/etc/default/trc6500    |   0
 .../opt/cluster}/slave/etc/default/waitslaves |   0
 .../opt/cluster}/slave/etc/default/wakeonlan  |   0
 .../opt/cluster}/slave/etc/default/webconfig  |   0
 .../slave/etc/default/~isc-dhcp-server        |   0
 .../opt/cluster}/slave/etc/exports            |   0
 .../opt/cluster}/slave/etc/fstab              |   0
 .../opt/cluster}/slave/etc/hostname           |   0
 .../opt/cluster}/slave/etc/inetd.conf         |   0
 .../opt/cluster}/slave/etc/inittab            |   0
 .../opt/cluster}/slave/etc/network/interfaces |   0
 .../opt/cluster}/slave/etc/rc.local           |   0
 .../opt/cluster}/slave/etc/resolv.conf        |   0
 .../opt/cluster}/slave/etc/rsyslog.conf       |   0
 .../opt/cluster}/slave/etc/ssmtp/+ssmtp.conf  |   0
 .../opt/cluster}/slave/etc/ssmtp/ssmtp.conf   |   0
 .../opt/cluster/slave}/root/.bashrc           |   0
 .../opt/cluster}/slave/root/.profile          |   0
 .../opt/cluster}/slave/root/.screenrc         |   0
 .../cluster}/slave/root/.ssh/authorized_keys  |   0
 .../opt/cluster}/slave/root/.ssh/id_rsa       |   0
 .../opt/cluster}/slave/root/.ssh/id_rsa.pub   |   0
 .../opt/cluster}/slave/root/.vimrc            |   0
 .../opt/cluster}/slave/usr/sbin/~winbindd     |   0
 {ipmi => master/opt/ipmi}/ipmicfg             | Bin
 .../opt/ipmi}/ipmicfg-linux.x86_64            | Bin
 {ipmi => master/opt/ipmi}/ipmicfg.sh          |   0
 {ipmi => master/opt/ipmi}/update_blade_cfg.sh |   6 +-
 {tftp => master/opt/tftp}/balder10.imz        | Bin
 .../tftp}/cat4500-ipbase-mz.122-54.SG1.bin    | Bin
 .../tftp}/cat4500e-ipbase-mz.122-54.SG1.bin   | Bin
 {tftp => master/opt/tftp}/fr.kmp              | Bin
 {tftp => master/opt/tftp}/initrd.img          |   0
 {tftp => master/opt/tftp}/memdisk             |   0
 {tftp => master/opt/tftp}/menu.c32            |   0
 {tftp => master/opt/tftp}/pxelinux.0          |   0
 {tftp => master/opt/tftp}/pxelinux.cfg/0A851A |   3 +-
 .../opt/tftp}/pxelinux.cfg/0A851A50           |   0
 {tftp => master/opt/tftp}/pxelinux.cfg/0A851C |   0
 .../opt/tftp}/pxelinux.cfg/0A851C50           |   0
 .../opt/tftp}/pxelinux.cfg/default            |   0
 {tftp => master/opt/tftp}/pxelinux.txt        |   0
 {tftp => master/opt/tftp}/swg1.txt            |   0
 {tftp => master/opt/tftp}/swg2.txt            |   0
 {tftp => master/opt/tftp}/swm.txt             |   0
 {tftp => master/opt/tftp}/vmlinuz             |   0
 .../opt/trc6500/debian-rep/binary/Packages.gz | Bin 0 -> 29 bytes
 master/rec                                    |   1 +
 {cluster/slave => master}/root/.bashrc        |   0
 master/root/bin/du_root                       |   3 +
 master/root/bin/extract_thermal_info          |  13 +
 master/root/bin/get_switch_temperature        |  39 +++
 master/root/debian-list.txt                   | 274 ++++++++++++++++++
 136 files changed, 803 insertions(+), 168 deletions(-)
 delete mode 100644 cluster/master/etc/dhcp/dhcpd.conf
 delete mode 100644 cluster/master/etc/fstab
 create mode 100644 install_debian.txt
 create mode 120000 master/dump
 rename {cluster/master => master}/etc/apt/sources.list (53%)
 create mode 100644 master/etc/bash.bashrc
 rename {cluster/master => master}/etc/chrony/chrony.conf (100%)
 rename {cluster/master => master}/etc/cron.d/getswitchtemp (100%)
 rename {cluster/master => master}/etc/default/atftpd (100%)
 rename {cluster/master => master}/etc/default/halt (100%)
 rename {cluster/master => master}/etc/default/ntpdate (100%)
 rename {cluster/master => master}/etc/default/rcS (100%)
 rename {cluster/master => master}/etc/default/rproxy (100%)
 rename {cluster/master => master}/etc/default/sensord (100%)
 rename {cluster/master => master}/etc/default/shutdownallblades (100%)
 rename {cluster/master => master}/etc/default/smartmontools (100%)
 rename {cluster/master => master}/etc/default/snmpd (100%)
 create mode 100644 master/etc/default/webconfig
 create mode 100644 master/etc/dhcp/dhcpd.conf
 rename {cluster/master => master}/etc/dhcp/dhcpd.conf.alpha (100%)
 rename {cluster/master => master}/etc/dhcp/dhcpd.conf.blank (99%)
 rename {cluster/master => master}/etc/dhcp/dhcpd.conf.bravo (100%)
 rename {cluster/master => master}/etc/dhcp/dhcpd.conf.cl0 (99%)
 rename {cluster/master => master}/etc/dhcp/dhcpd.conf.gamma (99%)
 rename {cluster/master => master}/etc/exports (100%)
 create mode 100644 master/etc/fstab
 rename {cluster/master => master}/etc/hosts.12MHzDF (100%)
 rename {cluster/master => master}/etc/hosts.12MHzMDF (100%)
 rename {cluster/master => master}/etc/hosts.30MHz (100%)
 rename {cluster/master => master}/etc/hosts.8MHz (100%)
 rename {cluster/master => master}/etc/inetd.conf (100%)
 rename {cluster/master => master}/etc/init.d/etherwake (100%)
 create mode 100755 master/etc/init.d/samba
 rename {cluster/master => master}/etc/init.d/shutdownallblades (100%)
 rename {cluster/master => master}/etc/init.d/waitslaves (100%)
 rename {cluster/master => master}/etc/init.d/wakeonlan (100%)
 rename {cluster/master => master}/etc/initramfs-tools/scripts/tftp (100%)
 rename {cluster/master => master}/etc/iptables/rules.v4 (100%)
 rename {cluster/master => master}/etc/logrotate.d/trc6500 (100%)
 create mode 100644 master/etc/mailname
 rename {cluster/master => master}/etc/modules (100%)
 rename {cluster/master => master}/etc/network/interfaces (100%)
 rename {cluster/master => master}/etc/nsswitch.conf (100%)
 create mode 100644 master/etc/resolv.conf
 rename {cluster/master => master}/etc/rproxy/sites.csv (100%)
 rename {cluster/master => master}/etc/rsyslog.conf (100%)
 rename {cluster/master => master}/etc/security/limits.conf (100%)
 rename {cluster/master => master}/etc/snmp/snmpd.conf (100%)
 rename {cluster/master => master}/etc/ssh/ssh_config (100%)
 rename {cluster/master => master}/etc/ssh/sshd_config (100%)
 rename {cluster/master => master}/etc/ssmtp/ssmtp.conf (100%)
 rename {cluster/master => master}/etc/sysctl.d/trc6500.conf (100%)
 create mode 100644 master/etc/timezone
 create mode 100644 master/etc/vim/vimrc
 create mode 100644 master/etc/webconfig/alias.csv
 create mode 120000 master/home
 rename {bios => master/opt/bios}/+init.sh (100%)
 rename {bios => master/opt/bios}/SCELNX_64 (100%)
 rename {bios => master/opt/bios}/bios-1.0b.cfg (100%)
 rename {bios => master/opt/bios}/bios-1.11.cfg (100%)
 rename {bios => master/opt/bios}/bios-3.0.cfg (100%)
 rename {bios => master/opt/bios}/bios-3.10.cfg (100%)
 rename {bios => master/opt/bios}/dmidecode (100%)
 rename {bios => master/opt/bios}/update_bios_cfg.sh (92%)
 rename {cluster => master/opt/cluster}/Makefile (100%)
 rename {cluster => master/opt/cluster}/bin/create_bios_tarball.sh (100%)
 rename {cluster => master/opt/cluster}/bin/create_root_tarball.sh (100%)
 rename {cluster => master/opt/cluster}/bin/create_slave_tarball.sh (100%)
 rename {cluster => master/opt/cluster}/bin/init_cluster_repository.sh (100%)
 rename {cluster => master/opt/cluster}/bin/init_pxe_repository.sh (100%)
 rename {cluster => master/opt/cluster}/rec/etc/fstab (100%)
 rename {cluster => master/opt/cluster}/slave/etc/+hostname (100%)
 rename {cluster => master/opt/cluster}/slave/etc/chrony/chrony.conf (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/atftpd (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/etherwake (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/hddtemp (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/nfs-common (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/ntpdate (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/rproxy (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/samba (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/shutdownallblades (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/smartmontools (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/snmpd (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/trc6500 (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/waitslaves (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/wakeonlan (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/webconfig (100%)
 rename {cluster => master/opt/cluster}/slave/etc/default/~isc-dhcp-server (100%)
 rename {cluster => master/opt/cluster}/slave/etc/exports (100%)
 rename {cluster => master/opt/cluster}/slave/etc/fstab (100%)
 rename {cluster => master/opt/cluster}/slave/etc/hostname (100%)
 rename {cluster => master/opt/cluster}/slave/etc/inetd.conf (100%)
 rename {cluster => master/opt/cluster}/slave/etc/inittab (100%)
 rename {cluster => master/opt/cluster}/slave/etc/network/interfaces (100%)
 rename {cluster => master/opt/cluster}/slave/etc/rc.local (100%)
 rename {cluster => master/opt/cluster}/slave/etc/resolv.conf (100%)
 rename {cluster => master/opt/cluster}/slave/etc/rsyslog.conf (100%)
 rename {cluster => master/opt/cluster}/slave/etc/ssmtp/+ssmtp.conf (100%)
 rename {cluster => master/opt/cluster}/slave/etc/ssmtp/ssmtp.conf (100%)
 rename {cluster/master => master/opt/cluster/slave}/root/.bashrc (100%)
 rename {cluster => master/opt/cluster}/slave/root/.profile (100%)
 rename {cluster => master/opt/cluster}/slave/root/.screenrc (100%)
 rename {cluster => master/opt/cluster}/slave/root/.ssh/authorized_keys (100%)
 rename {cluster => master/opt/cluster}/slave/root/.ssh/id_rsa (100%)
 rename {cluster => master/opt/cluster}/slave/root/.ssh/id_rsa.pub (100%)
 rename {cluster => master/opt/cluster}/slave/root/.vimrc (100%)
 rename {cluster => master/opt/cluster}/slave/usr/sbin/~winbindd (100%)
 rename {ipmi => master/opt/ipmi}/ipmicfg (100%)
 rename {ipmi => master/opt/ipmi}/ipmicfg-linux.x86_64 (100%)
 rename {ipmi => master/opt/ipmi}/ipmicfg.sh (100%)
 rename {ipmi => master/opt/ipmi}/update_blade_cfg.sh (88%)
 rename {tftp => master/opt/tftp}/balder10.imz (100%)
 rename {tftp => master/opt/tftp}/cat4500-ipbase-mz.122-54.SG1.bin (100%)
 rename {tftp => master/opt/tftp}/cat4500e-ipbase-mz.122-54.SG1.bin (100%)
 rename {tftp => master/opt/tftp}/fr.kmp (100%)
 rename {tftp => master/opt/tftp}/initrd.img (100%)
 rename {tftp => master/opt/tftp}/memdisk (100%)
 rename {tftp => master/opt/tftp}/menu.c32 (100%)
 rename {tftp => master/opt/tftp}/pxelinux.0 (100%)
 rename {tftp => master/opt/tftp}/pxelinux.cfg/0A851A (69%)
 rename {tftp => master/opt/tftp}/pxelinux.cfg/0A851A50 (100%)
 rename {tftp => master/opt/tftp}/pxelinux.cfg/0A851C (100%)
 rename {tftp => master/opt/tftp}/pxelinux.cfg/0A851C50 (100%)
 rename {tftp => master/opt/tftp}/pxelinux.cfg/default (100%)
 rename {tftp => master/opt/tftp}/pxelinux.txt (100%)
 rename {tftp => master/opt/tftp}/swg1.txt (100%)
 rename {tftp => master/opt/tftp}/swg2.txt (100%)
 rename {tftp => master/opt/tftp}/swm.txt (100%)
 rename {tftp => master/opt/tftp}/vmlinuz (100%)
 create mode 100644 master/opt/trc6500/debian-rep/binary/Packages.gz
 create mode 120000 master/rec
 rename {cluster/slave => master}/root/.bashrc (100%)
 create mode 100755 master/root/bin/du_root
 create mode 100755 master/root/bin/extract_thermal_info
 create mode 100755 master/root/bin/get_switch_temperature
 create mode 100644 master/root/debian-list.txt

diff --git a/cluster/master/etc/dhcp/dhcpd.conf b/cluster/master/etc/dhcp/dhcpd.conf
deleted file mode 100644
index c4215bc..0000000
--- a/cluster/master/etc/dhcp/dhcpd.conf
+++ /dev/null
@@ -1,140 +0,0 @@
-# /etc/dhcp3/dhcpd.conf
-# Fichier de configuration du serveur DHCP de l'ISC (package 'dhcp3-server')
-# Formation Debian GNU/Linux par Alexis de Lattre
-# http://formation-debian.via.ecp.fr/
-
-# Consultez "man dhcpd.conf" pour avoir toutes les informations sur les options
-
-
-# ============================================================================
-# V1.4
-# Copyright (C) THALES. All rights reserved
-# Author: Jean-Noel Raguenes
-# Date : 07/12/2009
-# Modification:
-# - V1.1: Herve Petit 10/03/2010
-#   Reprise avec ajouts des sub net eth1
-# - V1.2: Herve Petit 24/06/2010
-#   Ajout option routers sur sub net eth1
-# - V1.3: Herve Petit 25/08/2010
-#   Remplacement lame trc13 par lame trc27 a cause pb d'init_statique
-#   qui prennait 2 mn sur cette lame
-# - V1.4: Herve Petit 18/04/2011
-#   Suppression definition de la route par defaut a partir du fichier dhcp
-# - V1.5: Laurent Mazet 09/05/2014
-#   Netoyage
-# ============================================================================
-
-# DEBUT des options GLOBALES
-# Les options globales s'appliqueront par defaut a tous les sous-reseaux
-
-# Nom de domaine
-ddns-domainname "trc6500.thalesgroup.com";
-option domain-name "trc6500.thalesgroup.com";
-
-# Duree du bail en secondes
-default-lease-time 6000;
-max-lease-time 6000;
-server-name "maitre";
-
-# FIN des options GLOBALES
-
-# DEBUT de la declaration des sous-reseaux et des machines
-
-subnet 10.133.26.0 netmask 255.255.255.0
-{
-  next-server 10.133.26.160;
-  filename "pxelinux.0";
-  option domain-name-servers 10.133.26.160;
-  option routers 10.133.26.231;
-  use-host-decl-names on;
-  authoritative;
-}
-
-# liste des lames a completer dans l'ordre de la baie
-
-#lame fusion, pistage, LSU
-host trc01-rf { hardware ethernet 00:25:90:8A:B2:08; fixed-address 10.133.26.161;}
-
-#lames gonio
-host trc02-rf { hardware ethernet 00:25:90:4F:1E:8C; fixed-address 10.133.26.162;}
-host trc03-rf { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.163;}
-host trc04-rf { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.164;}
-host trc05-rf { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.165;}
-host trc06-rf { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.166;}
-host trc07-rf { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.167;}
-host trc08-rf { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.168;}
-host trc09-rf { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.169;}
-host trc10-rf { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.170;}
-host trc11-rf { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.171;}
-host trc12-rf { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.172;}
-host trc13-rf { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.173;}
-host trc14-rf { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.174;}
-host trc15-rf { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.175;}
-host trc16-rf { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.176;}
-host trc17-rf { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.177;}
-host trc18-rf { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.178;}
-host trc19-rf { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.179;}
-host trc20-rf { hardware ethernet 00:25:90:4F:E8:0A; fixed-address 10.133.26.180;}
-host trc21-rf { hardware ethernet 00:25:90:4F:C3:3C; fixed-address 10.133.26.181;}
-host trc22-rf { hardware ethernet 00:25:90:4F:BB:68; fixed-address 10.133.26.182;}
-host trc23-rf { hardware ethernet 00:25:90:4F:E1:62; fixed-address 10.133.26.183;}
-host trc24-rf { hardware ethernet 00:25:90:4F:e4:86; fixed-address 10.133.26.184;}
-host trc25-rf { hardware ethernet 00:25:90:4F:bb:74; fixed-address 10.133.26.185;}
-
-#lames monitoring
-host trc26-rf { hardware ethernet 00:25:90:4F:BB:6E; fixed-address 10.133.26.186;}
-host trc27-rf { hardware ethernet 00:25:90:4F:BB:66; fixed-address 10.133.26.187;}
-
-host trc28-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
-host trc29-rf { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
-host trc30-rf { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
-host trc31-rf { hardware ethernet 00:25:90:88:E3:C2; fixed-address 10.133.26.191;}
-
-subnet 10.133.28.0 netmask 255.255.255.0
-{
-  next-server 10.133.28.160;
-  filename "pxelinux.0";
-  option routers 10.133.28.231;
-  option domain-name-servers 10.133.28.160;
-  use-host-decl-names on;
-  authoritative;
-}
-
-#lame fusion, pistage, LSU
-host trc01 { hardware ethernet 00:25:90:8A:B2:09; fixed-address 10.133.28.161;}
-
-#lames gonio
-host trc02 { hardware ethernet 00:25:90:4F:1E:8D; fixed-address 10.133.28.162;}
-host trc03 { hardware ethernet 00:25:90:4F:23:9F; fixed-address 10.133.28.163;}
-host trc04 { hardware ethernet 00:25:90:4F:23:A5; fixed-address 10.133.28.164;}
-host trc05 { hardware ethernet 00:25:90:4F:18:63; fixed-address 10.133.28.165;}
-host trc06 { hardware ethernet 00:25:90:4F:18:59; fixed-address 10.133.28.166;}
-host trc07 { hardware ethernet 00:25:90:4F:1A:29; fixed-address 10.133.28.167;}
-host trc08 { hardware ethernet 00:25:90:4F:BB:73; fixed-address 10.133.28.168;}
-host trc09 { hardware ethernet 00:25:90:4F:BB:23; fixed-address 10.133.28.169;}
-host trc10 { hardware ethernet 00:25:90:4F:BA:F3; fixed-address 10.133.28.170;}
-host trc11 { hardware ethernet 00:25:90:4F:BA:F1; fixed-address 10.133.28.171;}
-host trc12 { hardware ethernet 00:25:90:4f:bb:1f; fixed-address 10.133.28.172;}
-host trc13 { hardware ethernet 00:25:90:4F:23:D5; fixed-address 10.133.28.173;}
-host trc14 { hardware ethernet 00:25:90:4F:23:DD; fixed-address 10.133.28.174;}
-host trc15 { hardware ethernet 00:25:90:4F:BB:21; fixed-address 10.133.28.175;}
-host trc16 { hardware ethernet 00:25:90:4F:E1:67; fixed-address 10.133.28.176;}
-host trc17 { hardware ethernet 00:25:90:4F:EA:21; fixed-address 10.133.28.177;}
-host trc18 { hardware ethernet 00:25:90:4F:E2:D3; fixed-address 10.133.28.178;}
-host trc19 { hardware ethernet 00:25:90:4F:EF:01; fixed-address 10.133.28.179;}
-host trc20 { hardware ethernet 00:25:90:4F:E8:0B; fixed-address 10.133.28.180;}
-host trc21 { hardware ethernet 00:25:90:4F:C3:3D; fixed-address 10.133.28.181;}
-host trc22 { hardware ethernet 00:25:90:4F:BB:69; fixed-address 10.133.28.182;}
-host trc23 { hardware ethernet 00:25:90:4F:E1:63; fixed-address 10.133.28.183;}
-host trc24 { hardware ethernet 00:25:90:4F:e4:87; fixed-address 10.133.28.184;}
-host trc25 { hardware ethernet 00:25:90:4F:bb:75; fixed-address 10.133.28.185;}
-
-#lames monitoring
-host trc26 { hardware ethernet 00:25:90:4F:BB:6F; fixed-address 10.133.28.186;}
-host trc27 { hardware ethernet 00:25:90:4F:BB:67; fixed-address 10.133.28.187;}
-
-host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
-host trc29 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
-host trc30 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
-host trc31 { hardware ethernet 00:25:90:88:E3:C3; fixed-address 10.133.28.191;}
diff --git a/cluster/master/etc/fstab b/cluster/master/etc/fstab
deleted file mode 100644
index 1f2f303..0000000
--- a/cluster/master/etc/fstab
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/fstab: static file system information.
-#
-# Use 'blkid' to print the universally unique identifier for a
-# device; this may be used with UUID= as a more robust way to name devices
-# that works even if disks are added and removed. See fstab(5).
-#
-# <file system>                           <mount point>        <type>  <options>          <dump>  <pass>
-# / was on /dev/sda1 during installation
-UUID=51c6eae6-c179-4224-912b-2b00c6a03567 /                     ext4    errors=remount-ro 0       1
-# /var/media/backup was on /dev/sda3 during installation
-UUID=5d23d2c7-b3bc-4043-9a29-a85236a476a4 /var/media/backup     ext4    defaults          0       2
-# swap was on /dev/sda2 during installation
-UUID=d69bc2f1-ea0f-47d7-ace1-5f8bb95c683a none                  swap    sw                0       0
-/dev/sr0        /media/cdrom0                                   udf,iso9660 user,noauto   0       0
diff --git a/install_debian.txt b/install_debian.txt
new file mode 100644
index 0000000..f941253
--- /dev/null
+++ b/install_debian.txt
@@ -0,0 +1,42 @@
+Step 1: Minimalist Debian install
+* locale: English/US
+* timezone: France
+* keboard: French
+* no network
+* hostname: trc00.thalesgroup.com
+* root password: thales
+* local user: trc6500
+* user password: thales
+* partitionning:
+ - sda1 / 20GB ext4
+ - sda2 (none) 1G swap
+ - sda3 /var/media/backup (remaining) ext4
+* repository: no cd, no network mirror
+* popurarity-contest: no
+* software selection: none
+* grub: yes
+* reboot
+
+Step 2: First configuration
+* on blade
+  aptitude install openssh-server rsync
+  ifconfig eth1 10.133.28.160
+* on server
+  rsync -va master/ root@10.133.28.160:/
+  ssh root@10.133.28.160 "eject; reboot"
+
+Step 3: 
+* on server
+  cat ~trc6500/ftp/TRC6500.pub | ssh root@10.133.28.160 apt-key add -
+* on blade
+  aptitude udpate
+  aptitude install $(cat /root/debian-list.txt)
+* on server
+  rsync -va master/ root@10.133.28.160:/
+* on blade
+  update-rc.d etherwake enable
+  update-rc.d shutdownallblades enable
+  update-rc.d wakeonlan enable
+  update-rc.d waitslaves enable
+  chown webconfig /etc/webconfig/alias.csv
+  reboot
diff --git a/master/dump b/master/dump
new file mode 120000
index 0000000..d5ff786
--- /dev/null
+++ b/master/dump
@@ -0,0 +1 @@
+/var/media/backup/dump
\ No newline at end of file
diff --git a/cluster/master/etc/apt/sources.list b/master/etc/apt/sources.list
similarity index 53%
rename from cluster/master/etc/apt/sources.list
rename to master/etc/apt/sources.list
index 8b8cd16..e55e6e8 100644
--- a/cluster/master/etc/apt/sources.list
+++ b/master/etc/apt/sources.list
@@ -1,8 +1,11 @@
 #
 
-deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-3 20140426-13:37]/ wheezy contrib main
-deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-2 20140426-13:37]/ wheezy contrib main
-deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-1 20140426-13:37]/ wheezy contrib main
+#deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-3 20140426-13:37]/ wheezy contrib main
+#deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-2 20140426-13:37]/ wheezy contrib main
+#deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-1 20140426-13:37]/ wheezy contrib main
+
+deb [arch=amd64,all] http://192.168.0.53/debian-amd64 wheezy contrib main non-free
+deb [arch=amd64,all] http://192.168.0.53/cots softndesign main debug
 
 #deb http://security.debian.org/ wheezy/updates main contrib non-free
 #deb-src http://security.debian.org/ wheezy/updates main contrib non-free
diff --git a/master/etc/bash.bashrc b/master/etc/bash.bashrc
new file mode 100644
index 0000000..7e1ce3b
--- /dev/null
+++ b/master/etc/bash.bashrc
@@ -0,0 +1,55 @@
+# System-wide .bashrc file for interactive bash(1) shells.
+
+# To enable the settings / commands in this file for login shells as well,
+# this file has to be sourced in /etc/profile.
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, overwrite the one in /etc/profile)
+PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+
+# Commented out, don't overwrite xterm -T "title" -n "icontitle" by default.
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
+    ;;
+*)
+    ;;
+esac
+
+# enable bash completion in interactive shells
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
+
+# if the command-not-found package is installed, use it
+if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
+	function command_not_found_handle {
+	        # check because c-n-f could've been removed in the meantime
+                if [ -x /usr/lib/command-not-found ]; then
+		   /usr/bin/python /usr/lib/command-not-found -- "$1"
+                   return $?
+                elif [ -x /usr/share/command-not-found/command-not-found ]; then
+		   /usr/bin/python /usr/share/command-not-found/command-not-found -- "$1"
+                   return $?
+		else
+		   printf "%s: command not found\n" "$1" >&2
+		   return 127
+		fi
+	}
+fi
diff --git a/cluster/master/etc/chrony/chrony.conf b/master/etc/chrony/chrony.conf
similarity index 100%
rename from cluster/master/etc/chrony/chrony.conf
rename to master/etc/chrony/chrony.conf
diff --git a/cluster/master/etc/cron.d/getswitchtemp b/master/etc/cron.d/getswitchtemp
similarity index 100%
rename from cluster/master/etc/cron.d/getswitchtemp
rename to master/etc/cron.d/getswitchtemp
diff --git a/cluster/master/etc/default/atftpd b/master/etc/default/atftpd
similarity index 100%
rename from cluster/master/etc/default/atftpd
rename to master/etc/default/atftpd
diff --git a/cluster/master/etc/default/halt b/master/etc/default/halt
similarity index 100%
rename from cluster/master/etc/default/halt
rename to master/etc/default/halt
diff --git a/cluster/master/etc/default/ntpdate b/master/etc/default/ntpdate
similarity index 100%
rename from cluster/master/etc/default/ntpdate
rename to master/etc/default/ntpdate
diff --git a/cluster/master/etc/default/rcS b/master/etc/default/rcS
similarity index 100%
rename from cluster/master/etc/default/rcS
rename to master/etc/default/rcS
diff --git a/cluster/master/etc/default/rproxy b/master/etc/default/rproxy
similarity index 100%
rename from cluster/master/etc/default/rproxy
rename to master/etc/default/rproxy
diff --git a/cluster/master/etc/default/sensord b/master/etc/default/sensord
similarity index 100%
rename from cluster/master/etc/default/sensord
rename to master/etc/default/sensord
diff --git a/cluster/master/etc/default/shutdownallblades b/master/etc/default/shutdownallblades
similarity index 100%
rename from cluster/master/etc/default/shutdownallblades
rename to master/etc/default/shutdownallblades
diff --git a/cluster/master/etc/default/smartmontools b/master/etc/default/smartmontools
similarity index 100%
rename from cluster/master/etc/default/smartmontools
rename to master/etc/default/smartmontools
diff --git a/cluster/master/etc/default/snmpd b/master/etc/default/snmpd
similarity index 100%
rename from cluster/master/etc/default/snmpd
rename to master/etc/default/snmpd
diff --git a/master/etc/default/webconfig b/master/etc/default/webconfig
new file mode 100644
index 0000000..117fe7d
--- /dev/null
+++ b/master/etc/default/webconfig
@@ -0,0 +1,10 @@
+# Weconfig configure options
+
+# Should webconfig be enabled?
+#ENABLED=1
+
+# ALIASES: filename containing form declaration
+#ALIASES=/etc/webconfig/aliases.csv
+
+# PORT: server port
+PORT=8080
diff --git a/master/etc/dhcp/dhcpd.conf b/master/etc/dhcp/dhcpd.conf
new file mode 100644
index 0000000..e95be67
--- /dev/null
+++ b/master/etc/dhcp/dhcpd.conf
@@ -0,0 +1,140 @@
+# /etc/dhcp3/dhcpd.conf
+# Fichier de configuration du serveur DHCP de l'ISC (package 'dhcp3-server')
+# Formation Debian GNU/Linux par Alexis de Lattre
+# http://formation-debian.via.ecp.fr/
+
+# Consultez "man dhcpd.conf" pour avoir toutes les informations sur les options
+
+
+# ============================================================================
+# V1.5
+# Copyright (C) THALES. All rights reserved
+# Author: Jean-Noel Raguenes
+# Date : 07/12/2009
+# Modification:
+# - V1.1: Herve Petit 10/03/2010
+#   Reprise avec ajouts des sub net eth1
+# - V1.2: Herve Petit 24/06/2010
+#   Ajout option routers sur sub net eth1
+# - V1.3: Herve Petit 25/08/2010
+#   Remplacement lame trc13 par lame trc27 a cause pb d'init_statique
+#   qui prennait 2 mn sur cette lame
+# - V1.4: Herve Petit 18/04/2011
+#   Suppression definition de la route par defaut a partir du fichier dhcp
+# - V1.5: Laurent Mazet 09/05/2014
+#   Netoyage
+# ============================================================================
+
+# DEBUT des options GLOBALES
+# Les options globales s'appliqueront par defaut a tous les sous-reseaux
+
+# Nom de domaine
+ddns-domainname "trc6500.thalesgroup.com";
+option domain-name "trc6500.thalesgroup.com";
+
+# Duree du bail en secondes
+default-lease-time 6000;
+max-lease-time 6000;
+server-name "maitre";
+
+# FIN des options GLOBALES
+
+# DEBUT de la declaration des sous-reseaux et des machines
+
+subnet 10.133.26.0 netmask 255.255.255.0
+{
+  next-server 10.133.26.160;
+  filename "pxelinux.0";
+  option domain-name-servers 10.133.26.160;
+  option routers 10.133.26.231;
+  use-host-decl-names on;
+  authoritative;
+}
+
+# liste des lames a completer dans l'ordre de la baie
+
+#lame fusion, pistage, LSU
+host trc01-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.161;}
+
+#lames gonio
+host trc02-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.162;}
+host trc03-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.163;}
+host trc04-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.164;}
+host trc05-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.165;}
+host trc06-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.166;}
+host trc07-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.167;}
+host trc08-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.168;}
+host trc09-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.169;}
+host trc10-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.170;}
+host trc11-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.171;}
+host trc12-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.172;}
+host trc13-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.173;}
+host trc14-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.174;}
+host trc15-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.175;}
+host trc16-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.176;}
+host trc17-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.177;}
+host trc18-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.178;}
+host trc19-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.179;}
+host trc20-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.180;}
+host trc21-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.181;}
+host trc22-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.182;}
+host trc23-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.183;}
+host trc24-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.184;}
+host trc25-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.185;}
+
+#lames monitoring
+host trc26-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.186;}
+host trc27-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.187;}
+
+host trc28-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
+host trc29-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.189;}
+host trc30-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.190;}
+host trc31-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.191;}
+
+subnet 10.133.28.0 netmask 255.255.255.0
+{
+  next-server 10.133.28.160;
+  filename "pxelinux.0";
+  option routers 10.133.28.231;
+  option domain-name-servers 10.133.28.160;
+  use-host-decl-names on;
+  authoritative;
+}
+
+#lame fusion, pistage, LSU
+host trc01 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.161;}
+
+#lames gonio
+host trc02 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.162;}
+host trc03 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.163;}
+host trc04 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.164;}
+host trc05 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.165;}
+host trc06 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.166;}
+host trc07 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.167;}
+host trc08 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.168;}
+host trc09 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.169;}
+host trc10 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.170;}
+host trc11 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.171;}
+host trc12 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.172;}
+host trc13 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.173;}
+host trc14 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.174;}
+host trc15 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.175;}
+host trc16 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.176;}
+host trc17 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.177;}
+host trc18 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.178;}
+host trc19 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.179;}
+host trc20 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.180;}
+host trc21 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.181;}
+host trc22 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.182;}
+host trc23 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.183;}
+host trc24 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.184;}
+host trc25 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.185;}
+
+#lames monitoring
+host trc26 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.186;}
+host trc27 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.187;}
+
+host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
+host trc29 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.189;}
+host trc30 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.190;}
+host trc31 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.191;}
diff --git a/cluster/master/etc/dhcp/dhcpd.conf.alpha b/master/etc/dhcp/dhcpd.conf.alpha
similarity index 100%
rename from cluster/master/etc/dhcp/dhcpd.conf.alpha
rename to master/etc/dhcp/dhcpd.conf.alpha
diff --git a/cluster/master/etc/dhcp/dhcpd.conf.blank b/master/etc/dhcp/dhcpd.conf.blank
similarity index 99%
rename from cluster/master/etc/dhcp/dhcpd.conf.blank
rename to master/etc/dhcp/dhcpd.conf.blank
index 0af472d..e95be67 100644
--- a/cluster/master/etc/dhcp/dhcpd.conf.blank
+++ b/master/etc/dhcp/dhcpd.conf.blank
@@ -7,7 +7,7 @@
 
 
 # ============================================================================
-# V1.4
+# V1.5
 # Copyright (C) THALES. All rights reserved
 # Author: Jean-Noel Raguenes
 # Date : 07/12/2009
diff --git a/cluster/master/etc/dhcp/dhcpd.conf.bravo b/master/etc/dhcp/dhcpd.conf.bravo
similarity index 100%
rename from cluster/master/etc/dhcp/dhcpd.conf.bravo
rename to master/etc/dhcp/dhcpd.conf.bravo
diff --git a/cluster/master/etc/dhcp/dhcpd.conf.cl0 b/master/etc/dhcp/dhcpd.conf.cl0
similarity index 99%
rename from cluster/master/etc/dhcp/dhcpd.conf.cl0
rename to master/etc/dhcp/dhcpd.conf.cl0
index c4215bc..b4e6876 100644
--- a/cluster/master/etc/dhcp/dhcpd.conf.cl0
+++ b/master/etc/dhcp/dhcpd.conf.cl0
@@ -7,7 +7,7 @@
 
 
 # ============================================================================
-# V1.4
+# V1.5
 # Copyright (C) THALES. All rights reserved
 # Author: Jean-Noel Raguenes
 # Date : 07/12/2009
diff --git a/cluster/master/etc/dhcp/dhcpd.conf.gamma b/master/etc/dhcp/dhcpd.conf.gamma
similarity index 99%
rename from cluster/master/etc/dhcp/dhcpd.conf.gamma
rename to master/etc/dhcp/dhcpd.conf.gamma
index 3dfb1db..a987052 100644
--- a/cluster/master/etc/dhcp/dhcpd.conf.gamma
+++ b/master/etc/dhcp/dhcpd.conf.gamma
@@ -57,7 +57,7 @@ host trc01-rf { hardware ethernet 00:21:5E:98:98:C0; fixed-address 10.133.26.161
 host trc02-rf { hardware ethernet 00:21:5E:98:CD:08; fixed-address 10.133.26.162;}
 host trc03-rf { hardware ethernet 00:21:5E:98:94:30; fixed-address 10.133.26.163;}
 host trc04-rf { hardware ethernet 00:21:5E:98:97:10; fixed-address 10.133.26.164;}
-host trc05-rf { hardware ethernet 00:21:5E:98:96:58; fixed-address 10.133.26.165;}
+host trc05-rf { hardware ethernet 00:21:5E:98:96:58; fixed-address 10.133.26.240;}
 
 host trc06-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.166;}
 host trc07-rf { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.167;}
@@ -82,7 +82,7 @@ host trc01 { hardware ethernet 00:21:5E:98:98:C2; fixed-address 10.133.28.161;}
 host trc02 { hardware ethernet 00:21:5E:98:CD:0A; fixed-address 10.133.28.162;}
 host trc03 { hardware ethernet 00:21:5E:98:94:32; fixed-address 10.133.28.163;}
 host trc04 { hardware ethernet 00:21:5E:98:97:12; fixed-address 10.133.28.164;}
-host trc05 { hardware ethernet 00:21:5E:98:96:5A; fixed-address 10.133.28.165;}
+host trc05 { hardware ethernet 00:21:5E:98:96:5A; fixed-address 10.133.28.240;}
 
 host trc06 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.166;}
 host trc07 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.167;}
diff --git a/cluster/master/etc/exports b/master/etc/exports
similarity index 100%
rename from cluster/master/etc/exports
rename to master/etc/exports
diff --git a/master/etc/fstab b/master/etc/fstab
new file mode 100644
index 0000000..3445617
--- /dev/null
+++ b/master/etc/fstab
@@ -0,0 +1,11 @@
+# /etc/fstab: static file system information.
+#
+# Use 'blkid' to print the universally unique identifier for a
+# device; this may be used with UUID= as a more robust way to name devices
+# that works even if disks are added and removed. See fstab(5).
+#
+# <dev>   <mount point>     <type>      <options>         <dump>  <pass>
+/dev/sda1 /                 ext4        errors=remount-ro 0       1
+/dev/sda3 /var/media/backup ext4        defaults          0       2
+/dev/sda2 none              swap        sw                0       0
+/dev/sr0  /media/cdrom0     udf,iso9660 user,noauto       0       0
diff --git a/cluster/master/etc/hosts.12MHzDF b/master/etc/hosts.12MHzDF
similarity index 100%
rename from cluster/master/etc/hosts.12MHzDF
rename to master/etc/hosts.12MHzDF
diff --git a/cluster/master/etc/hosts.12MHzMDF b/master/etc/hosts.12MHzMDF
similarity index 100%
rename from cluster/master/etc/hosts.12MHzMDF
rename to master/etc/hosts.12MHzMDF
diff --git a/cluster/master/etc/hosts.30MHz b/master/etc/hosts.30MHz
similarity index 100%
rename from cluster/master/etc/hosts.30MHz
rename to master/etc/hosts.30MHz
diff --git a/cluster/master/etc/hosts.8MHz b/master/etc/hosts.8MHz
similarity index 100%
rename from cluster/master/etc/hosts.8MHz
rename to master/etc/hosts.8MHz
diff --git a/cluster/master/etc/inetd.conf b/master/etc/inetd.conf
similarity index 100%
rename from cluster/master/etc/inetd.conf
rename to master/etc/inetd.conf
diff --git a/cluster/master/etc/init.d/etherwake b/master/etc/init.d/etherwake
similarity index 100%
rename from cluster/master/etc/init.d/etherwake
rename to master/etc/init.d/etherwake
diff --git a/master/etc/init.d/samba b/master/etc/init.d/samba
new file mode 100755
index 0000000..18389bc
--- /dev/null
+++ b/master/etc/init.d/samba
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          samba
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $network $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Should-Start:      slapd cups
+# Should-Stop:       slapd cups
+# Short-Description: start Samba daemons (nmbd and smbd)
+### END INIT INFO
+
+
+# Defaults
+RUN_MODE="daemons"
+
+# Reads config file (will override defaults above)
+[ -r /etc/default/samba ] && . /etc/default/samba
+
+PIDDIR=/var/run/samba
+NMBDPID=$PIDDIR/nmbd.pid
+SMBDPID=$PIDDIR/smbd.pid
+
+# clear conflicting settings from the environment
+unset TMPDIR
+
+# See if the daemons are there
+test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+	start)
+		log_daemon_msg "Starting Samba daemons"
+		# Make sure we have our PIDDIR, even if it's on a tmpfs
+		install -o root -g root -m 755 -d $PIDDIR
+
+		if [ -n `which testparm` ]
+		then
+			NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		fi
+		if [ "$NMBD_DISABLED" != 'Yes' ]; then
+			log_progress_msg "nmbd"
+			if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/nmbd -- -D
+			then
+				log_end_msg 1
+				exit 1
+			fi
+		fi
+
+		if [ "$RUN_MODE" != "inetd" ]; then
+			log_progress_msg "smbd"
+			if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then
+				log_end_msg 1
+				exit 1
+			fi
+		fi
+
+		log_end_msg 0
+		;;
+	stop)
+		log_daemon_msg "Stopping Samba daemons"
+		log_progress_msg "nmbd"
+
+		start-stop-daemon --stop --quiet --pidfile $NMBDPID
+		# Wait a little and remove stale PID file
+		sleep 1
+		if [ -f $NMBDPID ] && ! ps h `cat $NMBDPID` > /dev/null
+		then
+			# Stale PID file (nmbd was succesfully stopped),
+			# remove it (should be removed by nmbd itself IMHO.)
+			rm -f $NMBDPID
+		fi
+
+		if [ "$RUN_MODE" != "inetd" ]; then
+			log_progress_msg "smbd"
+			start-stop-daemon --stop --quiet --pidfile $SMBDPID
+			# Wait a little and remove stale PID file
+			sleep 1
+			if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null
+			then
+				# Stale PID file (nmbd was succesfully stopped),
+				# remove it (should be removed by smbd itself IMHO.)
+				rm -f $SMBDPID
+			fi
+		fi
+
+		log_end_msg 0
+
+		;;
+	reload)
+		if [ "$RUN_MODE" != "inetd" ]; then
+			log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
+
+			start-stop-daemon --stop --quiet --signal HUP --pidfile $SMBDPID
+
+			log_end_msg 0
+		fi
+		;;
+	restart|force-reload)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+        status)
+		status="0"
+		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null`
+		if [ "$NMBD_DISABLED" != "Yes" ]; then
+			status_of_proc -p $NMBDPID /usr/sbin/nmbd nmbd || status=$?
+		fi
+		if [ "$RUN_MODE" != "inetd" ]; then
+			status_of_proc -p $SMBDPID /usr/sbin/smbd smbd || status=$?
+		fi
+		if [ "$NMBD_DISABLED" = "Yes" -a "$RUN_MODE" = "inetd" ]; then
+			status="4"
+		fi
+		exit $status
+		;;
+	*)
+		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload|status}"
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/cluster/master/etc/init.d/shutdownallblades b/master/etc/init.d/shutdownallblades
similarity index 100%
rename from cluster/master/etc/init.d/shutdownallblades
rename to master/etc/init.d/shutdownallblades
diff --git a/cluster/master/etc/init.d/waitslaves b/master/etc/init.d/waitslaves
similarity index 100%
rename from cluster/master/etc/init.d/waitslaves
rename to master/etc/init.d/waitslaves
diff --git a/cluster/master/etc/init.d/wakeonlan b/master/etc/init.d/wakeonlan
similarity index 100%
rename from cluster/master/etc/init.d/wakeonlan
rename to master/etc/init.d/wakeonlan
diff --git a/cluster/master/etc/initramfs-tools/scripts/tftp b/master/etc/initramfs-tools/scripts/tftp
similarity index 100%
rename from cluster/master/etc/initramfs-tools/scripts/tftp
rename to master/etc/initramfs-tools/scripts/tftp
diff --git a/cluster/master/etc/iptables/rules.v4 b/master/etc/iptables/rules.v4
similarity index 100%
rename from cluster/master/etc/iptables/rules.v4
rename to master/etc/iptables/rules.v4
diff --git a/cluster/master/etc/logrotate.d/trc6500 b/master/etc/logrotate.d/trc6500
similarity index 100%
rename from cluster/master/etc/logrotate.d/trc6500
rename to master/etc/logrotate.d/trc6500
diff --git a/master/etc/mailname b/master/etc/mailname
new file mode 100644
index 0000000..c114162
--- /dev/null
+++ b/master/etc/mailname
@@ -0,0 +1 @@
+trc00
diff --git a/cluster/master/etc/modules b/master/etc/modules
similarity index 100%
rename from cluster/master/etc/modules
rename to master/etc/modules
diff --git a/cluster/master/etc/network/interfaces b/master/etc/network/interfaces
similarity index 100%
rename from cluster/master/etc/network/interfaces
rename to master/etc/network/interfaces
diff --git a/cluster/master/etc/nsswitch.conf b/master/etc/nsswitch.conf
similarity index 100%
rename from cluster/master/etc/nsswitch.conf
rename to master/etc/nsswitch.conf
diff --git a/master/etc/resolv.conf b/master/etc/resolv.conf
new file mode 100644
index 0000000..0c1126f
--- /dev/null
+++ b/master/etc/resolv.conf
@@ -0,0 +1,2 @@
+search thalesgroup.com
+nameserver 192.168.0.1
diff --git a/cluster/master/etc/rproxy/sites.csv b/master/etc/rproxy/sites.csv
similarity index 100%
rename from cluster/master/etc/rproxy/sites.csv
rename to master/etc/rproxy/sites.csv
diff --git a/cluster/master/etc/rsyslog.conf b/master/etc/rsyslog.conf
similarity index 100%
rename from cluster/master/etc/rsyslog.conf
rename to master/etc/rsyslog.conf
diff --git a/cluster/master/etc/security/limits.conf b/master/etc/security/limits.conf
similarity index 100%
rename from cluster/master/etc/security/limits.conf
rename to master/etc/security/limits.conf
diff --git a/cluster/master/etc/snmp/snmpd.conf b/master/etc/snmp/snmpd.conf
similarity index 100%
rename from cluster/master/etc/snmp/snmpd.conf
rename to master/etc/snmp/snmpd.conf
diff --git a/cluster/master/etc/ssh/ssh_config b/master/etc/ssh/ssh_config
similarity index 100%
rename from cluster/master/etc/ssh/ssh_config
rename to master/etc/ssh/ssh_config
diff --git a/cluster/master/etc/ssh/sshd_config b/master/etc/ssh/sshd_config
similarity index 100%
rename from cluster/master/etc/ssh/sshd_config
rename to master/etc/ssh/sshd_config
diff --git a/cluster/master/etc/ssmtp/ssmtp.conf b/master/etc/ssmtp/ssmtp.conf
similarity index 100%
rename from cluster/master/etc/ssmtp/ssmtp.conf
rename to master/etc/ssmtp/ssmtp.conf
diff --git a/cluster/master/etc/sysctl.d/trc6500.conf b/master/etc/sysctl.d/trc6500.conf
similarity index 100%
rename from cluster/master/etc/sysctl.d/trc6500.conf
rename to master/etc/sysctl.d/trc6500.conf
diff --git a/master/etc/timezone b/master/etc/timezone
new file mode 100644
index 0000000..7cd9492
--- /dev/null
+++ b/master/etc/timezone
@@ -0,0 +1 @@
+Europe/Paris
diff --git a/master/etc/vim/vimrc b/master/etc/vim/vimrc
new file mode 100644
index 0000000..48608cc
--- /dev/null
+++ b/master/etc/vim/vimrc
@@ -0,0 +1,53 @@
+" All system-wide defaults are set in $VIMRUNTIME/debian.vim (usually just
+" /usr/share/vim/vimcurrent/debian.vim) and sourced by the call to :runtime
+" you can find below.  If you wish to change any of those settings, you should
+" do it in this file (/etc/vim/vimrc), since debian.vim will be overwritten
+" everytime an upgrade of the vim packages is performed.  It is recommended to
+" make changes after sourcing debian.vim since it alters the value of the
+" 'compatible' option.
+
+" This line should not be removed as it ensures that various options are
+" properly set to work with the Vim-related packages available in Debian.
+runtime! debian.vim
+
+" Uncomment the next line to make Vim more Vi-compatible
+" NOTE: debian.vim sets 'nocompatible'.  Setting 'compatible' changes numerous
+" options, so any other options should be set AFTER setting 'compatible'.
+"set compatible
+
+" Vim5 and later versions support syntax highlighting. Uncommenting the next
+" line enables syntax highlighting by default.
+"syntax on
+
+" If using a dark background within the editing area and syntax highlighting
+" turn on this option as well
+"set background=dark
+
+" Uncomment the following to have Vim jump to the last position when
+" reopening a file
+"if has("autocmd")
+"  au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+"endif
+
+" Uncomment the following to have Vim load indentation rules and plugins
+" according to the detected filetype.
+"if has("autocmd")
+"  filetype plugin indent on
+"endif
+
+" The following are commented out as they cause vim to behave a lot
+" differently from regular Vi. They are highly recommended though.
+"set showcmd		" Show (partial) command in status line.
+"set showmatch		" Show matching brackets.
+"set ignorecase		" Do case insensitive matching
+"set smartcase		" Do smart case matching
+"set incsearch		" Incremental search
+"set autowrite		" Automatically save before commands like :next and :make
+"set hidden             " Hide buffers when they are abandoned
+"set mouse=a		" Enable mouse usage (all modes)
+
+" Source a global configuration file if available
+if filereadable("/etc/vim/vimrc.local")
+  source /etc/vim/vimrc.local
+endif
+
diff --git a/master/etc/webconfig/alias.csv b/master/etc/webconfig/alias.csv
new file mode 100644
index 0000000..b521738
--- /dev/null
+++ b/master/etc/webconfig/alias.csv
@@ -0,0 +1,13 @@
+# -*- CSV -*-
+;;;GCFM configuration;
+/;/usr/share/webconfig;/etc/webconfig/alias.csv;Generic Configuration Form Manager;:refresh:
+;;;List of configuration forms;
+/skel;/usr/share/doc/webconfig/skel;test.cfg;Skeleton of Configuration Editor;
+;;;List of actions;
+test-ok;/usr/share/webconfig;;Action button example (ok);/bin/ls /
+test-ko1;/usr/share/webconfig;;Action button example (ko);exit 1
+test-ko2;/usr/share/webconfig;;Action button example (missing);/bin/zzzls /
+test-ok1;/usr/share/webconfig;;Action button example (double cmd);/bin/bash -c "ls /;date"
+/dce;/usr/share/dce;/etc/dhcp/dhcpd.conf;DHCPD Configuration Editor;sudo service isc-dhcp-server restart
+/xcfe;/usr/share/xcfe;/etc/xcfe/config.xml;XML configuration editor;
+/xcfe/cfg;/usr/share/xcfe/cfg;/etc/xcfe/config.csv;CSV configuration editor for XCFE;
diff --git a/master/home b/master/home
new file mode 120000
index 0000000..009ef17
--- /dev/null
+++ b/master/home
@@ -0,0 +1 @@
+/var/media/backup/home
\ No newline at end of file
diff --git a/bios/+init.sh b/master/opt/bios/+init.sh
similarity index 100%
rename from bios/+init.sh
rename to master/opt/bios/+init.sh
diff --git a/bios/SCELNX_64 b/master/opt/bios/SCELNX_64
similarity index 100%
rename from bios/SCELNX_64
rename to master/opt/bios/SCELNX_64
diff --git a/bios/bios-1.0b.cfg b/master/opt/bios/bios-1.0b.cfg
similarity index 100%
rename from bios/bios-1.0b.cfg
rename to master/opt/bios/bios-1.0b.cfg
diff --git a/bios/bios-1.11.cfg b/master/opt/bios/bios-1.11.cfg
similarity index 100%
rename from bios/bios-1.11.cfg
rename to master/opt/bios/bios-1.11.cfg
diff --git a/bios/bios-3.0.cfg b/master/opt/bios/bios-3.0.cfg
similarity index 100%
rename from bios/bios-3.0.cfg
rename to master/opt/bios/bios-3.0.cfg
diff --git a/bios/bios-3.10.cfg b/master/opt/bios/bios-3.10.cfg
similarity index 100%
rename from bios/bios-3.10.cfg
rename to master/opt/bios/bios-3.10.cfg
diff --git a/bios/dmidecode b/master/opt/bios/dmidecode
similarity index 100%
rename from bios/dmidecode
rename to master/opt/bios/dmidecode
diff --git a/bios/update_bios_cfg.sh b/master/opt/bios/update_bios_cfg.sh
similarity index 92%
rename from bios/update_bios_cfg.sh
rename to master/opt/bios/update_bios_cfg.sh
index cbc1102..af25b1d 100755
--- a/bios/update_bios_cfg.sh
+++ b/master/opt/bios/update_bios_cfg.sh
@@ -9,7 +9,7 @@ mydir=$(cd $mydir; pwd)
 
 # formating functions
 
-_echo () { printf "$@\n"; }
+_echo () { [ "$(echo -e '')" ] && echo $@ || echo -e $@; }
 title () { _echo "\033[0;1m$*\033[0;0m"; }
 pass () { _echo "\033[1;32m$*\033[0;0m"; }
 warn () { _echo "\033[1;33m$*\033[0;0m"; }
@@ -48,8 +48,7 @@ done
   fail "Real mode, things will really append" || \
   warn "Dummy mode, nothing will be done"
 if [ ! "$ANS" = "yes" ]; then
-  printf "Press 'y' to continue: "
-  read ANS
+  read -p "Press 'y' to continue: " ANS
   [ "$ANS" = "y" ] || exit 1
 fi
 
diff --git a/cluster/Makefile b/master/opt/cluster/Makefile
similarity index 100%
rename from cluster/Makefile
rename to master/opt/cluster/Makefile
diff --git a/cluster/bin/create_bios_tarball.sh b/master/opt/cluster/bin/create_bios_tarball.sh
similarity index 100%
rename from cluster/bin/create_bios_tarball.sh
rename to master/opt/cluster/bin/create_bios_tarball.sh
diff --git a/cluster/bin/create_root_tarball.sh b/master/opt/cluster/bin/create_root_tarball.sh
similarity index 100%
rename from cluster/bin/create_root_tarball.sh
rename to master/opt/cluster/bin/create_root_tarball.sh
diff --git a/cluster/bin/create_slave_tarball.sh b/master/opt/cluster/bin/create_slave_tarball.sh
similarity index 100%
rename from cluster/bin/create_slave_tarball.sh
rename to master/opt/cluster/bin/create_slave_tarball.sh
diff --git a/cluster/bin/init_cluster_repository.sh b/master/opt/cluster/bin/init_cluster_repository.sh
similarity index 100%
rename from cluster/bin/init_cluster_repository.sh
rename to master/opt/cluster/bin/init_cluster_repository.sh
diff --git a/cluster/bin/init_pxe_repository.sh b/master/opt/cluster/bin/init_pxe_repository.sh
similarity index 100%
rename from cluster/bin/init_pxe_repository.sh
rename to master/opt/cluster/bin/init_pxe_repository.sh
diff --git a/cluster/rec/etc/fstab b/master/opt/cluster/rec/etc/fstab
similarity index 100%
rename from cluster/rec/etc/fstab
rename to master/opt/cluster/rec/etc/fstab
diff --git a/cluster/slave/etc/+hostname b/master/opt/cluster/slave/etc/+hostname
similarity index 100%
rename from cluster/slave/etc/+hostname
rename to master/opt/cluster/slave/etc/+hostname
diff --git a/cluster/slave/etc/chrony/chrony.conf b/master/opt/cluster/slave/etc/chrony/chrony.conf
similarity index 100%
rename from cluster/slave/etc/chrony/chrony.conf
rename to master/opt/cluster/slave/etc/chrony/chrony.conf
diff --git a/cluster/slave/etc/default/atftpd b/master/opt/cluster/slave/etc/default/atftpd
similarity index 100%
rename from cluster/slave/etc/default/atftpd
rename to master/opt/cluster/slave/etc/default/atftpd
diff --git a/cluster/slave/etc/default/etherwake b/master/opt/cluster/slave/etc/default/etherwake
similarity index 100%
rename from cluster/slave/etc/default/etherwake
rename to master/opt/cluster/slave/etc/default/etherwake
diff --git a/cluster/slave/etc/default/hddtemp b/master/opt/cluster/slave/etc/default/hddtemp
similarity index 100%
rename from cluster/slave/etc/default/hddtemp
rename to master/opt/cluster/slave/etc/default/hddtemp
diff --git a/cluster/slave/etc/default/nfs-common b/master/opt/cluster/slave/etc/default/nfs-common
similarity index 100%
rename from cluster/slave/etc/default/nfs-common
rename to master/opt/cluster/slave/etc/default/nfs-common
diff --git a/cluster/slave/etc/default/ntpdate b/master/opt/cluster/slave/etc/default/ntpdate
similarity index 100%
rename from cluster/slave/etc/default/ntpdate
rename to master/opt/cluster/slave/etc/default/ntpdate
diff --git a/cluster/slave/etc/default/rproxy b/master/opt/cluster/slave/etc/default/rproxy
similarity index 100%
rename from cluster/slave/etc/default/rproxy
rename to master/opt/cluster/slave/etc/default/rproxy
diff --git a/cluster/slave/etc/default/samba b/master/opt/cluster/slave/etc/default/samba
similarity index 100%
rename from cluster/slave/etc/default/samba
rename to master/opt/cluster/slave/etc/default/samba
diff --git a/cluster/slave/etc/default/shutdownallblades b/master/opt/cluster/slave/etc/default/shutdownallblades
similarity index 100%
rename from cluster/slave/etc/default/shutdownallblades
rename to master/opt/cluster/slave/etc/default/shutdownallblades
diff --git a/cluster/slave/etc/default/smartmontools b/master/opt/cluster/slave/etc/default/smartmontools
similarity index 100%
rename from cluster/slave/etc/default/smartmontools
rename to master/opt/cluster/slave/etc/default/smartmontools
diff --git a/cluster/slave/etc/default/snmpd b/master/opt/cluster/slave/etc/default/snmpd
similarity index 100%
rename from cluster/slave/etc/default/snmpd
rename to master/opt/cluster/slave/etc/default/snmpd
diff --git a/cluster/slave/etc/default/trc6500 b/master/opt/cluster/slave/etc/default/trc6500
similarity index 100%
rename from cluster/slave/etc/default/trc6500
rename to master/opt/cluster/slave/etc/default/trc6500
diff --git a/cluster/slave/etc/default/waitslaves b/master/opt/cluster/slave/etc/default/waitslaves
similarity index 100%
rename from cluster/slave/etc/default/waitslaves
rename to master/opt/cluster/slave/etc/default/waitslaves
diff --git a/cluster/slave/etc/default/wakeonlan b/master/opt/cluster/slave/etc/default/wakeonlan
similarity index 100%
rename from cluster/slave/etc/default/wakeonlan
rename to master/opt/cluster/slave/etc/default/wakeonlan
diff --git a/cluster/slave/etc/default/webconfig b/master/opt/cluster/slave/etc/default/webconfig
similarity index 100%
rename from cluster/slave/etc/default/webconfig
rename to master/opt/cluster/slave/etc/default/webconfig
diff --git a/cluster/slave/etc/default/~isc-dhcp-server b/master/opt/cluster/slave/etc/default/~isc-dhcp-server
similarity index 100%
rename from cluster/slave/etc/default/~isc-dhcp-server
rename to master/opt/cluster/slave/etc/default/~isc-dhcp-server
diff --git a/cluster/slave/etc/exports b/master/opt/cluster/slave/etc/exports
similarity index 100%
rename from cluster/slave/etc/exports
rename to master/opt/cluster/slave/etc/exports
diff --git a/cluster/slave/etc/fstab b/master/opt/cluster/slave/etc/fstab
similarity index 100%
rename from cluster/slave/etc/fstab
rename to master/opt/cluster/slave/etc/fstab
diff --git a/cluster/slave/etc/hostname b/master/opt/cluster/slave/etc/hostname
similarity index 100%
rename from cluster/slave/etc/hostname
rename to master/opt/cluster/slave/etc/hostname
diff --git a/cluster/slave/etc/inetd.conf b/master/opt/cluster/slave/etc/inetd.conf
similarity index 100%
rename from cluster/slave/etc/inetd.conf
rename to master/opt/cluster/slave/etc/inetd.conf
diff --git a/cluster/slave/etc/inittab b/master/opt/cluster/slave/etc/inittab
similarity index 100%
rename from cluster/slave/etc/inittab
rename to master/opt/cluster/slave/etc/inittab
diff --git a/cluster/slave/etc/network/interfaces b/master/opt/cluster/slave/etc/network/interfaces
similarity index 100%
rename from cluster/slave/etc/network/interfaces
rename to master/opt/cluster/slave/etc/network/interfaces
diff --git a/cluster/slave/etc/rc.local b/master/opt/cluster/slave/etc/rc.local
similarity index 100%
rename from cluster/slave/etc/rc.local
rename to master/opt/cluster/slave/etc/rc.local
diff --git a/cluster/slave/etc/resolv.conf b/master/opt/cluster/slave/etc/resolv.conf
similarity index 100%
rename from cluster/slave/etc/resolv.conf
rename to master/opt/cluster/slave/etc/resolv.conf
diff --git a/cluster/slave/etc/rsyslog.conf b/master/opt/cluster/slave/etc/rsyslog.conf
similarity index 100%
rename from cluster/slave/etc/rsyslog.conf
rename to master/opt/cluster/slave/etc/rsyslog.conf
diff --git a/cluster/slave/etc/ssmtp/+ssmtp.conf b/master/opt/cluster/slave/etc/ssmtp/+ssmtp.conf
similarity index 100%
rename from cluster/slave/etc/ssmtp/+ssmtp.conf
rename to master/opt/cluster/slave/etc/ssmtp/+ssmtp.conf
diff --git a/cluster/slave/etc/ssmtp/ssmtp.conf b/master/opt/cluster/slave/etc/ssmtp/ssmtp.conf
similarity index 100%
rename from cluster/slave/etc/ssmtp/ssmtp.conf
rename to master/opt/cluster/slave/etc/ssmtp/ssmtp.conf
diff --git a/cluster/master/root/.bashrc b/master/opt/cluster/slave/root/.bashrc
similarity index 100%
rename from cluster/master/root/.bashrc
rename to master/opt/cluster/slave/root/.bashrc
diff --git a/cluster/slave/root/.profile b/master/opt/cluster/slave/root/.profile
similarity index 100%
rename from cluster/slave/root/.profile
rename to master/opt/cluster/slave/root/.profile
diff --git a/cluster/slave/root/.screenrc b/master/opt/cluster/slave/root/.screenrc
similarity index 100%
rename from cluster/slave/root/.screenrc
rename to master/opt/cluster/slave/root/.screenrc
diff --git a/cluster/slave/root/.ssh/authorized_keys b/master/opt/cluster/slave/root/.ssh/authorized_keys
similarity index 100%
rename from cluster/slave/root/.ssh/authorized_keys
rename to master/opt/cluster/slave/root/.ssh/authorized_keys
diff --git a/cluster/slave/root/.ssh/id_rsa b/master/opt/cluster/slave/root/.ssh/id_rsa
similarity index 100%
rename from cluster/slave/root/.ssh/id_rsa
rename to master/opt/cluster/slave/root/.ssh/id_rsa
diff --git a/cluster/slave/root/.ssh/id_rsa.pub b/master/opt/cluster/slave/root/.ssh/id_rsa.pub
similarity index 100%
rename from cluster/slave/root/.ssh/id_rsa.pub
rename to master/opt/cluster/slave/root/.ssh/id_rsa.pub
diff --git a/cluster/slave/root/.vimrc b/master/opt/cluster/slave/root/.vimrc
similarity index 100%
rename from cluster/slave/root/.vimrc
rename to master/opt/cluster/slave/root/.vimrc
diff --git a/cluster/slave/usr/sbin/~winbindd b/master/opt/cluster/slave/usr/sbin/~winbindd
similarity index 100%
rename from cluster/slave/usr/sbin/~winbindd
rename to master/opt/cluster/slave/usr/sbin/~winbindd
diff --git a/ipmi/ipmicfg b/master/opt/ipmi/ipmicfg
similarity index 100%
rename from ipmi/ipmicfg
rename to master/opt/ipmi/ipmicfg
diff --git a/ipmi/ipmicfg-linux.x86_64 b/master/opt/ipmi/ipmicfg-linux.x86_64
similarity index 100%
rename from ipmi/ipmicfg-linux.x86_64
rename to master/opt/ipmi/ipmicfg-linux.x86_64
diff --git a/ipmi/ipmicfg.sh b/master/opt/ipmi/ipmicfg.sh
similarity index 100%
rename from ipmi/ipmicfg.sh
rename to master/opt/ipmi/ipmicfg.sh
diff --git a/ipmi/update_blade_cfg.sh b/master/opt/ipmi/update_blade_cfg.sh
similarity index 88%
rename from ipmi/update_blade_cfg.sh
rename to master/opt/ipmi/update_blade_cfg.sh
index 59389e7..9e89959 100755
--- a/ipmi/update_blade_cfg.sh
+++ b/master/opt/ipmi/update_blade_cfg.sh
@@ -9,7 +9,7 @@ mydir=$(cd $mydir; pwd)
 
 # formating functions
 
-_echo () { printf "$@\n"; }
+_echo () { [ "$(echo -e '')" ] && echo $@ || echo -e $@; }
 title () { _echo "\033[0;1m$*\033[0;0m"; }
 pass () { _echo "\033[1;32m$*\033[0;0m"; }
 warn () { _echo "\033[1;33m$*\033[0;0m"; }
@@ -48,8 +48,7 @@ done
   fail "Real mode, things will really append" || \
   warn "Dummy mode, nothing will be done"
 if [ ! "$ANS" = "yes" ]; then
-  printf "Press 'y' to continue: "
-  read ANS
+  read -p "Press 'y' to continue: " ANS
   [ "$ANS" = "y" ] || exit 1
 fi
 
@@ -65,3 +64,4 @@ do_cmd $mydir/ipmicfg.sh -k 255.255.255.0
 #do_cmd $mydir/ipmicfg.sh -g 10.133.26.231
 do_cmd $mydir/ipmicfg.sh -g 0.0.0.0
 do_cmd $mydir/ipmicfg.sh -fan 3
+[ "$(which ipmitool)" ] && do_cmd ipmitool chassis policy  always-on
diff --git a/tftp/balder10.imz b/master/opt/tftp/balder10.imz
similarity index 100%
rename from tftp/balder10.imz
rename to master/opt/tftp/balder10.imz
diff --git a/tftp/cat4500-ipbase-mz.122-54.SG1.bin b/master/opt/tftp/cat4500-ipbase-mz.122-54.SG1.bin
similarity index 100%
rename from tftp/cat4500-ipbase-mz.122-54.SG1.bin
rename to master/opt/tftp/cat4500-ipbase-mz.122-54.SG1.bin
diff --git a/tftp/cat4500e-ipbase-mz.122-54.SG1.bin b/master/opt/tftp/cat4500e-ipbase-mz.122-54.SG1.bin
similarity index 100%
rename from tftp/cat4500e-ipbase-mz.122-54.SG1.bin
rename to master/opt/tftp/cat4500e-ipbase-mz.122-54.SG1.bin
diff --git a/tftp/fr.kmp b/master/opt/tftp/fr.kmp
similarity index 100%
rename from tftp/fr.kmp
rename to master/opt/tftp/fr.kmp
diff --git a/tftp/initrd.img b/master/opt/tftp/initrd.img
similarity index 100%
rename from tftp/initrd.img
rename to master/opt/tftp/initrd.img
diff --git a/tftp/memdisk b/master/opt/tftp/memdisk
similarity index 100%
rename from tftp/memdisk
rename to master/opt/tftp/memdisk
diff --git a/tftp/menu.c32 b/master/opt/tftp/menu.c32
similarity index 100%
rename from tftp/menu.c32
rename to master/opt/tftp/menu.c32
diff --git a/tftp/pxelinux.0 b/master/opt/tftp/pxelinux.0
similarity index 100%
rename from tftp/pxelinux.0
rename to master/opt/tftp/pxelinux.0
diff --git a/tftp/pxelinux.cfg/0A851A b/master/opt/tftp/pxelinux.cfg/0A851A
similarity index 69%
rename from tftp/pxelinux.cfg/0A851A
rename to master/opt/tftp/pxelinux.cfg/0A851A
index 0e08872..a55abe0 100644
--- a/tftp/pxelinux.cfg/0A851A
+++ b/master/opt/tftp/pxelinux.cfg/0A851A
@@ -12,7 +12,8 @@ LABEL debian
 	MENU LABEL ^Debian 7 (TRC6500)
 	KERNEL /vmlinuz
 	INITRD /initrd.img
-	APPEND noinitrd ramdisk_size=8192 boot=tftp fastboot tftpserver=10.133.28.160 tarballs=bios.tgz
+	#APPEND noinitrd ramdisk_size=8192 boot=tftp fastboot tftpserver=10.133.28.160 tarballs=bios.tgz
+	APPEND noinitrd ramdisk_size=8192 boot=tftp fastboot tftpserver=10.133.28.160 tarballs=root.tgz,slave.tgz
 
 LABEL freedos
 	MENU LABEL ^FreeDos 1.0
diff --git a/tftp/pxelinux.cfg/0A851A50 b/master/opt/tftp/pxelinux.cfg/0A851A50
similarity index 100%
rename from tftp/pxelinux.cfg/0A851A50
rename to master/opt/tftp/pxelinux.cfg/0A851A50
diff --git a/tftp/pxelinux.cfg/0A851C b/master/opt/tftp/pxelinux.cfg/0A851C
similarity index 100%
rename from tftp/pxelinux.cfg/0A851C
rename to master/opt/tftp/pxelinux.cfg/0A851C
diff --git a/tftp/pxelinux.cfg/0A851C50 b/master/opt/tftp/pxelinux.cfg/0A851C50
similarity index 100%
rename from tftp/pxelinux.cfg/0A851C50
rename to master/opt/tftp/pxelinux.cfg/0A851C50
diff --git a/tftp/pxelinux.cfg/default b/master/opt/tftp/pxelinux.cfg/default
similarity index 100%
rename from tftp/pxelinux.cfg/default
rename to master/opt/tftp/pxelinux.cfg/default
diff --git a/tftp/pxelinux.txt b/master/opt/tftp/pxelinux.txt
similarity index 100%
rename from tftp/pxelinux.txt
rename to master/opt/tftp/pxelinux.txt
diff --git a/tftp/swg1.txt b/master/opt/tftp/swg1.txt
similarity index 100%
rename from tftp/swg1.txt
rename to master/opt/tftp/swg1.txt
diff --git a/tftp/swg2.txt b/master/opt/tftp/swg2.txt
similarity index 100%
rename from tftp/swg2.txt
rename to master/opt/tftp/swg2.txt
diff --git a/tftp/swm.txt b/master/opt/tftp/swm.txt
similarity index 100%
rename from tftp/swm.txt
rename to master/opt/tftp/swm.txt
diff --git a/tftp/vmlinuz b/master/opt/tftp/vmlinuz
similarity index 100%
rename from tftp/vmlinuz
rename to master/opt/tftp/vmlinuz
diff --git a/master/opt/trc6500/debian-rep/binary/Packages.gz b/master/opt/trc6500/debian-rep/binary/Packages.gz
new file mode 100644
index 0000000000000000000000000000000000000000..6dffc88d7ebd3695a955b82ba0b99c0a1d133158
GIT binary patch
literal 29
dcmb2|=HU4GDj|e{IUq4PJ25@An1PuA1^|M}26q4e

literal 0
HcmV?d00001

diff --git a/master/rec b/master/rec
new file mode 120000
index 0000000..0f7b4f7
--- /dev/null
+++ b/master/rec
@@ -0,0 +1 @@
+/var/media/backup/rec
\ No newline at end of file
diff --git a/cluster/slave/root/.bashrc b/master/root/.bashrc
similarity index 100%
rename from cluster/slave/root/.bashrc
rename to master/root/.bashrc
diff --git a/master/root/bin/du_root b/master/root/bin/du_root
new file mode 100755
index 0000000..71d7904
--- /dev/null
+++ b/master/root/bin/du_root
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+du -sh $(du -sk /* 2>/dev/null | sort -n -k1 | awk '{print $2}') 2>/dev/null
diff --git a/master/root/bin/extract_thermal_info b/master/root/bin/extract_thermal_info
new file mode 100755
index 0000000..3d49ce4
--- /dev/null
+++ b/master/root/bin/extract_thermal_info
@@ -0,0 +1,13 @@
+#!/usr/bin/awk -f
+
+/sensord/ && /Phy/ {
+	printf "%s %s;%s;%s;%d;%g\n", $1, $2, $3, $4, $8, $9
+	if (max < $9) {
+	       	max=$9
+	       	host=$4
+       	}
+}
+
+END {
+       	printf "%s: %g\n", host, max
+}
diff --git a/master/root/bin/get_switch_temperature b/master/root/bin/get_switch_temperature
new file mode 100755
index 0000000..64eb005
--- /dev/null
+++ b/master/root/bin/get_switch_temperature
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+CONNECT_SWITCH=/root/bin/connect_switch.tcl
+
+PROGNAME=$(basename $0)
+
+# formating functions
+
+_echo () { [ "$(echo -e '')" ] && echo $@ || echo -e $@; }
+title () { _echo "\033[0;1m$*\033[0;0m"; }
+pass () { _echo "\033[1;32m$*\033[0;0m"; }
+warn () { _echo "\033[1;33m$*\033[0;0m"; }
+fail () { _echo "\033[1;31m$*\033[0;0m"; }
+
+usage () {
+  echo "usage: $PROGNAME [-h] [-s host]"
+  echo " -h: help message"
+  echo " -s host: switch hostname"
+  exit $@
+}
+
+[ -x $CONNECT_SWITCH ] || exit 0
+
+# argument processing
+
+while [ $# -gt 0 ]; do
+  case "$1" in
+  -h) usage 0;;
+  -s) shift; SWITCH=$1;;
+  esac
+  shift
+done
+
+[ "$SWITCH" ] || usage 1
+ping -c 1 -w 1 $SWITCH 2>&1 1>/dev/null || exit 1
+
+$CONNECT_SWITCH $SWITCH -c 'show platform chassis status' | \
+	awk '/air/ { sub(/\r/, ""); print "'$SWITCH': ", $3, $4, $2 }' | \
+	logger -t switch
diff --git a/master/root/debian-list.txt b/master/root/debian-list.txt
new file mode 100644
index 0000000..63c49a0
--- /dev/null
+++ b/master/root/debian-list.txt
@@ -0,0 +1,274 @@
+acpi
+acpi-support-base
+acpid
+adduser
+apt
+apt-listchanges
+apt-utils
+aptitude
+aptitude-common
+at
+atftpd
+base-files
+base-passwd
+bash
+bash-completion
+bc
+bind9-host
+bsd-mailx
+bsdmainutils
+bsdutils
+build-essential
+busybox
+bzip2
+cdrdao
+chrony
+console-setup
+coreutils
+cpio
+cpumon
+cron
+curl
+daemon
+dash
+db5.1-util
+dc
+dce
+debconf
+debconf-i18n
+debian-archive-keyring
+debianutils
+deborphan
+diffutils
+discover
+dmidecode
+dnsutils
+dosfstools
+dpkg
+e2fslibs
+e2fsprogs
+eject
+etherwake
+ethtool
+expect
+fakeroot
+findutils
+firmware-bnx2
+firmware-linux-free
+fonts-liberation
+freeipmi-tools
+ftp
+gawk
+gcc-4.7-base
+gdb
+gettext-base
+git
+gnupg
+gnuplot
+gnuplot-x11
+gpgv
+gpm
+grep
+groff-base
+grub-common
+grub-pc
+gzip
+hddtemp
+hdparm
+host
+hostname
+ifupdown
+info
+initramfs-tools
+initscripts
+insserv
+install-info
+installation-report
+iperf
+ipmitool
+iproute
+iptables
+iptables-persistent
+iptraf
+iputils-ping
+isc-dhcp-client
+isc-dhcp-common
+isc-dhcp-server
+keyboard-configuration
+kmod
+laptop-detect
+less
+libacl1
+libapt-inst1.5
+libapt-pkg4.12
+libattr1
+libavahi-client3
+libavahi-common-data
+libavahi-common3
+libblkid1
+libboost-iostreams1.49.0
+libbz2-1.0
+libc-bin
+libc6
+libc6-i386
+libcalloc1
+libcap2-bin
+libclass-accessor-perl
+libcomerr2
+libcroco3
+libcups2
+libcwidget3
+libcycle1
+libdb5.1
+libdbus-1-3
+libdebug1
+libelfg0
+libept1.4.12
+libfile-copy-recursive-perl
+libgcc1
+libgcrypt11
+libgdbm3
+libgnutls26
+libgpg-error0
+libidn11
+libjbig0
+libkmod2
+liblist-moreutils-perl
+liblocale-gettext-perl
+liblockfile-bin
+liblog4cxx10
+liblzma5
+libmcore1
+libmount1
+libncurses5
+libncursesw5
+libnewt0.52
+libnfnetlink0
+libopenthreads14
+libp11-kit0
+libpam-modules
+libpam-modules-bin
+libpam-runtime
+libpam0g
+libpipeline1
+libpopt0
+libprocps0
+libreadline6
+librtmp0
+libselinux1
+libsemanage-common
+libsemanage1
+libsepol1
+libsigc++-2.0-0c2a
+libslang2
+libsqlite3-0
+libss2
+libssh2-1
+libssl1.0.0
+libstdc++6
+libsub-name-perl
+libtasn1-3
+libtdb1
+libtext-charwidth-perl
+libtext-iconv-perl
+libtext-wrapi18n-perl
+libtinfo5
+libudev0
+libusb-0.1-4
+libustr-1.0-1
+libuuid1
+libxapian22
+libxml-simple-perl
+linux-image-amd64
+lm-sensors
+locales
+login
+logrotate
+lsb-base
+lsof
+ltrace
+m4
+man-db
+manpages
+mawk
+memstat
+mlocate
+mount
+multiarch-support
+mutt
+nano
+ncurses-base
+ncurses-bin
+net-tools
+netbase
+netcat-traditional
+ntpdate
+octave
+p7zip-full
+par2
+passwd
+patch
+pciutils
+perl-base
+procmail
+procps
+python-apt
+python-reportbug
+python-support
+python-twisted-web
+readline-common
+reportbug
+rsync
+rsyslog
+screen
+sed
+sensible-utils
+sensord
+smbclient
+snmp
+snmpd
+sshfs
+ssmtp
+strace
+sudo
+syslinux
+sysv-rc
+sysvinit
+sysvinit-utils
+tar
+task-english
+task-file-server
+task-ssh-server
+tasksel
+tasksel-data
+tcl
+tcpdump
+telnet
+texinfo
+time
+timelimit
+tofrodos
+traceroute
+tzdata
+udev
+unrar-free
+update-inetd
+usbutils
+util-linux
+valgrind
+vim
+vim-common
+vim-tiny
+w3m
+wakeonlan
+webconfig
+wget
+whiptail
+whois
+winbind
+wodim
+xcfe
+xz-utils
+yasm
+zip
+zlib1g
-- 
2.30.2