summaryrefslogtreecommitdiff
path: root/swap.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-14 02:29:45 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-14 02:29:45 +0200
commit4e85aff465b2ce0fa34222e52a6f5a984140b22e (patch)
tree6f33e8f35a0675b033755cebaea55817f6a753b2 /swap.h
parentc0b52914d23f6cc65bb67c77e2c5e7d58a6e8b9a (diff)
execute: fix bad jump
Diffstat (limited to 'swap.h')
-rw-r--r--swap.h22
1 files changed, 15 insertions, 7 deletions
diff --git a/swap.h b/swap.h
index 758cdbd31d..f54a9ee434 100644
--- a/swap.h
+++ b/swap.h
@@ -35,24 +35,32 @@ 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;
SwapState state, deserialized_state;
};
extern const UnitVTable swap_vtable;
-int swap_add_one(Manager *m, const char *what, bool no_auto, int prio, bool from_proc_swap);
+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);