From 6d240e987cbbabf6e66b22553ec1f1d3fc2bc3d6 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Feb 2015 19:09:13 +0100 Subject: [PATCH] Make rc.local a template, make swap on zani --- modules/debian-org/manifests/init.pp | 2 +- .../debian-org/{files/rc.local => templates/rc.local.erb} | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename modules/debian-org/{files/rc.local => templates/rc.local.erb} (64%) diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index db9e9d37..dc9d2722 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -287,7 +287,7 @@ class debian-org { } file { '/etc/rc.local': mode => '0755', - source => 'puppet:///modules/debian-org/rc.local', + content => template('debian-org/rc.local.erb'), notify => Exec['service rc.local start'], } file { '/etc/dsa': diff --git a/modules/debian-org/files/rc.local b/modules/debian-org/templates/rc.local.erb similarity index 64% rename from modules/debian-org/files/rc.local rename to modules/debian-org/templates/rc.local.erb index d947009b..b6016e7e 100755 --- a/modules/debian-org/files/rc.local +++ b/modules/debian-org/templates/rc.local.erb @@ -12,3 +12,8 @@ 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 -%> -- 2.39.2