hal/tools fstab-sync.c,1.23,1.24
David Zeuthen
david at freedesktop.org
Thu Oct 14 17:45:54 PDT 2004
Update of /cvs/hal/hal/tools
In directory gabe:/tmp/cvs-serv31702/tools
Modified Files:
fstab-sync.c
Log Message:
2004-10-14 David Zeuthen <davidz at redhat.com>
* tools/fstab-sync.c (main): clean wasn't being called on hald startup
because of missing defines due to the removal of fstab-sync options.
Index: fstab-sync.c
===================================================================
RCS file: /cvs/hal/hal/tools/fstab-sync.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- fstab-sync.c 14 Oct 2004 18:37:28 -0000 1.23
+++ fstab-sync.c 15 Oct 2004 00:45:52 -0000 1.24
@@ -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
@@ -1657,10 +1652,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 +1687,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
More information about the hal-commit
mailing list