diff --git a/packages/sysutils/udisks/package.mk b/packages/sysutils/udisks/package.mk index 769b9fd08d..31c67651d8 100644 --- a/packages/sysutils/udisks/package.mk +++ b/packages/sysutils/udisks/package.mk @@ -48,11 +48,5 @@ PKG_CONFIGURE_OPTS_TARGET="--datadir=/usr/share \ post_makeinstall_target() { rm -rf $INSTALL/etc/profile.d - - mkdir -p $INSTALL/lib/systemd - cp -P $PKG_DIR/scripts/udisks-mount-disks $INSTALL/lib/systemd -} - -post_install() { - enable_service udisks-mount-disks.service + rm -rf $INSTALL/lib/udev/rules.d } diff --git a/packages/sysutils/udisks/scripts/udisks-mount-disks b/packages/sysutils/udisks/scripts/udisks-mount-disks deleted file mode 100755 index 5d533f31ab..0000000000 --- a/packages/sysutils/udisks/scripts/udisks-mount-disks +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# automount internal disks - -drive_dump () { - udisks --dump | tr -d ' ' | grep 'device-file:' | cut -d ':' -f2 -} - -show_info () { - udisks --show-info $2 | grep "$1:" | tr -d ' ' | cut -d ":" -f2 -} - -for DEVICE in `drive_dump`; do - REMOVABLE="`show_info "removable" $DEVICE`" - MOUNTED="`show_info "is mounted" $DEVICE`" - USAGE="`show_info "usage" $DEVICE`" - - if [ "$REMOVABLE" = "0" -a "$MOUNTED" = "0" -a "$USAGE" = "filesystem" ]; then - udisks --mount "$DEVICE" >/dev/null - fi -done diff --git a/packages/sysutils/udisks/system.d/udisks-mount-disks.service b/packages/sysutils/udisks/system.d/udisks-mount-disks.service deleted file mode 100644 index c942f1572c..0000000000 --- a/packages/sysutils/udisks/system.d/udisks-mount-disks.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Mount internal disks - -[Service] -ExecStart=/lib/systemd/udisks-mount-disks -Type=oneshot - -[Install] -WantedBy=remote-fs.target diff --git a/packages/sysutils/udisks/system.d/udisks.service b/packages/sysutils/udisks/system.d/udisks.service deleted file mode 100644 index 0fecada41b..0000000000 --- a/packages/sysutils/udisks/system.d/udisks.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Disk Manager -Documentation=man:udisks(8) - -[Service] -Type=dbus -BusName=org.freedesktop.UDisks -ExecStart=/usr/lib/udisks/udisks-daemon