From 82185b86d512d975a0c2cd12150855bf38af7a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Wed, 27 Jan 2016 23:40:38 +0100
Subject: [PATCH] [fix] Remove udisks-glue from conf_regen and services

udisks-glue has been removed from recommended packages by d6b0c357 since
it's no longer maintained - and also out-dated; the conf_regen hook refers
to an unavailable service.
Note that even it's not really used in YunoHost yet, it has been replaced
by udisks2 as suggested package.
---
 data/hooks/conf_regen/49-udisks-glue        | 20 --------------------
 data/templates/udisks-glue/udisks-glue.conf |  9 ---------
 data/templates/yunohost/services.yml        |  2 +-
 3 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 data/hooks/conf_regen/49-udisks-glue
 delete mode 100644 data/templates/udisks-glue/udisks-glue.conf

diff --git a/data/hooks/conf_regen/49-udisks-glue b/data/hooks/conf_regen/49-udisks-glue
deleted file mode 100644
index 03dbc75d4..000000000
--- a/data/hooks/conf_regen/49-udisks-glue
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e 
-
-force=$1
-
-function safe_copy () {
-    if [[ "$force" == "True" ]]; then
-        sudo yunohost service safecopy \
-          -s udisks-glue $1 $2 --force
-    else
-        sudo yunohost service safecopy \
-          -s udisks-glue $1 $2
-    fi
-}
-
-cd /usr/share/yunohost/templates/udisks-glue
-
-if [[ "$(safe_copy udisks-glue.conf /etc/udisks-glue.conf | tail -n1)" == "True" ]]; then
-    sudo service udisks-glue restart
-fi
diff --git a/data/templates/udisks-glue/udisks-glue.conf b/data/templates/udisks-glue/udisks-glue.conf
deleted file mode 100644
index f97de948f..000000000
--- a/data/templates/udisks-glue/udisks-glue.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-filter disks {
-    optical = false
-    partition_table = false
-    usage = filesystem
-}
-match disks { 
-    automount=true
-    automount_options= { sync, noatime, "dmask=0", "fmask=0" }
-}
diff --git a/data/templates/yunohost/services.yml b/data/templates/yunohost/services.yml
index c015c8cdd..157a114ba 100644
--- a/data/templates/yunohost/services.yml
+++ b/data/templates/yunohost/services.yml
@@ -47,5 +47,5 @@ nsswitch:
 spamassassin:
    status: service
    log: /var/log/mail.log
-udisks-glue:
+udisks2:
    status: service