summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2011-08-26 13:09:40 -0400
committerDavid Zeuthen <davidz@redhat.com>2011-08-26 13:09:40 -0400
commit5de2f4381b5d2b1d76a9ea31b28b86e7ead43599 (patch)
tree800b6f1d74ccb1ec02f8c161695d8a87a0975460
parent80d98a6dfb4501949821fd57eb768f1c3248d0bc (diff)
Revert "Add override for system internal property"
-rw-r--r--doc/man/udisks7.xml10
-rw-r--r--src/device.c9
2 files changed, 3 insertions, 16 deletions
diff --git a/doc/man/udisks7.xml b/doc/man/udisks7.xml
index 4e97b28..c5d0a55 100644
--- a/doc/man/udisks7.xml
+++ b/doc/man/udisks7.xml
@@ -74,16 +74,6 @@
icon theme specification.
</para></listitem>
</varlistentry>
-
- <varlistentry>
- <term><option>UDISKS_SYSTEM_INTERNAL</option></term>
- <listitem><para>If set, this will override the usual bus type based
- detection of whether a device is considered "system internal". "0"
- means "removable" (i. e. eligible for automounting, and normal
- users can mount), any other value means "system internal" (i.
- e. no automounting, and only administrators can mount).
- </para></listitem>
- </varlistentry>
</variablelist>
<para>
The <option>ID_DRIVE_*</option> properties are used to describe what
diff --git a/src/device.c b/src/device.c
index 22779c7..a928fb5 100644
--- a/src/device.c
+++ b/src/device.c
@@ -3849,12 +3849,9 @@ static gboolean
update_info_is_system_internal (Device *device)
{
gboolean is_system_internal;
-
- if (g_udev_device_has_property (device->priv->d, "UDISKS_SYSTEM_INTERNAL"))
- {
- is_system_internal = g_udev_device_get_property_as_boolean (device->priv->d, "UDISKS_SYSTEM_INTERNAL");
- goto determined;
- }
+
+ /* TODO: make it possible to override this property from a udev property.
+ */
/* start out by assuming the device is system internal, then adjust depending on what kind of
* device we are dealing with