diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-22 10:39:11 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-22 10:39:11 -0300 |
| commit | f55276477c27770af28e53bb8d4c8f9447993f05 (patch) | |
| tree | 234360d8e90cb990d515717df9c8a87f23eeeb52 | |
| parent | c9d08c50fc371c6f5576adfb0229015daf0e6fbe (diff) | |
| download | puppet-nodo-f55276477c27770af28e53bb8d4c8f9447993f05.tar.gz puppet-nodo-f55276477c27770af28e53bb8d4c8f9447993f05.tar.bz2 | |
Adding hibernation support for laptops
| -rw-r--r-- | files/etc/crypttab/laptop.hibernate | 5 | ||||
| -rw-r--r-- | manifests/laptop.pp | 5 | ||||
| -rw-r--r-- | manifests/subsystems/utils/laptop.pp | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/files/etc/crypttab/laptop.hibernate b/files/etc/crypttab/laptop.hibernate new file mode 100644 index 0000000..ab8a8e2 --- /dev/null +++ b/files/etc/crypttab/laptop.hibernate @@ -0,0 +1,5 @@ +# <target name> <source device> <key file> <options> +root /dev/mapper/vg-root none luks,cipher=aes-cbc-essiv:sha256 +home /dev/mapper/vg-home none luks,cipher=aes-cbc-essiv:sha256 +var /dev/mapper/vg-var none luks,cipher=aes-cbc-essiv:sha256 +cswap /dev/sda1 none swap,cipher=aes-cbc-essiv:sha256 diff --git a/manifests/laptop.pp b/manifests/laptop.pp index db355c0..38f235d 100644 --- a/manifests/laptop.pp +++ b/manifests/laptop.pp @@ -20,7 +20,10 @@ class nodo::laptop inherits nodo::personal { # crypttab if $crypttab != false { file { "/etc/crypttab": - source => "puppet://$server/modules/nodo/etc/crypttab/laptop", + 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, diff --git a/manifests/subsystems/utils/laptop.pp b/manifests/subsystems/utils/laptop.pp index e1022a5..5ae29d6 100644 --- a/manifests/subsystems/utils/laptop.pp +++ b/manifests/subsystems/utils/laptop.pp @@ -16,8 +16,13 @@ class utils::laptop { } } - # Currently no hibernation - package { 'uswsusp': - ensure => absent, + # Hibernation on lenny + if $lsbdistcodename == 'lenny' { + package { 'uswsusp': + ensure => $hibernate ? { + false => absent, + default => present, + }, + } } } |