Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove support for obsolete devkit-disks automount inhibitor 

Back in 2009 devicekit-disks package was renamed to udisks [1].  All
supported distributions use udisks (or more recently udisks2).  None
have the old devkit-disks command.  Therefore remove it from the GParted
shell wrapper.

[1] https://www.freedesktop.org/wiki/Software/DeviceKit-disks/
    "Note
    On December 1st 2009, DeviceKit-disks was renamed to udisks. This
    release is expected to appear in distributions released in the first
    half of 2010."
This commit is contained in:
Mike Fleetwood 2018-06-10 08:30:58 +01:00
parent 1e1c4b8cef
commit ddb334705e
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gparted.in
View File

@ -126,21 +126,6 @@ for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
fi fi
done done
#
# Search PATH to determine if devkit-disks program can be found
# and if appropriate daemon is running.
# On December 1, 2009, devkit-disks was named udisks.
#
HAVE_DEVKIT_DISKS=no
for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
if test -x "$k/devkit-disks"; then
if test "z`ps -e | grep devkit-disks-da`" != "z"; then
HAVE_DEVKIT_DISKS=yes
break
fi
fi
done
# #
# Search PATH to determine if hal-lock program can be found # Search PATH to determine if hal-lock program can be found
# and if appropriate daemon is running. # and if appropriate daemon is running.
@ -198,9 +183,6 @@ done
# Else use both udisks and hal-lock for invocation if both binaries exist and both # Else use both udisks and hal-lock for invocation if both binaries exist and both
# daemons are running. # daemons are running.
# Else use udisks if binary exists and daemon is running. # Else use udisks if binary exists and daemon is running.
# Else use both devkit-disks and hal-lock for invocation if both binaries exist
# and both of the daemons are running.
# Else use devkit-disks if binary exists and daemon is running.
# Otherwise use hal-lock for invocation if binary exists and daemon is running. # Otherwise use hal-lock for invocation if binary exists and daemon is running.
# If the above checks fail then simply run gpartedbin. # If the above checks fail then simply run gpartedbin.
# #
@ -212,12 +194,6 @@ elif test "x$HAVE_UDISKS" = "xyes" && test "x$HAVE_HAL_LOCK" = "xyes"; then
--run "$BASE_CMD" --run "$BASE_CMD"
elif test "x$HAVE_UDISKS" = "xyes"; then elif test "x$HAVE_UDISKS" = "xyes"; then
udisks --inhibit -- $BASE_CMD udisks --inhibit -- $BASE_CMD
elif test "x$HAVE_DEVKIT_DISKS" = "xyes" && test "x$HAVE_HAL_LOCK" = "xyes"; then
devkit-disks --inhibit -- \
hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive \
--run "$BASE_CMD"
elif test "x$HAVE_DEVKIT_DISKS" = "xyes"; then
devkit-disks --inhibit -- $BASE_CMD
elif test "x$HAVE_HAL_LOCK" = "xyes"; then elif test "x$HAVE_HAL_LOCK" = "xyes"; then
hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive \ hal-lock --interface org.freedesktop.Hal.Device.Storage --exclusive \
--run "$BASE_CMD" --run "$BASE_CMD"