summaryrefslogtreecommitdiff
path: root/libhal-storage
diff options
context:
space:
mode:
authorDavid Zeuthen <davidz@redhat.com>2006-09-11 13:55:56 -0400
committerDavid Zeuthen <davidz@redhat.com>2006-09-11 13:55:56 -0400
commit89248c8d6f604235da02ad1168651830cd10ee3f (patch)
treea5d20483df569d2c9b95f9dbf4645294a5944b55 /libhal-storage
parent18413734b1da6c14a0851e34d77db96f6a4ef9bb (diff)
make Mount() support option remount
Now we also export 'exec' as a valid mount option. This way, for example, g-v-m can now remount a removable storage device with 'exec' to e.g. run an autolauncher. Had to put an #error into a Solaris specific code path, should be easy to fix, sorry Artem.
Diffstat (limited to 'libhal-storage')
-rw-r--r--libhal-storage/libhal-storage.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libhal-storage/libhal-storage.c b/libhal-storage/libhal-storage.c
index b20a5a8d..3ddcad5a 100644
--- a/libhal-storage/libhal-storage.c
+++ b/libhal-storage/libhal-storage.c
@@ -1237,7 +1237,9 @@ libhal_volume_from_udi (LibHalContext *hal_ctx, const char *udi)
libhal_free_property_set (properties);
return vol;
error:
- LIBHAL_FREE_DBUS_ERROR(&error);
+ if (dbus_error_is_set (&error)) {
+ LIBHAL_FREE_DBUS_ERROR(&error);
+ }
libhal_free_string (vol_fsusage_textual);
libhal_free_string (disc_type_textual);
libhal_free_property_set (properties);