X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=swap.h;h=f54a9ee4344e2b54ad25d440db3ae590fe3b1788;hp=d8692509b69460a360483066cabca53881f679bf;hb=d9a76d8f860c4ee19c4aa0df685889d058f4c5cb;hpb=07b0b134d3076fe223d6e15959b6081a74b56792

diff --git a/swap.h b/swap.h
index d8692509b..f54a9ee43 100644
--- a/swap.h
+++ b/swap.h
@@ -35,26 +35,37 @@ typedef enum SwapState {
         _SWAP_STATE_INVALID = -1
 } SwapState;
 
+typedef struct SwapParameters {
+        char *what;
+        int priority;
+        bool noauto:1;
+        bool handle:1;
+} SwapParameters;
+
 struct Swap {
         Meta meta;
 
-        char *what;
+        SwapParameters parameters_etc_fstab;
+        SwapParameters parameters_proc_swaps;
+        SwapParameters parameters_fragment;
 
-        int priority;
-
-        bool no_auto;
+        char *what;
 
-        bool from_proc_swaps_only:1;
-        bool found_in_proc_swaps:1;
+        bool from_etc_fstab:1;
+        bool from_proc_swaps:1;
+        bool from_fragment:1;
 
-        MountState state, deserialized_state;
+        SwapState state, deserialized_state;
 };
 
 extern const UnitVTable swap_vtable;
 
+int swap_add_one(Manager *m, const char *what, int prio, bool no_auto, bool handle, bool from_proc_swap);
+
+int swap_add_one_mount_link(Swap *s, Mount *m);
+
 const char* swap_state_to_string(SwapState i);
 SwapState swap_state_from_string(const char *s);
 
-extern int swap_add_one(Manager *m, const char *what, bool no_auto, int prio, bool from_proc_swap);
 
 #endif