Updating crypttab/fstab/resume to new layoutfeature/crypttab

13 files changed, 29 insertions, 29 deletions

diff --git a/files/etc/crypttab/appliance b/files/etc/crypttab/appliance
index 1e43d67..24d20bb 100644
--- 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 746eb70..57aed8b 100644
--- 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 20009d6..83859a3 100644
--- 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 edea69b..3166fbd 100644
--- 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 b59c089..42f5937 100644
--- 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 aff01c6..df6f8a9 100644
--- 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 35f0521..a7ec64a 100644
--- 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 edb9581..ebad40f 100644
--- 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 f642dcd..5429c56 100644
--- 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 cef6539..3a452da 100644
--- 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 0f0dd33..46e3964 100644
--- 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 4c52f06..fd0eb2a 100644
--- 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 5fec946..be63063 100644
--- 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,