chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: report correctly which job was deleted when breaking cycle
[elogind.git]
/
src
/
swap.h
diff --git
a/src/swap.h
b/src/swap.h
index f54a9ee4344e2b54ad25d440db3ae590fe3b1788..9c249ca43cd93f5d5d3bdf4f984c8e66421c04e8 100644
(file)
--- 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
#ifndef fooswaphfoo
#define fooswaphfoo
@@
-30,7
+30,7
@@
typedef struct Swap Swap;
typedef enum SwapState {
SWAP_DEAD,
SWAP_ACTIVE,
typedef enum SwapState {
SWAP_DEAD,
SWAP_ACTIVE,
- SWAP_
MAINTAINANCE
,
+ SWAP_
FAILED
,
_SWAP_STATE_MAX,
_SWAP_STATE_INVALID = -1
} SwapState;
_SWAP_STATE_MAX,
_SWAP_STATE_INVALID = -1
} SwapState;
@@
-39,6
+39,7
@@
typedef struct SwapParameters {
char *what;
int priority;
bool noauto:1;
char *what;
int priority;
bool noauto:1;
+ bool nofail:1;
bool handle:1;
} SwapParameters;
bool handle:1;
} SwapParameters;
@@
-51,16
+52,16
@@
struct Swap {
char *what;
char *what;
+ SwapState state, deserialized_state;
+
bool from_etc_fstab:1;
bool from_proc_swaps:1;
bool from_fragment:1;
bool from_etc_fstab:1;
bool from_proc_swaps:1;
bool from_fragment:1;
-
- SwapState state, deserialized_state;
};
extern const UnitVTable swap_vtable;
};
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);
int swap_add_one_mount_link(Swap *s, Mount *m);