Just call it "fstab device" instead of "non-user fstab device"

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/policy/org.freedesktop.udisks2.policy.in b/policy/org.freedesktop.udisks2.policy.in
index 4a30884..79fa4eb 100644 (file)
--- a/policy/org.freedesktop.udisks2.policy.in
+++ b/policy/org.freedesktop.udisks2.policy.in
@@ -30,8 +30,8 @@
     </defaults>
   </action>
 
-  <action id="org.freedesktop.udisks2.filesystem-nonuser-fstab">
-    <_description>Mount/unmount non-user filesystems defined in the fstab file</_description>
+  <action id="org.freedesktop.udisks2.filesystem-fstab">
+    <_description>Mount/unmount filesystems defined in the fstab file</_description>
     <_message>Authentication is required to mount/unmount the filesystem</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>

diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index a079993..7075bae 100644 (file)
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -924,9 +924,9 @@ handle_mount (UDisksFilesystem       *filesystem,
             {
               if (!udisks_daemon_util_check_authorization_sync (daemon,
                                                                 object,
-                                                                "org.freedesktop.udisks2.filesystem-nonuser-fstab",
+                                                                "org.freedesktop.udisks2.filesystem-fstab",
                                                                 options,
-                                                                N_("Authentication is required to mount the non-user fstab device $(udisks2.device)"),
+                                                                N_("Authentication is required to mount the fstab device $(udisks2.device)"),
                                                                 invocation))
                 goto out;
               mount_fstab_as_root = TRUE;
@@ -1215,9 +1215,9 @@ handle_unmount (UDisksFilesystem       *filesystem,
             {
               if (!udisks_daemon_util_check_authorization_sync (daemon,
                                                                 object,
-                                                                "org.freedesktop.udisks2.filesystem-nonuser-fstab",
+                                                                "org.freedesktop.udisks2.filesystem-fstab",
                                                                 options,
-                                                                N_("Authentication is required to unmount the non-user fstab device $(udisks2.device)"),
+                                                                N_("Authentication is required to unmount the fstab device $(udisks2.device)"),
                                                                 invocation))
                 goto out;
               unmount_fstab_as_root = TRUE;