X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=automount.h;h=014482cc5a8be261a2b8c6a042d04c21cf447765;hp=acd7ca2e18905addd7ef7a3c913871330692d9bd;hb=cb8a8f78a11cedb8cba1abfa9a63b0d3ea8eef93;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662

diff --git a/automount.h b/automount.h
index acd7ca2e1..014482cc5 100644
--- a/automount.h
+++ b/automount.h
@@ -3,44 +3,63 @@
 #ifndef fooautomounthfoo
 #define fooautomounthfoo
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 typedef struct Automount Automount;
 
 #include "unit.h"
 
 typedef enum AutomountState {
         AUTOMOUNT_DEAD,
-        AUTOMOUNT_START_PRE,
-        AUTOMOUNT_START_POST,
         AUTOMOUNT_WAITING,
         AUTOMOUNT_RUNNING,
-        AUTOMOUNT_STOP_PRE,
-        AUTOMOUNT_STOP_POST,
         AUTOMOUNT_MAINTAINANCE,
-        _AUTOMOUNT_STATE_MAX
+        _AUTOMOUNT_STATE_MAX,
+        _AUTOMOUNT_STATE_INVALID = -1
 } AutomountState;
 
-typedef enum AutomountExecCommand {
-        AUTOMOUNT_EXEC_START_PRE,
-        AUTOMOUNT_EXEC_START_POST,
-        AUTOMOUNT_EXEC_STOP_PRE,
-        AUTOMOUNT_EXEC_STOP_POST,
-        _AUTOMOUNT_EXEC_MAX
-} AutomountExecCommand;
-
 struct Automount {
         Meta meta;
 
-        AutomountState state;
-        char *path;
-
-        ExecCommand* exec_command[_AUTOMOUNT_EXEC_MAX];
-        ExecContext exec_context;
+        AutomountState state, deserialized_state;
 
-        pid_t contol_pid;
+        char *where;
 
         Mount *mount;
+
+        int pipe_fd;
+        Watch pipe_watch;
+        dev_t dev_id;
+
+        Set *tokens;
+
+        bool failure:1;
 };
 
 extern const UnitVTable automount_vtable;
 
+int automount_send_ready(Automount *a, int status);
+
+int automount_add_one_mount_link(Automount *a, Mount *m);
+
+const char* automount_state_to_string(AutomountState i);
+AutomountState automount_state_from_string(const char *s);
+
 #endif