mirror of
https://git.proxmox.com/git/systemd
synced 2026-02-03 16:42:27 +00:00
87c3557857
This commit was created using the following commands and then fixing up debian/patches/series manually. $ git config diff.renames false $ git rebase --onto debian/208-5 v208 stable/v208-stable $ git checkout -b patch-queue/experimental HEAD $ gbp-pq export --no-patch-numbers $ git add --ignore-removal debian/patches/
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Tue, 17 Jun 2014 15:04:08 -0400
|
|
Subject: unit.c: Move code around to easy cherrypicking
|
|
|
|
---
|
|
src/core/unit.c | 25 ++++++++++++-------------
|
|
1 file changed, 12 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
index c05926a..29782aa 100644
|
|
--- a/src/core/unit.c
|
|
+++ b/src/core/unit.c
|
|
@@ -2300,19 +2300,6 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
|
|
if (r < 0)
|
|
return r;
|
|
|
|
-
|
|
- if (serialize_jobs) {
|
|
- if (u->job) {
|
|
- fprintf(f, "job\n");
|
|
- job_serialize(u->job, f, fds);
|
|
- }
|
|
-
|
|
- if (u->nop_job) {
|
|
- fprintf(f, "job\n");
|
|
- job_serialize(u->nop_job, f, fds);
|
|
- }
|
|
- }
|
|
-
|
|
dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp);
|
|
dual_timestamp_serialize(f, "active-enter-timestamp", &u->active_enter_timestamp);
|
|
dual_timestamp_serialize(f, "active-exit-timestamp", &u->active_exit_timestamp);
|
|
@@ -2327,6 +2314,18 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
|
|
if (u->cgroup_path)
|
|
unit_serialize_item(u, f, "cgroup", u->cgroup_path);
|
|
|
|
+ if (serialize_jobs) {
|
|
+ if (u->job) {
|
|
+ fprintf(f, "job\n");
|
|
+ job_serialize(u->job, f, fds);
|
|
+ }
|
|
+
|
|
+ if (u->nop_job) {
|
|
+ fprintf(f, "job\n");
|
|
+ job_serialize(u->nop_job, f, fds);
|
|
+ }
|
|
+ }
|
|
+
|
|
/* End marker */
|
|
fputc('\n', f);
|
|
return 0;
|