hal ChangeLog,1.332,1.333 configure.in,1.45,1.46
David Zeuthen
david at freedesktop.org
Wed Sep 29 07:28:34 PDT 2004
Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv28376
Modified Files:
ChangeLog configure.in
Log Message:
2004-09-29 David Zeuthen <david at fubar.dk>
* hald/linux/block_class_device.c (detect_disc): Do a CDROM_DRIVE_STATUS
before CDROM_DISC_STATUS
* tools/fstab-sync.c (fs_table_line_is_generated): Use secondary
managed keyword if applicable
(fs_table_add_volume): Use access keyword only if applicable
(volume_new): Also set is_removable
(fs_table_add_volume): Only add removable selinux context for
hotpluggable drives and drives with removable media
* configure.in: Add fstab-sync secondary keyword which is useful for
migration from e.g. kudzu to managed - fstab-sync will only delete
fstab lines with the secondary keyword but never write them. Needs
to be enabled with --enable-mnt-noop-sec.
Also add fstab-sync access keyword which defaults to 'user' but
can be replaced by 'console' - this is useful for specifying the
extra mount option for how to give access. Now the access keyword
needs to be enabled with --enable-mnt-access.
For (my own) reference, this is the parameters used to bootstrap
when building for Red Hat distros
./autogen.sh --enable-mnt-noop --enable-fstab-sync --enable-hotplug-map --with-mnt-noop=managed --enable-mnt-noop-sec --with-mnt-noop-sec=kudzu --enable-mnt-access --with-mnt-access=console --with-init-scripts=redhat --with-pid-file=/var/run/haldaemon.pid --enable-selinux
note: the util-linux package must be patched with the patch in RH bug
133941 in order for --with-mnt-access=console to work; should hit
Rawhide soon.
Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- ChangeLog 29 Sep 2004 07:59:08 -0000 1.332
+++ ChangeLog 29 Sep 2004 14:28:32 -0000 1.333
@@ -1,5 +1,35 @@
2004-09-29 David Zeuthen <david at fubar.dk>
+ * hald/linux/block_class_device.c (detect_disc): Do a CDROM_DRIVE_STATUS
+ before CDROM_DISC_STATUS
+
+ * tools/fstab-sync.c (fs_table_line_is_generated): Use secondary
+ managed keyword if applicable
+ (fs_table_add_volume): Use access keyword only if applicable
+ (volume_new): Also set is_removable
+ (fs_table_add_volume): Only add removable selinux context for
+ hotpluggable drives and drives with removable media
+
+ * configure.in: Add fstab-sync secondary keyword which is useful for
+ migration from e.g. kudzu to managed - fstab-sync will only delete
+ fstab lines with the secondary keyword but never write them. Needs
+ to be enabled with --enable-mnt-noop-sec.
+ Also add fstab-sync access keyword which defaults to 'user' but
+ can be replaced by 'console' - this is useful for specifying the
+ extra mount option for how to give access. Now the access keyword
+ needs to be enabled with --enable-mnt-access.
+
+ For (my own) reference, this is the parameters used to bootstrap
+ when building for Red Hat distros
+
+ ./autogen.sh --enable-mnt-noop --enable-fstab-sync --enable-hotplug-map --with-mnt-noop=managed --enable-mnt-noop-sec --with-mnt-noop-sec=kudzu --enable-mnt-access --with-mnt-access=console --with-init-scripts=redhat --with-pid-file=/var/run/haldaemon.pid --enable-selinux
+
+ note: the util-linux package must be patched with the patch in RH bug
+ 133941 in order for --with-mnt-access=console to work; should hit
+ Rawhide soon.
+
+2004-09-29 David Zeuthen <david at fubar.dk>
+
* hald/linux/block_class_device.c (block_class_pre_process): Check for
USB floppy drive by looking at interface class instead
Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- configure.in 27 Sep 2004 15:03:52 -0000 1.45
+++ configure.in 29 Sep 2004 14:28:32 -0000 1.46
@@ -94,15 +94,44 @@
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)])
+AC_ARG_WITH(with_mnt_noop, [ --with-mnt-noop=<word> Noop keyword used by fstab-sync (managed)])
if test -z "$with_mnt_noop" ; then
- FSTAB_SYNC_MOUNT_MANAGED_KEYWORD=kudzu
+ FSTAB_SYNC_MOUNT_MANAGED_KEYWORD=managed
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])
+AC_ARG_ENABLE(mnt-noop-sec, [ --enable-mnt-noop-sec Use secondary noop option in fstab-sync],enable_mnt_noop_sec=yes,enable_mnt_noop_sec=no)
+if test "x$enable_mnt_noop_sec" = "xyes" ; then
+ AC_DEFINE(FSTAB_SYNC_USE_NOOP_MOUNT_OPTION_SEC,1,[Use a secondary unique keyword in the fstab when deleting entries])
+fi
+
+AC_ARG_WITH(with_mnt_noop_sec, [ --with-mnt-noop-sec=<word> Secondary Noop keyword for fstab-sync (kudzu)])
+if test -z "$with_mnt_noop_sec" ; then
+ FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC=kudzu
+else
+ FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC=$with_mnt_noop_sec
+fi
+AC_SUBST(FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC)
+AC_DEFINE_UNQUOTED(FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC,"$FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC", [Secondary Noop keyword used by fstab-sync])
+
+
+AC_ARG_ENABLE(mnt-access, [ --enable-mnt-access Use a mount option to give unpriv users access],enable_mnt_access=yes,enable_mnt_access=no)
+if test "x$enable_mnt_access" = "xyes" ; then
+ AC_DEFINE(FSTAB_SYNC_USE_ACCESS,1,[Add mount option to enable access to unpriv users])
+fi
+
+AC_ARG_WITH(with_mnt_access, [ --with-mnt-access=<word> Mount keyword to give unpriv users additional access (user)])
+if test -z "$with_mnt_noop_sec" ; then
+ FSTAB_SYNC_MOUNT_ACCESS_SEC=user
+else
+ FSTAB_SYNC_MOUNT_ACCESS=$with_mnt_access
+fi
+AC_SUBST(FSTAB_SYNC_MOUNT_ACCESS)
+AC_DEFINE_UNQUOTED(FSTAB_SYNC_MOUNT_ACCESS,"$FSTAB_SYNC_MOUNT_ACCESS", [Mount keyword to give unprivileged users additional access])
+
#### gcc warning flags
@@ -433,10 +462,14 @@
hald pidfile: ${HALD_PID_FILE}
Building SELinux support: ${have_selinux}
- install fstab-sync: ${enable_fstab_sync}
- fstab-sync using noop: ${enable_mnt_noop}
- fstab-sync noop keyword: ${FSTAB_SYNC_MOUNT_MANAGED_KEYWORD}
- fstab-sync mount root: ${FSTAB_SYNC_MOUNT_ROOT}
+ install fstab-sync: ${enable_fstab_sync}
+ fstab-sync using noop: ${enable_mnt_noop}
+ fstab-sync noop keyword: ${FSTAB_SYNC_MOUNT_MANAGED_KEYWORD}
+ fstab-sync using secondary noop: ${enable_mnt_noop_sec}
+ fstab-sync secondary noop keyword: ${FSTAB_SYNC_MOUNT_MANAGED_KEYWORD_SEC}
+ fstab-sync using mount access keyword: ${enable_mnt_access}
+ fstab-sync mount access keyword: ${FSTAB_SYNC_MOUNT_ACCESS}
+ fstab-sync mount root: ${FSTAB_SYNC_MOUNT_ROOT}
install hal-hotplug-map: ${enable_hotplug_map}"
More information about the hal-commit
mailing list