hal: Branch 'master'

[Martin Pitt]

 fdi/policy/10osvendor/20-storage-methods.fdi |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 897cd3048429d9a0c8b20ec6c9b94b3c869605bf
Author: Michael Biebl <biebl at debian.org>
Date:   Thu Nov 5 15:09:52 2009 +0100

    list "relatime" as valid mount option on Linux.
    
    http://bugs.debian.org/510124

diff --git a/fdi/policy/10osvendor/20-storage-methods.fdi b/fdi/policy/10osvendor/20-storage-methods.fdi
index 462a2a8..b7e94d6 100644
--- a/fdi/policy/10osvendor/20-storage-methods.fdi
+++ b/fdi/policy/10osvendor/20-storage-methods.fdi
@@ -56,6 +56,7 @@
           <append key="volume.mount.valid_options" type="strlist">dirsync</append>
           <append key="volume.mount.valid_options" type="strlist">noatime</append>
           <append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+          <append key="volume.mount.valid_options" type="strlist">relatime</append>
           <append key="volume.mount.valid_options" type="strlist">noexec</append>
           <append key="volume.mount.valid_options" type="strlist">quiet</append>
           <append key="volume.mount.valid_options" type="strlist">remount</append>
@@ -188,6 +189,7 @@
         <append key="volume.mount.valid_options" type="strlist">dirsync</append>
         <append key="volume.mount.valid_options" type="strlist">noatime</append>
         <append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+        <append key="volume.mount.valid_options" type="strlist">relatime</append>
         <append key="volume.mount.valid_options" type="strlist">noexec</append>
         <append key="volume.mount.valid_options" type="strlist">quiet</append>
         <append key="volume.mount.valid_options" type="strlist">remount</append>