X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fswap.h;h=9c249ca43cd93f5d5d3bdf4f984c8e66421c04e8;hp=f54a9ee4344e2b54ad25d440db3ae590fe3b1788;hb=32159d3a94c6ef00555546e1caef2eacad62310a;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221

diff --git a/src/swap.h b/src/swap.h
index f54a9ee43..9c249ca43 100644
--- a/src/swap.h
+++ b/src/swap.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooswaphfoo
 #define fooswaphfoo
@@ -30,7 +30,7 @@ typedef struct Swap Swap;
 typedef enum SwapState {
         SWAP_DEAD,
         SWAP_ACTIVE,
-        SWAP_MAINTAINANCE,
+        SWAP_FAILED,
         _SWAP_STATE_MAX,
         _SWAP_STATE_INVALID = -1
 } SwapState;
@@ -39,6 +39,7 @@ typedef struct SwapParameters {
         char *what;
         int priority;
         bool noauto:1;
+        bool nofail:1;
         bool handle:1;
 } SwapParameters;
 
@@ -51,16 +52,16 @@ struct Swap {
 
         char *what;
 
+        SwapState state, deserialized_state;
+
         bool from_etc_fstab:1;
         bool from_proc_swaps:1;
         bool from_fragment:1;
-
-        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(Manager *m, const char *what, int prio, bool no_auto, bool no_fail, bool handle, bool from_proc_swap);
 
 int swap_add_one_mount_link(Swap *s, Mount *m);