]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #9624 from poettering/service-state-flush
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 2 Aug 2018 07:50:39 +0000 (09:50 +0200)
committerGitHub <noreply@github.com>
Thu, 2 Aug 2018 07:50:39 +0000 (09:50 +0200)
flush out ExecStatus structures when a new service cycle begins

1  2 
src/core/execute.c
src/core/execute.h
src/core/mount.c
src/core/service.c
src/core/socket.c
src/core/swap.c
src/systemctl/systemctl.c

Simple merge
index cd5165c2d1297e386e20428a4284aef1223c18a9,678ee5b1893aabbc2642239c776fcbb44f63b52e..2e8b01f7695f97f9899e195a0187689cb62533b4
@@@ -86,12 -87,13 +87,13 @@@ struct ExecStatus 
  };
  
  typedef enum ExecCommandFlags {
 -        EXEC_COMMAND_IGNORE_FAILURE = 1,
 -        EXEC_COMMAND_FULLY_PRIVILEGED = 2,
 -        EXEC_COMMAND_NO_SETUID = 4,
 -        EXEC_COMMAND_AMBIENT_MAGIC = 8,
 +        EXEC_COMMAND_IGNORE_FAILURE   = 1 << 0,
 +        EXEC_COMMAND_FULLY_PRIVILEGED = 1 << 1,
 +        EXEC_COMMAND_NO_SETUID        = 1 << 2,
 +        EXEC_COMMAND_AMBIENT_MAGIC    = 1 << 3,
  } ExecCommandFlags;
  
+ /* Stores information about commands we execute. Covers both configuration settings as well as runtime data. */
  struct ExecCommand {
          char *path;
          char **argv;
Simple merge
Simple merge
Simple merge
diff --cc src/core/swap.c
Simple merge
Simple merge