From: Laurent Mazet <laurent.mazet@thalesgroup.com>
Date: Wed, 14 Jan 2015 14:21:00 +0000 (+0100)
Subject: Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
X-Git-Tag: debian_7.8.1~16
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=6cfa8b5effc97f0fed7c85a10cf7173e1e4ed9a4;hp=57f52f764c3b07a10a7c3576b303b1cbbd5a4f78;p=debian6500.git

Merge branch 'master' of srvgitgnv:/gitstore/g_tr65/debian6500
---

diff --git a/master/etc/dhcp/dhcpd.conf.alpha b/master/etc/dhcp/dhcpd.conf.alpha
index 3a61b27..6da036e 100644
--- a/master/etc/dhcp/dhcpd.conf.alpha
+++ b/master/etc/dhcp/dhcpd.conf.alpha
@@ -46,7 +46,7 @@ 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;
+  #option routers 10.133.26.231;
   use-host-decl-names on;
   authoritative;
 }
diff --git a/master/etc/dhcp/dhcpd.conf.blank b/master/etc/dhcp/dhcpd.conf.blank
index cf260ed..11892ec 100644
--- a/master/etc/dhcp/dhcpd.conf.blank
+++ b/master/etc/dhcp/dhcpd.conf.blank
@@ -46,7 +46,7 @@ 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;
+  #option routers 10.133.26.231;
   use-host-decl-names on;
   authoritative;
 }
diff --git a/master/etc/dhcp/dhcpd.conf.bravo b/master/etc/dhcp/dhcpd.conf.bravo
index c2aae91..ad308e7 100644
--- a/master/etc/dhcp/dhcpd.conf.bravo
+++ b/master/etc/dhcp/dhcpd.conf.bravo
@@ -46,7 +46,7 @@ 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;
+  #option routers 10.133.26.231;
   use-host-decl-names on;
   authoritative;
 }
diff --git a/master/etc/dhcp/dhcpd.conf.cl0 b/master/etc/dhcp/dhcpd.conf.cl0
index b4e6876..35ee1e2 100644
--- a/master/etc/dhcp/dhcpd.conf.cl0
+++ b/master/etc/dhcp/dhcpd.conf.cl0
@@ -46,7 +46,7 @@ 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;
+  #option routers 10.133.26.231;
   use-host-decl-names on;
   authoritative;
 }
diff --git a/master/etc/dhcp/dhcpd.conf.gamma b/master/etc/dhcp/dhcpd.conf.gamma
index 9b7dead..6e60aed 100644
--- a/master/etc/dhcp/dhcpd.conf.gamma
+++ b/master/etc/dhcp/dhcpd.conf.gamma
@@ -46,7 +46,7 @@ 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;
+  #option routers 10.133.26.231;
   use-host-decl-names on;
   authoritative;
 }
diff --git a/master/opt/cluster/acq/etc/rc.local b/master/opt/cluster/acq/etc/rc.local
new file mode 100755
index 0000000..fd73c36
--- /dev/null
+++ b/master/opt/cluster/acq/etc/rc.local
@@ -0,0 +1,23 @@
+#!/bin/bash -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+# distribute interrupt for eth0 on core 1-5
+core=(2 4 8 16 32)
+l=0
+for i in $(awk '/eth0/ {sub(/:/, ""); print $1}' /proc/interrupts); do
+  echo ${core[$l]} > /proc/irq/$i/smp_affinity
+  let l++
+  [ $l -eq 5 ] && l=0
+done
+
+exit 0
diff --git a/master/opt/cluster/rec/etc/rc.local b/master/opt/cluster/rec/etc/rc.local
new file mode 100755
index 0000000..05f83ac
--- /dev/null
+++ b/master/opt/cluster/rec/etc/rc.local
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+#
+# rc.local
+#
+# This script is executed at the end of each multiuser runlevel.
+# Make sure that the script will "exit 0" on success or any other
+# value on error.
+#
+# In order to enable or disable this script just change the execution
+# bits.
+#
+# By default this script does nothing.
+
+# fix f@#%ing nfs mount
+mount -a
+
+exit 0
diff --git a/master/var/media/backup/prod b/master/var/media/backup/prod
new file mode 120000
index 0000000..9eac7b2
--- /dev/null
+++ b/master/var/media/backup/prod
@@ -0,0 +1 @@
+/var/media/prod
\ No newline at end of file
diff --git a/master/var/media/prod/.empty b/master/var/media/prod/.empty
new file mode 100644
index 0000000..e69de29