systemadm: ignore entry activation on empty string

[elogind.git] / manager.h

diff --git a/manager.h b/manager.h
index 01490fc18026b6d77d4375f47a1ed2215c0a104b..a6500ac6007137df2da7136257621ae241973c4c 100644 (file)
--- a/manager.h
+++ b/manager.h
@@ -71,9 +71,9 @@ struct Watch {
                 union Unit *unit;
                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;
-                bool socket_accept;
         } data;
-        bool fd_is_dupped;
+        bool fd_is_dupped:1;
+        bool socket_accept:1;
 };
 
 #include "unit.h"
@@ -85,6 +85,12 @@ struct Watch {
 
 #define SPECIAL_DEFAULT_TARGET "default.target"
 
+/* This is not really intended to be started by directly. This is
+ * mostly so that other targets (reboot/halt/poweroff) can depend on
+ * it to bring all services down that want to be brought down on
+ * system shutdown. */
+#define SPECIAL_SHUTDOWN_TARGET "shutdown.target"
+
 #define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
 
 #define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
@@ -93,6 +99,7 @@ struct Watch {
 
 #define SPECIAL_LOCAL_FS_TARGET "local-fs.target"
 #define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
+#define SPECIAL_SWAP_TARGET "swap.target"
 #define SPECIAL_NETWORK_TARGET "network.target"
 #define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target"     /* LSB's $named */
 #define SPECIAL_RPCBIND_TARGET "rpcbind.target"           /* LSB's $portmap */
@@ -170,6 +177,8 @@ struct Manager {
         char **sysvinit_path;
         char **sysvrcnd_path;
 
+        char **environment;
+
         usec_t boot_timestamp;
 
         /* Data specific to the device subsystem */
@@ -181,6 +190,9 @@ struct Manager {
         FILE *proc_self_mountinfo;
         Watch mount_watch;
 
+        /* Data specific to the swap filesystem */
+        FILE *proc_swaps;
+
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;
         Set *subscribed;
@@ -234,6 +246,7 @@ Unit *manager_get_unit(Manager *m, const char *name);
 int manager_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_u);
 int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
 
+int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Unit **_ret);
 int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret);
 
 int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret);