aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2022-02-02 13:05:49 -0300
committerSilvio Rhatto <rhatto@riseup.net>2022-02-02 13:05:49 -0300
commit49c61b45d68e3bd04a8e6b692138aa0233c040fd (patch)
tree8e35a78cecb454e09eb0d9cdfa379749b0c32454
parentb73974e366d0fb88b39ce67ae157c3a93a753665 (diff)
downloadpuppet-nodo-49c61b45d68e3bd04a8e6b692138aa0233c040fd.tar.gz
puppet-nodo-49c61b45d68e3bd04a8e6b692138aa0233c040fd.tar.bz2
Fix: remove uswsusp
-rw-r--r--manifests/subsystem/hibernate.pp45
1 files changed, 25 insertions, 20 deletions
diff --git a/manifests/subsystem/hibernate.pp b/manifests/subsystem/hibernate.pp
index 2efedad..d1fb87d 100644
--- a/manifests/subsystem/hibernate.pp
+++ b/manifests/subsystem/hibernate.pp
@@ -1,23 +1,14 @@
class nodo::subsystem::hibernate(
$enable = false,
) {
+ # RM: uswsusp -- RoQA; Dead upstream, unmaintained
+ # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954061
package { 'uswsusp':
- ensure => $enable ? {
- false => absent,
- default => present,
- },
- }
-
- file { "/etc/initramfs-tools/conf.d/resume":
- owner => "root",
- group => "root",
- mode => '0644',
- content => "RESUME=/dev/mapper/swap\n",
- notify => Exec['update-initramfs'],
- ensure => $enable ? {
- false => absent,
- default => present,
- },
+ ensure => absent,
+ #ensure => $enable ? {
+ # false => absent,
+ # default => present,
+ #},
}
file { "/etc/uswsusp.conf":
@@ -26,10 +17,11 @@ class nodo::subsystem::hibernate(
mode => '0644',
source => 'puppet:///modules/nodo/etc/uswsusp.conf',
require => Package['uswsusp'],
- ensure => $enable ? {
- false => absent,
- default => present,
- },
+ ensure => absent,
+ #ensure => $enable ? {
+ # false => absent,
+ # default => present,
+ #},
}
file { "/etc/pm/config.d/00sleep_module":
@@ -38,6 +30,19 @@ class nodo::subsystem::hibernate(
mode => '0644',
content => "SLEEP_MODULE=\"uswsusp\"\n",
require => Package['uswsusp'],
+ ensure => absent,
+ #ensure => $enable ? {
+ # false => absent,
+ # default => present,
+ #},
+ }
+
+ file { "/etc/initramfs-tools/conf.d/resume":
+ owner => "root",
+ group => "root",
+ mode => '0644',
+ content => "RESUME=/dev/mapper/swap\n",
+ notify => Exec['update-initramfs'],
ensure => $enable ? {
false => absent,
default => present,