hal ChangeLog,1.246,1.247 configure.in,1.32,1.33

[David Zeuthen]

Update of /cvs/hal/hal
In directory pdx:/tmp/cvs-serv20892

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-08-19  David Zeuthen  <david at fubar.dk>

	* tools/fstab-sync.c: Lot's of changes: remove old locking code;
	fix security issue (remove dev,suid) with the given mount options 
	(RH bug #130290); Use a, pretty lame perhaps, heuristic to add 
	noatime,sync for hotpluggable volumes smaller than 1GB. Check device 
	mentioned in /etc/fstab for symlink and if found, update the 
	block.device property in HAL if applicable; Use macros for mount
	root and noop keyword (see configure.in changes).	

	* hald/linux/block_class_device.c (volume_set_size): New function
	(detect_media): Call volume_set_size
	(block_class_pre_process): Call volume_set_size

	* doc/spec/hal-spec.xml.in: Add documentation for volume.block_size
	and volume.num_blocks.

	* configure.in: Add gobject>=2.2.2 to PKG_CHECK_MODULES. Patch from 
	Steve Grubb <linux_4ever at yahoo.com>. Added some configuration options
	for fstab-sync.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- ChangeLog	18 Aug 2004 23:24:41 -0000	1.246
+++ ChangeLog	19 Aug 2004 17:58:15 -0000	1.247
@@ -1,3 +1,24 @@
+2004-08-19  David Zeuthen  <david at fubar.dk>
+
+	* tools/fstab-sync.c: Lot's of changes: remove old locking code;
+	fix security issue (remove dev,suid) with the given mount options 
+	(RH bug #130290); Use a, pretty lame perhaps, heuristic to add 
+	noatime,sync for hotpluggable volumes smaller than 1GB. Check device 
+	mentioned in /etc/fstab for symlink and if found, update the 
+	block.device property in HAL if applicable; Use macros for mount
+	root and noop keyword (see configure.in changes).	
+
+	* hald/linux/block_class_device.c (volume_set_size): New function
+	(detect_media): Call volume_set_size
+	(block_class_pre_process): Call volume_set_size
+
+	* doc/spec/hal-spec.xml.in: Add documentation for volume.block_size
+	and volume.num_blocks.
+
+	* configure.in: Add gobject>=2.2.2 to PKG_CHECK_MODULES. Patch from 
+	Steve Grubb <linux_4ever at yahoo.com>. Added some configuration options
+	for fstab-sync.
+	
 2004-08-19 Kay Sievers <kay.sievers at vrfy.org>
 
 	* hald/linux/block_class_device.c: Add volume.fsversion to the

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- configure.in	17 Aug 2004 09:29:24 -0000	1.32
+++ configure.in	19 Aug 2004 17:58:15 -0000	1.33
@@ -17,8 +17,8 @@
 AM_PATH_PYTHON
 AC_SYS_LARGEFILE
 
-AC_ARG_WITH(init-scripts,       [  --with-init-scripts=<os>   Style of init scripts to install (redhat)])
-AC_ARG_WITH(pid-file,    [  --with-pid-file=<pidfile>    PID file HAL daemon])
+AC_ARG_WITH(init-scripts,       [  --with-init-scripts=<os> Style of init scripts to install (redhat)])
+AC_ARG_WITH(pid-file,    [  --with-pid-file=<file>  PID file for HAL daemon])
 AC_ARG_WITH(hwdata,[  --with-hwdata=<dir>     where PCI and USB IDs are found (auto)])
 if ! test -z "$with_hwdata" ; then
    HWDATA_DIR="$with_hwdata"
@@ -63,11 +63,31 @@
     AC_DEFINE(ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
 fi
 
-AC_ARG_ENABLE(fstab-noop,       [  --enable-fstab-noop     Use noop option in fstab-sync],enable_fstab_noop=yes,enable_fstab_noop=no)
-if test "x$enable_fstab_noop" = "xyes" ; then
-   AC_DEFINE(USE_NOOP_MOUNT_OPTION,1,[Use an unique keyword in the fstab])
+AC_ARG_ENABLE(mnt-noop,         [  --enable-mnt-noop       Use noop option in fstab-sync],enable_mnt_noop=yes,enable_mnt_noop=no)
+if test "x$enable_mnt_noop" = "xyes" ; then
+   AC_DEFINE(FSTAB_SYNC_USE_NOOP_MOUNT_OPTION,1,[Use an unique keyword in the fstab])
 fi
 
+AC_ARG_WITH(with_mnt_root,      [  --with-mnt-root=<path>  Mount root used by fstab-sync (/media)])
+if test -z "$with_mnt_root" ; then
+    FSTAB_SYNC_MOUNT_ROOT=/media
+else
+    FSTAB_SYNC_MOUNT_ROOT=$with_mnt_root
+fi
+AC_SUBST(FSTAB_SYNC_MOUNT_ROOT)
+AC_DEFINE_UNQUOTED(FSTAB_SYNC_MOUNT_ROOT,"$FSTAB_SYNC_MOUNT_ROOT", [Mount root used by fstab-sync])
+
+
+AC_ARG_WITH(with_mnt_noop,      [  --with-mnt-noop=<word>  Noop keyword used by fstab-sync (kudzu)])
+if test -z "$with_mnt_noop" ; then
+    FSTAB_SYNC_MOUNT_MANAGED_KEYWORD=kudzu
+else
+    FSTAB_SYNC_MOUNT_MANAGED_KEYWORD=$with_mnt_noop
+fi
+AC_SUBST(FSTAB_SYNC_MOUNT_MANAGED_KEYWORD)
+AC_DEFINE_UNQUOTED(FSTAB_SYNC_MOUNT_MANAGED_KEYWORD,"$FSTAB_SYNC_MOUNT_MANAGED_KEYWORD", [Noop keyword used by fstab-sync])
+
+
 #### gcc warning flags
 
 if test "x$GCC" = "xyes"; then
@@ -150,7 +170,7 @@
 
 
 dbus_module="dbus-1 >= 0.20"
-pkg_modules="glib-2.0 >= 2.2.2, dbus-glib-1 >= 0.20, $dbus_module"
+pkg_modules="glib-2.0 >= 2.2.2, gobject-2.0 >= 2.2.2, dbus-glib-1 >= 0.20, $dbus_module"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
 AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
@@ -351,7 +371,10 @@
         User for HAL:             ${HAL_USER}
         Group for HAL:            ${HAL_GROUP}
         hald pidfile:             ${HALD_PID_FILE}
-	fstab-sync using noop:    ${enable_fstab_noop}"
+
+	fstab-sync using noop:    ${enable_mnt_noop}
+        fstab-sync noop keyword:  ${FSTAB_SYNC_MOUNT_MANAGED_KEYWORD}
+        fstab-sync mount root:    ${FSTAB_SYNC_MOUNT_ROOT}"
 
 echo "
         Maintainer mode:          ${USE_MAINTAINER_MODE}