Merge remote-tracking branch 'origin/dev_tr65_ole_1086_simple_cdd'

diff --git a/install_debian.txt b/install_debian.txt
index ba1f1d9ab822e2334476a008149193b77486c738..c44aee341020b5c51a630d6c1382df0c9c6d8547 100644 (file)
--- 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 a04c4481ae7e0ad670aca6c0778dbc47ded3803e..d5f7fa1b16e8afeca1293be4ddb16e634417c227 100644 (file)
--- 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 05f83ac5333926a2355f0a6d0ae1723726b84455..03c36a059bb41b68295bebdb391eba65b95baef5 100755 (executable)
--- 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 (file)
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 (file)
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 (file)
index 0000000..e69de29

diff --git a/master/opt/tftp/pxelinux.cfg/rec b/master/opt/tftp/pxelinux.cfg/rec
index bb4c263af9dbb35b4679c0e672763b960619b3cd..e01a7a2e2ee3a3fbbfab6374e9eac81c48c9eeea 100644 (file)
--- 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 0f7b4f74fcf7eccd9d51f82a6a2426acf347db7f..5a12c9a95dd55503784a0e9082219b0bbcba6388 120000 (symlink)
--- 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 (file)
index 0000000..e69de29

diff --git a/master/var/media/backup/prod b/master/var/media/backup/prod
deleted file mode 120000 (symlink)
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 (file)
index 0000000..e69de29