X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Frc.local.erb;h=b3d13dc021860bc952480ab2b6fadcd353d8486f;hb=b831a249ddfcbe957407a874e42785e98464692d;hp=b6016e7e60eec7be5e2e12f03f6488314c0864c6;hpb=9d16a7530807bab987ff86e9f4fb3bbfec9feeb8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/rc.local.erb b/modules/debian-org/templates/rc.local.erb
index b6016e7e6..b3d13dc02 100755
--- a/modules/debian-org/templates/rc.local.erb
+++ b/modules/debian-org/templates/rc.local.erb
@@ -4,6 +4,21 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
+<%- if hostname == "zani" then -%>
+  if [ -n "$(awk '$4 == "dasdb1" && $3 == "249999" {print}' /proc/partitions)" ]; then
+    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;
@@ -12,8 +27,3 @@ if [ -e /proc/sys/kernel/modules_disabled ]; then
 fi
 
 touch /var/run/reboot-lock
-<%- if hostname == "zani" then -%>
-  if [ -n "$(awk '$4 == "dasdb1" && $3 == "249999" {print}' /proc/partitions)" ]; then
-    mkswap /dev/dasdb1 && swapon /dev/dasdb1
-  fi
-<%- end -%>