Merge remote-tracking branch 'origin/systemd-216' into staging

2014-09-08 13:53:33 +02:00
parent af69fcde47 3d821c068a
commit 152ae27aac
7 changed files with 93 additions and 2644 deletions
@@ -277,9 +277,12 @@ in

          NotifyAccess = "all";

-          # Note that on reboot, systemd-nspawn returns 10, so this
+          # Note that on reboot, systemd-nspawn returns 133, so this
          # unit will be restarted. On poweroff, it returns 0, so the
          # unit won't be restarted.
+          RestartForceExitStatus = "133";
+          SuccessExitStatus = "133";
+
          Restart = "on-failure";

          # Hack: we don't want to kill systemd-nspawn, since we call