X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fcore%2Fautomount.h;h=e413f237cad3e77d1edbe74ec6240edbde33f92f;hb=HEAD;hp=b8be4d316eef901ac25a9e8ae35fa150873284e4;hpb=4ff183d419f9ec271ae311dae0bc01b4bb204b50;p=thirdparty%2Fsystemd.git

diff --git a/src/core/automount.h b/src/core/automount.h
index b8be4d316ee..e413f237cad 100644
--- a/src/core/automount.h
+++ b/src/core/automount.h
@@ -1,25 +1,6 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-/***
-  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 Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 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
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
 typedef struct Automount Automount;
 
 #include "unit.h"
@@ -27,10 +8,11 @@ typedef struct Automount Automount;
 typedef enum AutomountResult {
         AUTOMOUNT_SUCCESS,
         AUTOMOUNT_FAILURE_RESOURCES,
+        AUTOMOUNT_FAILURE_UNMOUNTED,
         AUTOMOUNT_FAILURE_START_LIMIT_HIT,
         AUTOMOUNT_FAILURE_MOUNT_START_LIMIT_HIT,
         _AUTOMOUNT_RESULT_MAX,
-        _AUTOMOUNT_RESULT_INVALID = -1
+        _AUTOMOUNT_RESULT_INVALID = -EINVAL,
 } AutomountResult;
 
 struct Automount {
@@ -39,6 +21,7 @@ struct Automount {
         AutomountState state, deserialized_state;
 
         char *where;
+        char *extra_options;
         usec_t timeout_idle_usec;
 
         int pipe_fd;
@@ -58,3 +41,5 @@ extern const UnitVTable automount_vtable;
 
 const char* automount_result_to_string(AutomountResult i) _const_;
 AutomountResult automount_result_from_string(const char *s) _pure_;
+
+DEFINE_CAST(AUTOMOUNT, Automount);