diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | fixme | 2 | ||||
| -rw-r--r-- | load-fragment.c | 2 | ||||
| -rw-r--r-- | main.c | 10 | ||||
| -rw-r--r-- | milestone.c | 26 | ||||
| -rw-r--r-- | milestone.h | 23 | ||||
| -rw-r--r-- | name.c | 2 | ||||
| -rw-r--r-- | name.h | 8 | ||||
| -rw-r--r-- | target.c | 26 | ||||
| -rw-r--r-- | target.h | 23 | ||||
| -rw-r--r-- | test1/default.milestone | 4 | ||||
| -rw-r--r-- | test1/default.target | 4 |
12 files changed, 65 insertions, 67 deletions
@@ -17,7 +17,7 @@ COMMON= \ automount.o \ mount.o \ device.o \ - milestone.o \ + target.o \ snapshot.o \ socket.o \ timer.o \ @@ -15,8 +15,6 @@ - snapshot system -- s/milestone/target/ - - hookup with battery status, suspend/resume - add a job mode which shuts everything down but what is requested diff --git a/load-fragment.c b/load-fragment.c index aa1ae7867c..cf1e149861 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -464,7 +464,7 @@ int name_load_fragment(Name *n) { [NAME_SERVICE] = "Service", [NAME_TIMER] = "Timer", [NAME_SOCKET] = "Socket", - [NAME_MILESTONE] = "Milestone", + [NAME_TARGET] = "Target", [NAME_DEVICE] = "Device", [NAME_MOUNT] = "Mount", [NAME_AUTOMOUNT] = "Automount", @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { Manager *m = NULL; - Name *milestone = NULL, *syslog = NULL; + Name *target = NULL, *syslog = NULL; Job *job = NULL; int r, retval = 1; @@ -21,8 +21,8 @@ int main(int argc, char *argv[]) { goto finish; } - if ((r = manager_load_name(m, "default.milestone", &milestone)) < 0) { - log_error("Failed to load default milestone: %s", strerror(-r)); + if ((r = manager_load_name(m, "default.target", &target)) < 0) { + log_error("Failed to load default target: %s", strerror(-r)); goto finish; } @@ -31,8 +31,8 @@ int main(int argc, char *argv[]) { goto finish; } - if ((r = manager_add_job(m, JOB_START, milestone, JOB_REPLACE, false, &job)) < 0) { - log_error("Failed to start default milestone: %s", strerror(-r)); + if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &job)) < 0) { + log_error("Failed to start default target: %s", strerror(-r)); goto finish; } diff --git a/milestone.c b/milestone.c deleted file mode 100644 index fd4a6897ba..0000000000 --- a/milestone.c +++ /dev/null @@ -1,26 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ - -#include "name.h" -#include "milestone.h" -#include "load-fragment.h" - -static void milestone_done(Name *n) { - Milestone *m = MILESTONE(n); - - assert(m); - - /* Nothing here for now */ -} - -static NameActiveState milestone_active_state(Name *n) { - return MILESTONE(n)->state == MILESTONE_DEAD ? NAME_INACTIVE : NAME_ACTIVE; -} - -const NameVTable milestone_vtable = { - .suffix = ".milestone", - - .init = name_load_fragment, - .done = milestone_done, - - .active_state = milestone_active_state -}; diff --git a/milestone.h b/milestone.h deleted file mode 100644 index 332fbe44c3..0000000000 --- a/milestone.h +++ /dev/null @@ -1,23 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ - -#ifndef foomilestonehfoo -#define foomilestonehfoo - -typedef struct Milestone Milestone; - -#include "name.h" - -typedef enum MilestoneState { - MILESTONE_DEAD, - MILESTONE_ACTIVE -} MilestoneState; - -struct Milestone { - Meta meta; - - MilestoneState state; -}; - -extern const NameVTable milestone_vtable; - -#endif @@ -19,7 +19,7 @@ const NameVTable * const name_vtable[_NAME_TYPE_MAX] = { [NAME_SERVICE] = &service_vtable, [NAME_TIMER] = &timer_vtable, [NAME_SOCKET] = &socket_vtable, - [NAME_MILESTONE] = &milestone_vtable, + [NAME_TARGET] = &target_vtable, [NAME_DEVICE] = &device_vtable, [NAME_MOUNT] = &mount_vtable, [NAME_AUTOMOUNT] = &automount_vtable, @@ -31,7 +31,7 @@ enum NameType { NAME_SERVICE = 0, NAME_TIMER, NAME_SOCKET, - NAME_MILESTONE, + NAME_TARGET, NAME_DEVICE, NAME_MOUNT, NAME_AUTOMOUNT, @@ -121,7 +121,7 @@ struct Meta { #include "service.h" #include "timer.h" #include "socket.h" -#include "milestone.h" +#include "target.h" #include "device.h" #include "mount.h" #include "automount.h" @@ -132,7 +132,7 @@ union Name { Service service; Timer timer; Socket socket; - Milestone milestone; + Target target; Device device; Mount mount; Automount automount; @@ -184,7 +184,7 @@ extern const NameVTable * const name_vtable[_NAME_TYPE_MAX]; DEFINE_CAST(SOCKET, Socket); DEFINE_CAST(TIMER, Timer); DEFINE_CAST(SERVICE, Service); -DEFINE_CAST(MILESTONE, Milestone); +DEFINE_CAST(TARGET, Target); DEFINE_CAST(DEVICE, Device); DEFINE_CAST(MOUNT, Mount); DEFINE_CAST(AUTOMOUNT, Automount); diff --git a/target.c b/target.c new file mode 100644 index 0000000000..12a219295b --- /dev/null +++ b/target.c @@ -0,0 +1,26 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + +#include "name.h" +#include "target.h" +#include "load-fragment.h" + +static void target_done(Name *n) { + Target *m = TARGET(n); + + assert(m); + + /* Nothing here for now */ +} + +static NameActiveState target_active_state(Name *n) { + return TARGET(n)->state == TARGET_DEAD ? NAME_INACTIVE : NAME_ACTIVE; +} + +const NameVTable target_vtable = { + .suffix = ".target", + + .init = name_load_fragment, + .done = target_done, + + .active_state = target_active_state +}; diff --git a/target.h b/target.h new file mode 100644 index 0000000000..61f2803c16 --- /dev/null +++ b/target.h @@ -0,0 +1,23 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + +#ifndef footargethfoo +#define footargethfoo + +typedef struct Target Target; + +#include "name.h" + +typedef enum TargetState { + TARGET_DEAD, + TARGET_ACTIVE +} TargetState; + +struct Target { + Meta meta; + + TargetState state; +}; + +extern const NameVTable target_vtable; + +#endif diff --git a/test1/default.milestone b/test1/default.milestone deleted file mode 100644 index c20a10e91b..0000000000 --- a/test1/default.milestone +++ /dev/null @@ -1,4 +0,0 @@ -[Meta] -Names=multiuser.milestone -Wants=postfix.socket syslog.socket -Description=Default Milestone diff --git a/test1/default.target b/test1/default.target new file mode 100644 index 0000000000..b158a23704 --- /dev/null +++ b/test1/default.target @@ -0,0 +1,4 @@ +[Meta] +Names=multiuser.target +Wants=postfix.socket syslog.socket +Description=Default Target |