Updating crypttab/fstab/resume to new layout

diff --git a/files/etc/crypttab/appliance b/files/etc/crypttab/appliance
index 1e43d670e17220b3ed90c4038b2d2e16188688dc..24d20bbffe99ac6c9b6b08e5262cf86e3badb679 100644 (file)
--- a/files/etc/crypttab/appliance
+++ b/files/etc/crypttab/appliance
@@ -1,2 +1,2 @@
 # <target name> <source device>          <key file>      <options>
-#cswap           /dev/sda1                /dev/random     swap,cipher=aes-cbc-essiv:sha256
+#swap            /dev/sda1                /dev/random     swap,cipher=aes-xts-plain64:sha256

diff --git a/files/etc/crypttab/desktop b/files/etc/crypttab/desktop
index 746eb703aed93f4297c7ad814e117968f33b3936..57aed8bc4829e62083cb372f4735fbdccbd82682 100644 (file)
--- a/files/etc/crypttab/desktop
+++ b/files/etc/crypttab/desktop
@@ -1,6 +1,6 @@
 # <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,keyscript=decrypt_keyctl
-var             /dev/mapper/vg-var       none            luks,cipher=aes-cbc-essiv:sha256,keyscript=decrypt_keyctl
-vservers        /dev/mapper/vg-vservers  none            luks,cipher=aes-cbc-essiv:sha256,keyscript=decrypt_keyctl
-cswap           /dev/sda1                /dev/random     swap,cipher=aes-cbc-essiv:sha256
+root            /dev/mapper/vg-root      none            luks
+home            /dev/mapper/vg-home      none            luks,keyscript=decrypt_keyctl
+var             /dev/mapper/vg-var       none            luks,keyscript=decrypt_keyctl
+vservers        /dev/mapper/vg-vservers  none            luks,keyscript=decrypt_keyctl
+swap            /dev/mapper/vg-swap      /dev/random     swap,aes-xts-plain64:sha256

diff --git a/files/etc/crypttab/kvm b/files/etc/crypttab/kvm
index 20009d6bf829965343d7249236d7e6fb1ccbbe2c..83859a39362c2cbe338192d880498623d76f2e6a 100644 (file)
--- a/files/etc/crypttab/kvm
+++ b/files/etc/crypttab/kvm
@@ -1,3 +1,3 @@
 # <target name> <source device>          <key file>      <options>
-root            /dev/mapper/vg-root      none            luks,cipher=aes-cbc-essiv:sha256
-vservers        /dev/mapper/vg-vservers  none            luks,cipher=aes-cbc-essiv:sha256
+root            /dev/mapper/vg-root      none            luks
+vservers        /dev/mapper/vg-vservers  none            luks

diff --git a/files/etc/crypttab/laptop b/files/etc/crypttab/laptop
index edea69b28cf58a678eb7b9f061198a4f91a29880..3166fbd7dfd96b3e427082e46dd2e1e22960c1d9 100644 (file)
--- a/files/etc/crypttab/laptop
+++ b/files/etc/crypttab/laptop
@@ -1,5 +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,keyscript=decrypt_keyctl
-var             /dev/mapper/vg-var       none            luks,cipher=aes-cbc-essiv:sha256,keyscript=decrypt_keyctl
-cswap           /dev/sda1                /dev/random     swap,cipher=aes-cbc-essiv:sha256
+root            /dev/mapper/vg-root      none            luks
+home            /dev/mapper/vg-home      none            luks,keyscript=decrypt_keyctl
+var             /dev/mapper/vg-var       none            luks,keyscript=decrypt_keyctl
+swap            /dev/mapper/swap         /dev/random     swap,aes-xts-plain64:sha256

diff --git a/files/etc/crypttab/laptop.hibernate b/files/etc/crypttab/laptop.hibernate
index b59c089768aa9ee72ce9d9be5ae77e61f5b1089b..42f59379721f00fef9216fc49ee3c0225ea95230 100644 (file)
--- a/files/etc/crypttab/laptop.hibernate
+++ b/files/etc/crypttab/laptop.hibernate
@@ -1,5 +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,keyscript=decrypt_keyctl
-var             /dev/mapper/vg-var       none            luks,cipher=aes-cbc-essiv:sha256,keyscript=decrypt_keyctl
-cswap           /dev/sda1                none            swap,cipher=aes-cbc-essiv:sha256
+root            /dev/mapper/vg-root      none            luks
+home            /dev/mapper/vg-home      none            luks
+var             /dev/mapper/vg-var       none            luks
+swap            /dev/mapper/swap         none            luks,swap

diff --git a/files/etc/crypttab/removable b/files/etc/crypttab/removable
index aff01c67b866baa427c7075426e56ed8bfa345cc..df6f8a97e9034e4bcdb2e182300902db41339722 100644 (file)
--- a/files/etc/crypttab/removable
+++ b/files/etc/crypttab/removable
@@ -1,5 +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                /dev/random     swap,cipher=aes-cbc-essiv:sha256
+root            /dev/mapper/vg-root      none            luks
+#home            /dev/mapper/vg-home      none            luks
+#var             /dev/mapper/vg-var       none            luks
+#swap            /dev/mapper/vg-swap      /dev/random     swap,cipher=aes-xts-plain64:sha256

diff --git a/files/etc/crypttab/server b/files/etc/crypttab/server
index 35f052171745b08eee3d8b763c2df8a6e036f117..a7ec64a28ccb74d5ecff878b78cf3a90a433d2cb 100644 (file)
--- a/files/etc/crypttab/server
+++ b/files/etc/crypttab/server
@@ -1,4 +1,4 @@
 # <target name> <source device>          <key file>      <options>
-root            /dev/mapper/vg-root      none            luks,cipher=aes-cbc-essiv:sha256
-cswap           /dev/sda1                /dev/random     swap,cipher=aes-cbc-essiv:sha256
-vservers        /dev/mapper/vg-vservers  none            luks,cipher=aes-cbc-essiv:sha256
+root            /dev/mapper/vg-root      none            luks
+swap            /dev/mapper/vg-swap      /dev/random     swap,cipher=aes-xts-plain64:sha256
+vservers        /dev/mapper/vg-vservers  none            luks

diff --git a/files/etc/fstab/desktop b/files/etc/fstab/desktop
index edb9581ff7b9e11fe08107536bf2b74e98e78ecd..ebad40fe03db1ce37533d98e16061a536e67de82 100644 (file)
--- a/files/etc/fstab/desktop
+++ b/files/etc/fstab/desktop
@@ -1,4 +1,4 @@
-/dev/mapper/cswap     none           swap  sw                                 0 0
+/dev/mapper/swap      none           swap  sw                                 0 0
 /dev/mapper/root      /              ext4  defaults,errors=remount-ro         0 1
 /dev/mapper/home      /home          ext4  defaults,errors=remount-ro         0 2
 /dev/mapper/var       /var           ext4  defaults,errors=remount-ro         0 2

diff --git a/files/etc/fstab/laptop b/files/etc/fstab/laptop
index f642dcd40bfee1f848d56e69d3b29cffea16c9bb..5429c56bc9a97aa6b424b36dfdf9339bf262c9de 100644 (file)
--- a/files/etc/fstab/laptop
+++ b/files/etc/fstab/laptop
@@ -1,4 +1,4 @@
-/dev/mapper/cswap     none           swap  sw                                 0 0
+/dev/mapper/swap      none           swap  sw                                 0 0
 /dev/mapper/root      /              ext4  defaults,errors=remount-ro         0 1
 /dev/mapper/home      /home          ext4  defaults,errors=remount-ro         0 2
 /dev/mapper/var       /var           ext4  defaults,errors=remount-ro         0 2

diff --git a/files/etc/fstab/removable b/files/etc/fstab/removable
index cef6539add425ac657fdadcd3e9ed5eda1de4f33..3a452dad69580f0747163e11e2614ebf69d8f0c3 100644 (file)
--- a/files/etc/fstab/removable
+++ b/files/etc/fstab/removable
@@ -1,4 +1,4 @@
 /dev/mapper/root      /              ext4  noatime,defaults,errors=remount-ro         0 1
 #/dev/mapper/home      /home          ext4  noatime,defaults,errors=remount-ro         0 2
 #/dev/mapper/var       /var           ext4  noatime,defaults,errors=remount-ro         0 2
-#/dev/mapper/cswap     none           swap  sw                                 0 0
+#/dev/mapper/swap      none           swap  sw                                 0 0

diff --git a/files/etc/fstab/server b/files/etc/fstab/server
index 0f0dd339d41f0b064760119a987d9b08887188c9..46e3964fcbb458b6a2994075a85d1b25be01ea7e 100644 (file)
--- a/files/etc/fstab/server
+++ b/files/etc/fstab/server
@@ -1,3 +1,3 @@
-/dev/mapper/cswap     none           swap  sw                                 0 0
+/dev/mapper/swap      none           swap  sw                                 0 0
 /dev/mapper/root      /              ext4  defaults,errors=remount-ro         0 1
 /dev/mapper/vservers  /var/vservers  ext4  defaults,errors=remount-ro         0 2

diff --git a/files/etc/uswsusp.conf b/files/etc/uswsusp.conf
index 4c52f06d51fe6cabab6e41855a0f4fbf74dfe49e..fd0eb2a31ec840ee1d2c1c3417d761e946ebf557 100644 (file)
--- a/files/etc/uswsusp.conf
+++ b/files/etc/uswsusp.conf
@@ -1,5 +1,5 @@
 # /etc/uswsusp.conf(5) -- Configuration file for s2disk/s2both 
-resume device = /dev/mapper/cswap
+resume device = /dev/mapper/swap
 splash = n
 compress = y
 early writeout = y

diff --git a/manifests/base/laptop.pp b/manifests/base/laptop.pp
index 5fec946e38203fd3e33556ee3b8fadd82083cff4..be6306365da8397cbf919134862aa65580e6deb2 100644 (file)
--- a/manifests/base/laptop.pp
+++ b/manifests/base/laptop.pp
@@ -23,7 +23,7 @@ class nodo::base::laptop inherits nodo::base::personal {
     owner     => "root",
     group     => "root",
     mode      => 0644,
-    content   => "RESUME=/dev/mapper/cswap\n",
+    content   => "RESUME=/dev/mapper/swap\n",
     notify    => Exec['update-initramfs'],
     ensure    => $hibernate ? {
       false   => absent,