X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.h;h=30c6d9b249bdf74c69f98b3502698863a0a6cdce;hb=3761902e2e120849c283106fd4b78b6adec7367e;hp=3153a2a99deaecba19e8788443aace1a1b562da0;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git

diff --git a/src/core/mount.h b/src/core/mount.h
index 3153a2a99..30c6d9b24 100644
--- 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.
@@ -25,6 +24,7 @@
 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);