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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-10-19 06:19:24 -0600 (Tue, 19 Oct 2004)
New Revision: 38

Added:
   packages/hal/trunk/debian/patches/fstab-sync.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Added patch with post 0.4.0 release fstab-sync fixes from cvs

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-10-19 12:08:09 UTC (rev 37)
+++ packages/hal/trunk/debian/changelog	2004-10-19 12:19:24 UTC (rev 38)
@@ -25,6 +25,11 @@
      + debian/hal.preinst: Add missing debhelper token
      + debian/hal.preinst: Remove fstab-update.h transition.
      + Added /etc/default/hal to easily configure running hal as non-root
+     + Added debian/patches/fstab-sync.patch (from CVS HEAD)
+       - Use the name of the special device file instead of 'foo' when writing
+         to the syslog.
+       - clean wasn't being called on hald startup because of missing defines
+         due to the removal of fstab-sync options
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon, 18 Oct 2004 16:30:01 +0200
 

Added: packages/hal/trunk/debian/patches/fstab-sync.patch
===================================================================
--- packages/hal/trunk/debian/patches/fstab-sync.patch	2004-10-19 12:08:09 UTC (rev 37)
+++ packages/hal/trunk/debian/patches/fstab-sync.patch	2004-10-19 12:19:24 UTC (rev 38)
@@ -0,0 +1,67 @@
+Index: tools/fstab-sync.c
+===================================================================
+RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
+retrieving revision 1.23
+retrieving revision 1.25
+diff -u -r1.23 -r1.25
+--- tools/fstab-sync.c	14 Oct 2004 18:37:28 -0000	1.23
++++ tools/fstab-sync.c	15 Oct 2004 20:53:45 -0000	1.25
+@@ -74,11 +74,6 @@
+ #define TEMP_FSTAB_PREFIX ".fstab.hal."
+ #define TEMP_FSTAB_MAX_LENGTH 64
+ 
+-#undef FSTAB_SYNC_MOUNT_ROOT
+-#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD
+-#undef FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC
+-#undef FSTAB_SYNC_MOUNT_ACCESS
+-
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
+@@ -1327,6 +1322,7 @@
+ 	char *dir = NULL;
+ 	char *last_slash;
+ 	char *mount_point;
++	char *device_file;
+ 	
+ 	dir = strdup (_PATH_FSTAB); 	 
+ 	last_slash = strrchr (dir, '/'); 	 
+@@ -1373,11 +1369,15 @@
+ 	
+ 	if (!create_mount_point_for_volume (mount_point))
+ 		goto error;
++
++	device_file = hal_device_get_property_string (hal_context, udi, "block.device");
+ 	
+ 	fstab_update_debug (_("%d: added mount point '%s' for device '%s'\n"),
+-			    pid, mount_point, "foo");
++			    pid, mount_point, device_file);
+ 	syslog (LOG_INFO, _("added mount point %s for %s"), 
+-		mount_point, "foo");
++		mount_point, device_file);
++	
++	hal_free_string (device_file);
+ 	
+ 	close (fd);
+ 	
+@@ -1657,10 +1657,8 @@
+         N_("add an entry to fstab"), N_("UDI")},
+       {"remove", 'r', POPT_ARG_STRING, &udi_to_remove, 0,
+         N_("remove an entry from fstab"), N_("UDI")},
+-#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
+       {"clean", 'c', POPT_ARG_NONE, &should_clean, 0,
+         N_("Remove all generated entries from fstab")},
+-#endif
+       {"verbose", 'v', POPT_ARG_NONE, &verbose, 0,
+         N_("Report detailed information about operation progress")},
+ 
+@@ -1694,9 +1692,7 @@
+       
+       /* when invoked for the /org/freedesktop/Hal/devices/computer UDI we clean the fstab */
+       if (getenv ("HALD_STARTUP") != NULL && strcmp (hal_device_udi, "/org/freedesktop/Hal/devices/computer") == 0) {
+-#ifdef FSTAB_SYNC_USE_NOOP_MOUNT_OPTION
+ 	should_clean = TRUE;
+-#endif
+       } else {
+       
+ 	/* when we are invoked by hald, make some early tests using the