core/smack: downgrade info to debug

[elogind.git] / src / core / mount.h

diff --git a/src/core/mount.h b/src/core/mount.h
index 9318444249c33e5838dd0c01551eae35140ac212..30c6d9b249bdf74c69f98b3502698863a0a6cdce 100644 (file)
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foomounthfoo
-#define foomounthfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -9,22 +8,23 @@
   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
+  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
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  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 Mount Mount;
 
 #include "unit.h"
+#include "kill.h"
 
 typedef enum MountState {
         MOUNT_DEAD,
@@ -75,11 +75,9 @@ struct Mount {
 
         char *where;
 
-        MountParameters parameters_etc_fstab;
         MountParameters parameters_proc_self_mountinfo;
         MountParameters parameters_fragment;
 
-        bool from_etc_fstab:1;
         bool from_proc_self_mountinfo:1;
         bool from_fragment:1;
 
@@ -98,6 +96,7 @@ struct Mount {
 
         ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
         ExecContext exec_context;
+        KillContext kill_context;
 
         MountState state, deserialized_state;
 
@@ -121,4 +120,4 @@ MountExecCommand mount_exec_command_from_string(const char *s);
 const char* mount_result_to_string(MountResult i);
 MountResult mount_result_from_string(const char *s);
 
-#endif
+void warn_if_dir_nonempty(const char *unit, const char* where);