hal ChangeLog,1.348,1.349 configure.in,1.49,1.50

[David Zeuthen]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv29939

Modified Files:
	ChangeLog configure.in 
Log Message:
2004-10-14  David Zeuthen  <davidz at redhat.com>

	* configure.in: Remove a bunch of fstab-sync options (all but the
	--enable-fstab-sync) that is now taken from the root computer device
	object, e.g. defined in fdi/90defaultpolicy/storage-policy.fdi file.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- ChangeLog	14 Oct 2004 19:21:41 -0000	1.348
+++ ChangeLog	14 Oct 2004 21:45:08 -0000	1.349
@@ -1,5 +1,11 @@
 2004-10-14  David Zeuthen  <davidz at redhat.com>
 
+	* configure.in: Remove a bunch of fstab-sync options (all but the
+	--enable-fstab-sync) that is now taken from the root computer device
+	object, e.g. defined in fdi/90defaultpolicy/storage-policy.fdi file.
+
+2004-10-14  David Zeuthen  <davidz at redhat.com>
+
 	Patch from Martin Pitt <martin at piware.de>.
 	
 	* hald/linux/pci_bus_device.c (pci_device_pre_process): Fixup crash

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- configure.in	14 Oct 2004 18:37:27 -0000	1.49
+++ configure.in	14 Oct 2004 21:45:08 -0000	1.50
@@ -79,60 +79,6 @@
 AM_CONDITIONAL(HOTPLUG_MAP_ENABLED, test x$enable_hotplug_map = xyes)
 
 
-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 (managed)])
-if test -z "$with_mnt_noop" ; then
-    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
 
 if test "x$GCC" = "xyes"; then
@@ -488,13 +434,6 @@
         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 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}"