diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rwxr-xr-x | examples/locking.py | 8 | ||||
| -rw-r--r-- | fdi/policy/10osvendor/10-storage-policy.fdi | 13 | ||||
| -rw-r--r-- | hald/hald_dbus.c | 2 | ||||
| -rw-r--r-- | tools/fstab-sync.8.in | 36 |
5 files changed, 29 insertions, 44 deletions
@@ -1,3 +1,17 @@ +2005-05-23 David Zeuthen <davidz@redhat.com> + + * fdi/policy/10osvendor/10-storage-policy.fdi: Never ever use + sync as it reduces performance and makes people believe that + it wears out their drives (RH bug #157674) + + * examples/locking.py: Fixup this a little bit + + * tools/fstab-sync.8.in: Update the man page to reflect latest + changes. + + * hald/hald_dbus.c (device_lock): Fix a doublefree when acquiring + lock (RH bug #158474) + 2005-05-20 David Zeuthen <davidz@redhat.com> * hald/linux2/probing/probe-storage.c (main): Here is a fix for diff --git a/examples/locking.py b/examples/locking.py index 4c011337..c70230f6 100755 --- a/examples/locking.py +++ b/examples/locking.py @@ -16,12 +16,16 @@ pid = os.getpid() reason = "locking.py pid %d"%pid bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM) -hal_service = bus.get_service("org.freedesktop.Hal") + +devobj = bus.get_object("org.freedesktop.Hal", dev_udi) +dev = dbus.Interface(devobj, "org.freedesktop.Hal.Device") +#hal_service = bus.get_service("org.freedesktop.Hal") +#dev = hal_service.get_object (dev_udi, "org.freedesktop.Hal.Device") + print "I am %s with pid %d"%(bus.get_connection().get_unique_name(), pid) print -dev = hal_service.get_object (dev_udi, "org.freedesktop.Hal.Device") print "Attempting to lock %s for %d secs"%(dev_udi, duration) print "with reason '%s'"%reason diff --git a/fdi/policy/10osvendor/10-storage-policy.fdi b/fdi/policy/10osvendor/10-storage-policy.fdi index 4cc50b7f..f9ad379f 100644 --- a/fdi/policy/10osvendor/10-storage-policy.fdi +++ b/fdi/policy/10osvendor/10-storage-policy.fdi @@ -131,19 +131,6 @@ </match> </match> - <!-- Use noatime and sync options for all hotpluggable or removable - volumes smaller than 2GB --> - <match key="volume.size" compare_lt="2147483648"> - <match key="@block.storage_device:storage.hotpluggable" bool="true"> - <merge key="volume.policy.mount_option.sync" type="bool">true</merge> - <merge key="volume.policy.mount_option.noatime" type="bool">true</merge> - </match> - <match key="@block.storage_device:storage.removable" bool="true"> - <merge key="volume.policy.mount_option.sync" type="bool">true</merge> - <merge key="volume.policy.mount_option.noatime" type="bool">true</merge> - </match> - </match> - <!-- Attempt mount point 'ipod' for iPod's --> <match key="@block.storage_device:portable_audio_player.type" string="ipod"> <merge key="volume.policy.desired_mount_point" type="string">ipod</merge> diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c index 67b0fd34..7ae4b02e 100644 --- a/hald/hald_dbus.c +++ b/hald/hald_dbus.c @@ -1687,8 +1687,6 @@ device_lock (DBusConnection * connection, g_hash_table_insert (services_with_locks, g_strdup (sender), g_object_ref (d)); - dbus_free (reason); - if (!dbus_connection_send (connection, reply, NULL)) DIE (("No memory")); diff --git a/tools/fstab-sync.8.in b/tools/fstab-sync.8.in index ace92e35..819bf279 100644 --- a/tools/fstab-sync.8.in +++ b/tools/fstab-sync.8.in @@ -20,9 +20,7 @@ This program serves one major purpose: Update the file systems table file and create/remove mount points in .B /media in response to HAL events. This program is usually never run directly -from a shell; instead it is invoked as a callout from the -.B @SYSCONFDIR@/hal/device.d -directory by the HAL daemon. +from a shell; instead it is invoked as a callout by the HAL daemon. .PP Additionally, this program offers an option of removing any trace of @@ -84,27 +82,13 @@ for more information. .PP By default, the -.B @DATADIR@/hal/fdi/90defaultpolicy/storage-policy.fdi +.B @DATADIR@/hal/fdi/policy/10osvendor/10-storage-policy.fdi file specifies the policy - this file should never be edited by the system administrator as it might get updated by the OS vendor for security updates. Instead, system- or site-specific rules can be put in the -.B @DATADIR@/hal/fdi/95userpolicy -directory. - -Device information files are processed for every hal device object in the -.B @DATADIR@/hal/fdi/ -directory in alphabetical order including directories. Hence, files in the -.B 90defaultpolicy -directory are processed before files -.B 95userpolicy -directory, -.B 95userpolicy/a.fdi -is processed before -.B 95userpolicy/b.fdi -and so on. In addition, directives in specific files are processed in a -top-down fashion. - +.B @SYSCONFDIR@/hal/fdi/policy/ +directory as separate files. .PP A number of sample policy files for various uses should @@ -125,13 +109,11 @@ Automatic updates of the .B /etc/fstab file by the .B fstab-sync -program from the HAL daemon can be disabled by changing the -.B 50-fstab-sync.hal -symlink in -.B @SYSCONFDIR@/hal/device.d -directory to point to -.B /bin/false -. +program from the HAL daemon can be disabled by making the +.B /etc/fstab +file immutable (using +.B chattr +i /etc/fstab +for example) .SH OPTIONS The following options are supported: |