[Pkg-utopia-commits] r42 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2004-10-19 08:46:04 -0600 (Tue, 19 Oct 2004)
New Revision: 42

Added:
   packages/hal/trunk/debian/patches/storage-policy-debian.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Change the storage policy to match the behaviour of earlier debian packages

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-10-19 13:13:55 UTC (rev 41)
+++ packages/hal/trunk/debian/changelog	2004-10-19 14:46:04 UTC (rev 42)
@@ -36,6 +36,9 @@
      + Added debian/patches//storage-policy-uudi.patch (from CVS HEAD)
        - Never use filesystem UUDI for mount points in the default policy
      + Ship fstab-sync.8 manpage
+     + Added debian/patches/storage-policy-debian.patch 
+       - Change to storage policy to match the behaviour of previous hal
+         debian packages.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon, 18 Oct 2004 16:30:01 +0200
 

Added: packages/hal/trunk/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-10-19 13:13:55 UTC (rev 41)
+++ packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-10-19 14:46:04 UTC (rev 42)
@@ -0,0 +1,19 @@
+--- fdi/90defaultpolicy/storage-policy.fdi.orig	2004-10-19 16:38:21.000000000 +0200
++++ fdi/90defaultpolicy/storage-policy.fdi	2004-10-19 16:39:08.000000000 +0200
+@@ -6,12 +6,13 @@
+   <device>
+     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
+       <merge key="storage.policy.default.mount_root" type="string">/media</merge>
+-      <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
++      <merge key="storage.policy.default.use_managed_keyword" type="bool">false</merge>
+       <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
+       <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
+       <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
+-      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
+-      <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
++      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
++      <merge key="storage.policy.default.mount_option.noexec" type="bool">true</merge>
++      <merge key="storage.policy.default.mount_option.nosuid" type="bool">true</merge>
+     </match>
+   </device>
+