X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Frc.local.erb;h=b3d13dc021860bc952480ab2b6fadcd353d8486f;hb=4326b0a78553bfe9696c10f1a69e1316acd23802;hp=7ccbf7616d1ae067a97f5037adec4daca0f172fb;hpb=243aa104d83799163cb11cfbf310112cbcb59e9c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/rc.local.erb b/modules/debian-org/templates/rc.local.erb
index 7ccbf7616..b3d13dc02 100755
--- a/modules/debian-org/templates/rc.local.erb
+++ b/modules/debian-org/templates/rc.local.erb
@@ -6,9 +6,20 @@
 ##
 <%- if hostname == "zani" then -%>
   if [ -n "$(awk '$4 == "dasdb1" && $3 == "249999" {print}' /proc/partitions)" ]; then
-    mkswap /dev/dasdb1 && swapon /dev/dasdb1
+    mkswap /dev/dasdb1 && swapon -p 30 /dev/dasdb1
   fi
+  if [ -n "$(awk '$4 == "dasdc1" && $3 == "249999" {print}' /proc/partitions)" ]; then
+    mkswap /dev/dasdc1 && swapon -p 30 /dev/dasdc1
+  fi
+<%- end -%>
+<% if scope.lookupvar('site::nodeinfo')['ldap'].has_key?('architecture') and scope.lookupvar('site::nodeinfo')['ldap']['architecture'][0].start_with?('kfreebsd') -%>
+  ( sleep 120;
+    service syslog-ng restart;
+    sleep 5;
+    init q
+  ) & disown
 <%- end -%>
+
 if [ -e /proc/sys/kernel/modules_disabled ]; then
 	( sleep 60;
 	  echo 1 > /proc/sys/kernel/modules_disabled || true