summarylogtreecommitdiffstats
path: root/openswap.hook
diff options
context:
space:
mode:
authorFabio Tea2016-12-06 02:50:27 +0100
committerJenya Sovetkin2016-12-06 10:29:48 +0100
commit601ae996bd96e498ccc6b45e9a534bae6f528f84 (patch)
tree8c1fe09a6f9d3bd68924dfcfbf0cfe51f0bbb2f9 /openswap.hook
parent6dd4b89554ba92b99d6a8f757340c073a705bc31 (diff)
downloadaur-601ae996bd96e498ccc6b45e9a534bae6f528f84.tar.gz
keyfile_device_mount_options and cryptsetup_options
+ renamed `miscellaneous` to the more descriptive `cryptsetup_options` + added `keyfile_device_mount_options` to allow keyfiles lying on subvolumes (e.g. btrfs)
Diffstat (limited to 'openswap.hook')
-rw-r--r--openswap.hook8
1 files changed, 4 insertions, 4 deletions
diff --git a/openswap.hook b/openswap.hook
index 24331482913f..ead4c4f869bb 100644
--- a/openswap.hook
+++ b/openswap.hook
@@ -2,7 +2,7 @@ run_hook ()
{
## read openswap configurations
source openswap.conf
-
+
if [ -z "$keyfile_device" ] || [ -z "$keyfile_filename" ]
then
## case when no keyfile provided in configurations
@@ -10,8 +10,8 @@ run_hook ()
else
## case when keyfile is provided in configurations
mkdir openswap_keymount
- mount "$keyfile_device" openswap_keymount
- cryptsetup open $miscellaneous --key-file "openswap_keymount/$keyfile_filename" "$swap_device" "$crypt_swap_name"
+ mount $keyfile_device_mount_options "$keyfile_device" openswap_keymount
+ cryptsetup open $cryptsetup_options --key-file "openswap_keymount/$keyfile_filename" "$swap_device" "$crypt_swap_name"
umount openswap_keymount
fi
-} \ No newline at end of file
+}