From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Mon, 15 Jun 2015 09:51:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/dev_tr65_ole_1086_simple_cdd'
X-Git-Tag: debian_7.8.2~3
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=51a972c379cff3eb82e8dcf3cdccc58bd6b23cdf;hp=e043b5aa8063aa3c34099db9fcabcf3b641065dd;p=debian6500.git

Merge remote-tracking branch 'origin/dev_tr65_ole_1086_simple_cdd'
---

diff --git a/install_debian.txt b/install_debian.txt
index ba1f1d9..c44aee3 100644
--- a/install_debian.txt
+++ b/install_debian.txt
@@ -27,7 +27,6 @@ Step 2: First configuration
 * on blade
   mount -a
   mv /home /var/media/backup
-  mkdir -p /var/media/backup/{dump,rec}
   mkdir -p /var/media/backup/dump/{core,dump_delay_line,dump_track_base,log,prod,rec,trace}
   ln -s /var/media/backup/home /home
   reboot
diff --git a/master/opt/cluster/rec/etc/fstab b/master/opt/cluster/rec/etc/fstab
index a04c448..d5f7fa1 100644
--- a/master/opt/cluster/rec/etc/fstab
+++ b/master/opt/cluster/rec/etc/fstab
@@ -27,4 +27,4 @@ nfsserver:/dump      /dump                 nfs     acregmax=5,acdirmax=5,default
 nfsserver:/opt       /opt                  nfs     acregmax=5,acdirmax=5,defaults 0       0
 nfsserver:/home      /home                 nfs     acregmax=5,acdirmax=5,defaults 0       0
 
-LABEL=REC            /var/media/backup/rec ext4    defaults                       0       2
+LABEL=REC            /var/media/rec       ext4    defaults                       0       2
diff --git a/master/opt/cluster/rec/etc/rc.local b/master/opt/cluster/rec/etc/rc.local
index 05f83ac..03c36a0 100755
--- a/master/opt/cluster/rec/etc/rc.local
+++ b/master/opt/cluster/rec/etc/rc.local
@@ -11,7 +11,7 @@
 #
 # By default this script does nothing.
 
-# fix f@#%ing nfs mount
+# fix f*0^$#g local mount
 mount -a
 
 exit 0
diff --git a/master/opt/cluster/rec/var/media/backup/rec/.empty b/master/opt/cluster/rec/var/media/backup/rec/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/master/opt/cluster/slave/var/media/prod/.empty b/master/opt/cluster/slave/var/media/prod/.empty
new file mode 100644
index 0000000..e69de29
diff --git a/master/opt/cluster/slave/var/media/rec/.empty b/master/opt/cluster/slave/var/media/rec/.empty
new file mode 100644
index 0000000..e69de29
diff --git a/master/opt/tftp/pxelinux.cfg/rec b/master/opt/tftp/pxelinux.cfg/rec
index bb4c263..e01a7a2 100644
--- a/master/opt/tftp/pxelinux.cfg/rec
+++ b/master/opt/tftp/pxelinux.cfg/rec
@@ -12,7 +12,7 @@ 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=root.tgz,slave.tgz,acq.tgz,rec.tgz
+	APPEND noinitrd ramdisk_size=8192 boot=tftp fastboot tftpserver=10.133.28.160 tarballs=root.tgz,slave.tgz,rec.tgz
 
 LABEL freedos
 	MENU LABEL ^FreeDos 1.0
diff --git a/master/rec b/master/rec
index 0f7b4f7..5a12c9a 120000
--- a/master/rec
+++ b/master/rec
@@ -1 +1 @@
-/var/media/backup/rec
\ No newline at end of file
+/var/media/rec
\ No newline at end of file
diff --git a/master/var/media/backup/.empty b/master/var/media/backup/.empty
new file mode 100644
index 0000000..e69de29
diff --git a/master/var/media/backup/prod b/master/var/media/backup/prod
deleted file mode 120000
index 9eac7b2..0000000
--- a/master/var/media/backup/prod
+++ /dev/null
@@ -1 +0,0 @@
-/var/media/prod
\ No newline at end of file
diff --git a/master/var/media/rec/.empty b/master/var/media/rec/.empty
new file mode 100644
index 0000000..e69de29