From 91565006cc4511310f8789a9f9abbe4234054ec0 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 22 Sep 2011 13:25:37 -0300
Subject: Subscribing fs config files to update-initramfs on laptop

---
 manifests/laptop.pp               | 33 ++++++++++++++++++---------------
 manifests/subsystems/initramfs.pp |  1 +
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'manifests')

diff --git a/manifests/laptop.pp b/manifests/laptop.pp
index d166a15..ba5235d 100644
--- a/manifests/laptop.pp
+++ b/manifests/laptop.pp
@@ -9,34 +9,37 @@ class nodo::laptop inherits nodo::personal {
   # fstab
   if $fstab != false {
     file { "/etc/fstab":
-      source  => "puppet://$server/modules/nodo/etc/fstab/laptop",
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => present,
+      source    => "puppet://$server/modules/nodo/etc/fstab/laptop",
+      owner     => "root",
+      group     => "root",
+      mode      => 0644,
+      ensure    => present,
+      subscribe => Exec['update-initramfs],
     }
   }
 
   # crypttab
   if $crypttab != false {
     file { "/etc/crypttab":
-      source  => $hibernate ? {
+      source    => $hibernate ? {
         false   => "puppet://$server/modules/nodo/etc/crypttab/laptop",
         default => "puppet://$server/modules/nodo/etc/crypttab/laptop.hibernate",
       },
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      ensure  => present,
+      owner     => "root",
+      group     => "root",
+      mode      => 0644,
+      ensure    => present,
+      subscribe => Exec['update-initramfs],
     }
 
     # hibernation
     file { "/etc/initramfs-tools/conf.d/resume":
-      owner   => "root",
-      group   => "root",
-      mode    => 0644,
-      content => "RESUME=/dev/mapper/cswap",
-      ensure  => $hibernate ? {
+      owner     => "root",
+      group     => "root",
+      mode      => 0644,
+      content   => "RESUME=/dev/mapper/cswap",
+      subscribe => Exec['update-initramfs],
+      ensure    => $hibernate ? {
         false   => absent,
         default => present,
       },
diff --git a/manifests/subsystems/initramfs.pp b/manifests/subsystems/initramfs.pp
index 3b37f65..27029c3 100644
--- a/manifests/subsystems/initramfs.pp
+++ b/manifests/subsystems/initramfs.pp
@@ -21,5 +21,6 @@ class initramfs {
   exec { "update-initramfs -v -u":
     subscribe   => [ File["/etc/initramfs-tools/modules"], File["/etc/modprobe.d/blacklist"] ],
     refreshonly => true,
+    alias       => 'update-initramfs',
   }
 }
-- 
cgit v1.2.3