From c01e34150a7b6f88afb2719e9ab8eec47f618cb3 Mon Sep 17 00:00:00 2001
From: Pig Monkey <pm@pig-monkey.com>
Date: Mon, 29 Feb 2016 17:56:01 -0800
Subject: [PATCH] replace pmount with udisk/udiskie

udiskie can integrate with pass for LUKS passphrases, ie:
https://github.com/pigmonkey/dotfiles/blob/c87c293a787f2b41ce75d6ddd71a498f62ce3594/config/udiskie/config.yml#L5
---
 group_vars/all                      |  1 -
 playbook.yml                        |  1 +
 roles/udisks/files/10-udisks.rules  |  2 ++
 roles/udisks/files/99-udisks2.rules |  2 ++
 roles/udisks/tasks/main.yml         | 12 ++++++++++++
 5 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 roles/udisks/files/10-udisks.rules
 create mode 100644 roles/udisks/files/99-udisks2.rules
 create mode 100644 roles/udisks/tasks/main.yml

diff --git a/group_vars/all b/group_vars/all
index eb797d1..f211586 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -14,7 +14,6 @@ aur:
     dir: aur
     packages:
         - aura-bin
-        - pmount
         - orpie
 
 ssh:
diff --git a/playbook.yml b/playbook.yml
index a34236e..feae60e 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -44,6 +44,7 @@
     - { role: sound, tags: ['sound'] }
     - { role: archive, tags: ['archive'] }
     - { role: filesystems, tags: ['filesystems'] }
+    - { role: udisks, tags: ['udisks'] }
     - { role: pim, tags: ['pim'] }
     - { role: radio, tags: ['radio'] }
     - { role: formd, tags: ['formd'] }
diff --git a/roles/udisks/files/10-udisks.rules b/roles/udisks/files/10-udisks.rules
new file mode 100644
index 0000000..0cea65a
--- /dev/null
+++ b/roles/udisks/files/10-udisks.rules
@@ -0,0 +1,2 @@
+# Disable automounting
+ACTION=="add|change", SUBSYSTEM=="block", KERNEL=="sd*|sr", ENV{UDISKS_PRESENTATION_HIDE}="1"
diff --git a/roles/udisks/files/99-udisks2.rules b/roles/udisks/files/99-udisks2.rules
new file mode 100644
index 0000000..7c5c319
--- /dev/null
+++ b/roles/udisks/files/99-udisks2.rules
@@ -0,0 +1,2 @@
+# Mount to /media
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1"
diff --git a/roles/udisks/tasks/main.yml b/roles/udisks/tasks/main.yml
new file mode 100644
index 0000000..c2129c8
--- /dev/null
+++ b/roles/udisks/tasks/main.yml
@@ -0,0 +1,12 @@
+---
+- name: Install udisks2
+  pacman: name=udisks2 state=present
+
+- name: Disable udisks automounting
+  copy: src=10-udisks.rules dest=/etc/udev/rules.d/10-udisks.rules
+
+- name: Mount to /media
+  copy: src=99-udisks2.rules dest=/etc/udev/rules.d/99-udisks2.rules
+
+- name: Install udiskie
+  pacman: name=udiskie state=present