Updating crypttab/fstab/resume to new layoutfeature/crypttab

7 files changed, 23 insertions, 23 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