]> gitweb.fluxo.info Git - puppet-nodo.git/commitdiff
Subscribing fs config files to update-initramfs on laptop
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 22 Sep 2011 16:25:37 +0000 (13:25 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 22 Sep 2011 16:25:37 +0000 (13:25 -0300)
manifests/laptop.pp
manifests/subsystems/initramfs.pp

index d166a1568435f673a0145cf8bbb98c275c83601a..ba5235d5a6000f0c7fc277b8cd1072e65e556716 100644 (file)
@@ -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,
       },
index 3b37f65c44c7987aff565e4dee9c9b4d22c3232b..27029c3a53266515f189e3ef81f9c42e4d80ab67 100644 (file)
@@ -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',
   }
 }