diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch | 198 |
1 files changed, 99 insertions, 99 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch index 4eeec7b7da..39a975319b 100644 --- a/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch +++ b/meta/recipes-core/systemd/systemd/0001-do-not-disable-buffer-in-writing-files.patch | |||
@@ -40,11 +40,11 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
40 | src/vconsole/vconsole-setup.c | 2 +- | 40 | src/vconsole/vconsole-setup.c | 2 +- |
41 | 18 files changed, 35 insertions(+), 35 deletions(-) | 41 | 18 files changed, 35 insertions(+), 35 deletions(-) |
42 | 42 | ||
43 | diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c | 43 | Index: systemd-stable/src/basic/cgroup-util.c |
44 | index a5141f4cbedd..04c06e7a55cb 100644 | 44 | =================================================================== |
45 | --- a/src/basic/cgroup-util.c | 45 | --- systemd-stable.orig/src/basic/cgroup-util.c |
46 | +++ b/src/basic/cgroup-util.c | 46 | +++ systemd-stable/src/basic/cgroup-util.c |
47 | @@ -739,7 +739,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 47 | @@ -769,7 +769,7 @@ int cg_install_release_agent(const char |
48 | 48 | ||
49 | sc = strstrip(contents); | 49 | sc = strstrip(contents); |
50 | if (isempty(sc)) { | 50 | if (isempty(sc)) { |
@@ -53,7 +53,7 @@ index a5141f4cbedd..04c06e7a55cb 100644 | |||
53 | if (r < 0) | 53 | if (r < 0) |
54 | return r; | 54 | return r; |
55 | } else if (!path_equal(sc, agent)) | 55 | } else if (!path_equal(sc, agent)) |
56 | @@ -757,7 +757,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { | 56 | @@ -787,7 +787,7 @@ int cg_install_release_agent(const char |
57 | 57 | ||
58 | sc = strstrip(contents); | 58 | sc = strstrip(contents); |
59 | if (streq(sc, "0")) { | 59 | if (streq(sc, "0")) { |
@@ -62,7 +62,7 @@ index a5141f4cbedd..04c06e7a55cb 100644 | |||
62 | if (r < 0) | 62 | if (r < 0) |
63 | return r; | 63 | return r; |
64 | 64 | ||
65 | @@ -784,7 +784,7 @@ int cg_uninstall_release_agent(const char *controller) { | 65 | @@ -814,7 +814,7 @@ int cg_uninstall_release_agent(const cha |
66 | if (r < 0) | 66 | if (r < 0) |
67 | return r; | 67 | return r; |
68 | 68 | ||
@@ -71,7 +71,7 @@ index a5141f4cbedd..04c06e7a55cb 100644 | |||
71 | if (r < 0) | 71 | if (r < 0) |
72 | return r; | 72 | return r; |
73 | 73 | ||
74 | @@ -794,7 +794,7 @@ int cg_uninstall_release_agent(const char *controller) { | 74 | @@ -824,7 +824,7 @@ int cg_uninstall_release_agent(const cha |
75 | if (r < 0) | 75 | if (r < 0) |
76 | return r; | 76 | return r; |
77 | 77 | ||
@@ -80,7 +80,7 @@ index a5141f4cbedd..04c06e7a55cb 100644 | |||
80 | if (r < 0) | 80 | if (r < 0) |
81 | return r; | 81 | return r; |
82 | 82 | ||
83 | @@ -1650,7 +1650,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri | 83 | @@ -1656,7 +1656,7 @@ int cg_set_attribute(const char *control |
84 | if (r < 0) | 84 | if (r < 0) |
85 | return r; | 85 | return r; |
86 | 86 | ||
@@ -89,11 +89,11 @@ index a5141f4cbedd..04c06e7a55cb 100644 | |||
89 | } | 89 | } |
90 | 90 | ||
91 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { | 91 | int cg_get_attribute(const char *controller, const char *path, const char *attribute, char **ret) { |
92 | diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c | 92 | Index: systemd-stable/src/basic/procfs-util.c |
93 | index da7e836f143e..2138f20bcc03 100644 | 93 | =================================================================== |
94 | --- a/src/basic/procfs-util.c | 94 | --- systemd-stable.orig/src/basic/procfs-util.c |
95 | +++ b/src/basic/procfs-util.c | 95 | +++ systemd-stable/src/basic/procfs-util.c |
96 | @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limit) { | 96 | @@ -86,13 +86,13 @@ int procfs_tasks_set_limit(uint64_t limi |
97 | * decrease it, as threads-max is the much more relevant sysctl. */ | 97 | * decrease it, as threads-max is the much more relevant sysctl. */ |
98 | if (limit > pid_max-1) { | 98 | if (limit > pid_max-1) { |
99 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ | 99 | sprintf(buffer, "%" PRIu64, limit+1); /* Add one, since PID 0 is not a valid PID */ |
@@ -109,11 +109,11 @@ index da7e836f143e..2138f20bcc03 100644 | |||
109 | if (r < 0) { | 109 | if (r < 0) { |
110 | uint64_t threads_max; | 110 | uint64_t threads_max; |
111 | 111 | ||
112 | diff --git a/src/basic/smack-util.c b/src/basic/smack-util.c | 112 | Index: systemd-stable/src/basic/smack-util.c |
113 | index da9a2139d31a..5e91f5b8f5d9 100644 | 113 | =================================================================== |
114 | --- a/src/basic/smack-util.c | 114 | --- systemd-stable.orig/src/basic/smack-util.c |
115 | +++ b/src/basic/smack-util.c | 115 | +++ systemd-stable/src/basic/smack-util.c |
116 | @@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const char *label) { | 116 | @@ -114,7 +114,7 @@ int mac_smack_apply_pid(pid_t pid, const |
117 | return 0; | 117 | return 0; |
118 | 118 | ||
119 | p = procfs_file_alloca(pid, "attr/current"); | 119 | p = procfs_file_alloca(pid, "attr/current"); |
@@ -122,10 +122,10 @@ index da9a2139d31a..5e91f5b8f5d9 100644 | |||
122 | if (r < 0) | 122 | if (r < 0) |
123 | return r; | 123 | return r; |
124 | 124 | ||
125 | diff --git a/src/basic/util.c b/src/basic/util.c | 125 | Index: systemd-stable/src/basic/util.c |
126 | index 2b3b3918a32f..aff8d0fcd473 100644 | 126 | =================================================================== |
127 | --- a/src/basic/util.c | 127 | --- systemd-stable.orig/src/basic/util.c |
128 | +++ b/src/basic/util.c | 128 | +++ systemd-stable/src/basic/util.c |
129 | @@ -267,7 +267,7 @@ void disable_coredumps(void) { | 129 | @@ -267,7 +267,7 @@ void disable_coredumps(void) { |
130 | if (detect_container() > 0) | 130 | if (detect_container() > 0) |
131 | return; | 131 | return; |
@@ -135,11 +135,11 @@ index 2b3b3918a32f..aff8d0fcd473 100644 | |||
135 | if (r < 0) | 135 | if (r < 0) |
136 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); | 136 | log_debug_errno(r, "Failed to turn off coredumps, ignoring: %m"); |
137 | } | 137 | } |
138 | diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c | 138 | Index: systemd-stable/src/binfmt/binfmt.c |
139 | index 7ff844c78c3a..5c5721d7c2f7 100644 | 139 | =================================================================== |
140 | --- a/src/binfmt/binfmt.c | 140 | --- systemd-stable.orig/src/binfmt/binfmt.c |
141 | +++ b/src/binfmt/binfmt.c | 141 | +++ systemd-stable/src/binfmt/binfmt.c |
142 | @@ -47,7 +47,7 @@ static int delete_rule(const char *rule) { | 142 | @@ -48,7 +48,7 @@ static int delete_rule(const char *rule) |
143 | if (!fn) | 143 | if (!fn) |
144 | return log_oom(); | 144 | return log_oom(); |
145 | 145 | ||
@@ -148,7 +148,7 @@ index 7ff844c78c3a..5c5721d7c2f7 100644 | |||
148 | } | 148 | } |
149 | 149 | ||
150 | static int apply_rule(const char *rule) { | 150 | static int apply_rule(const char *rule) { |
151 | @@ -55,7 +55,7 @@ static int apply_rule(const char *rule) { | 151 | @@ -56,7 +56,7 @@ static int apply_rule(const char *rule) |
152 | 152 | ||
153 | (void) delete_rule(rule); | 153 | (void) delete_rule(rule); |
154 | 154 | ||
@@ -157,7 +157,7 @@ index 7ff844c78c3a..5c5721d7c2f7 100644 | |||
157 | if (r < 0) | 157 | if (r < 0) |
158 | return log_error_errno(r, "Failed to add binary format: %m"); | 158 | return log_error_errno(r, "Failed to add binary format: %m"); |
159 | 159 | ||
160 | @@ -212,7 +212,7 @@ static int run(int argc, char *argv[]) { | 160 | @@ -223,7 +223,7 @@ static int run(int argc, char *argv[]) { |
161 | } | 161 | } |
162 | 162 | ||
163 | /* Flush out all rules */ | 163 | /* Flush out all rules */ |
@@ -166,11 +166,11 @@ index 7ff844c78c3a..5c5721d7c2f7 100644 | |||
166 | 166 | ||
167 | STRV_FOREACH(f, files) { | 167 | STRV_FOREACH(f, files) { |
168 | k = apply_file(*f, true); | 168 | k = apply_file(*f, true); |
169 | diff --git a/src/core/main.c b/src/core/main.c | 169 | Index: systemd-stable/src/core/main.c |
170 | index 3c6b66e89c8e..c39ebe56a5b3 100644 | 170 | =================================================================== |
171 | --- a/src/core/main.c | 171 | --- systemd-stable.orig/src/core/main.c |
172 | +++ b/src/core/main.c | 172 | +++ systemd-stable/src/core/main.c |
173 | @@ -1312,7 +1312,7 @@ static int bump_unix_max_dgram_qlen(void) { | 173 | @@ -1382,7 +1382,7 @@ static int bump_unix_max_dgram_qlen(void |
174 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) | 174 | if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) |
175 | return 0; | 175 | return 0; |
176 | 176 | ||
@@ -179,7 +179,7 @@ index 3c6b66e89c8e..c39ebe56a5b3 100644 | |||
179 | if (r < 0) | 179 | if (r < 0) |
180 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, | 180 | return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, |
181 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); | 181 | "Failed to bump AF_UNIX datagram queue length, ignoring: %m"); |
182 | @@ -1536,7 +1536,7 @@ static void initialize_core_pattern(bool skip_setup) { | 182 | @@ -1668,7 +1668,7 @@ static void initialize_core_pattern(bool |
183 | if (getpid_cached() != 1) | 183 | if (getpid_cached() != 1) |
184 | return; | 184 | return; |
185 | 185 | ||
@@ -188,11 +188,11 @@ index 3c6b66e89c8e..c39ebe56a5b3 100644 | |||
188 | if (r < 0) | 188 | if (r < 0) |
189 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); | 189 | log_warning_errno(r, "Failed to write '%s' to /proc/sys/kernel/core_pattern, ignoring: %m", arg_early_core_pattern); |
190 | } | 190 | } |
191 | diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c | 191 | Index: systemd-stable/src/core/smack-setup.c |
192 | index 4427397f2715..8aeb5c829513 100644 | 192 | =================================================================== |
193 | --- a/src/core/smack-setup.c | 193 | --- systemd-stable.orig/src/core/smack-setup.c |
194 | +++ b/src/core/smack-setup.c | 194 | +++ systemd-stable/src/core/smack-setup.c |
195 | @@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) { | 195 | @@ -325,17 +325,17 @@ int mac_smack_setup(bool *loaded_policy) |
196 | } | 196 | } |
197 | 197 | ||
198 | #ifdef SMACK_RUN_LABEL | 198 | #ifdef SMACK_RUN_LABEL |
@@ -214,10 +214,10 @@ index 4427397f2715..8aeb5c829513 100644 | |||
214 | if (r < 0) | 214 | if (r < 0) |
215 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); | 215 | log_warning_errno(r, "Failed to set SMACK netlabel rule \"127.0.0.1 -CIPSO\": %m"); |
216 | #endif | 216 | #endif |
217 | diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c | 217 | Index: systemd-stable/src/hibernate-resume/hibernate-resume.c |
218 | index 17e7cd1a009b..87a766771663 100644 | 218 | =================================================================== |
219 | --- a/src/hibernate-resume/hibernate-resume.c | 219 | --- systemd-stable.orig/src/hibernate-resume/hibernate-resume.c |
220 | +++ b/src/hibernate-resume/hibernate-resume.c | 220 | +++ systemd-stable/src/hibernate-resume/hibernate-resume.c |
221 | @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { | 221 | @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { |
222 | return EXIT_FAILURE; | 222 | return EXIT_FAILURE; |
223 | } | 223 | } |
@@ -227,11 +227,11 @@ index 17e7cd1a009b..87a766771663 100644 | |||
227 | if (r < 0) { | 227 | if (r < 0) { |
228 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); | 228 | log_error_errno(r, "Failed to write '%s' to /sys/power/resume: %m", major_minor); |
229 | return EXIT_FAILURE; | 229 | return EXIT_FAILURE; |
230 | diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c | 230 | Index: systemd-stable/src/libsystemd/sd-device/sd-device.c |
231 | index 1f2451f8e1b4..3f676ec2841a 100644 | 231 | =================================================================== |
232 | --- a/src/libsystemd/sd-device/sd-device.c | 232 | --- systemd-stable.orig/src/libsystemd/sd-device/sd-device.c |
233 | +++ b/src/libsystemd/sd-device/sd-device.c | 233 | +++ systemd-stable/src/libsystemd/sd-device/sd-device.c |
234 | @@ -1849,7 +1849,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, | 234 | @@ -1877,7 +1877,7 @@ _public_ int sd_device_set_sysattr_value |
235 | if (!value) | 235 | if (!value) |
236 | return -ENOMEM; | 236 | return -ENOMEM; |
237 | 237 | ||
@@ -240,11 +240,11 @@ index 1f2451f8e1b4..3f676ec2841a 100644 | |||
240 | if (r < 0) { | 240 | if (r < 0) { |
241 | if (r == -ELOOP) | 241 | if (r == -ELOOP) |
242 | return -EINVAL; | 242 | return -EINVAL; |
243 | diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c | 243 | Index: systemd-stable/src/login/logind-dbus.c |
244 | index 52a7ea3c77e9..9703de0dabee 100644 | 244 | =================================================================== |
245 | --- a/src/login/logind-dbus.c | 245 | --- systemd-stable.orig/src/login/logind-dbus.c |
246 | +++ b/src/login/logind-dbus.c | 246 | +++ systemd-stable/src/login/logind-dbus.c |
247 | @@ -1339,7 +1339,7 @@ static int trigger_device(Manager *m, sd_device *d) { | 247 | @@ -1341,7 +1341,7 @@ static int trigger_device(Manager *m, sd |
248 | if (!t) | 248 | if (!t) |
249 | return -ENOMEM; | 249 | return -ENOMEM; |
250 | 250 | ||
@@ -253,11 +253,11 @@ index 52a7ea3c77e9..9703de0dabee 100644 | |||
253 | } | 253 | } |
254 | 254 | ||
255 | return 0; | 255 | return 0; |
256 | diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c | 256 | Index: systemd-stable/src/nspawn/nspawn-cgroup.c |
257 | index f5048d9473cb..b6383ab5c97e 100644 | 257 | =================================================================== |
258 | --- a/src/nspawn/nspawn-cgroup.c | 258 | --- systemd-stable.orig/src/nspawn/nspawn-cgroup.c |
259 | +++ b/src/nspawn/nspawn-cgroup.c | 259 | +++ systemd-stable/src/nspawn/nspawn-cgroup.c |
260 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { | 260 | @@ -124,7 +124,7 @@ int sync_cgroup(pid_t pid, CGroupUnified |
261 | fn = strjoina(tree, cgroup, "/cgroup.procs"); | 261 | fn = strjoina(tree, cgroup, "/cgroup.procs"); |
262 | 262 | ||
263 | sprintf(pid_string, PID_FMT, pid); | 263 | sprintf(pid_string, PID_FMT, pid); |
@@ -266,11 +266,11 @@ index f5048d9473cb..b6383ab5c97e 100644 | |||
266 | if (r < 0) { | 266 | if (r < 0) { |
267 | log_error_errno(r, "Failed to move process: %m"); | 267 | log_error_errno(r, "Failed to move process: %m"); |
268 | goto finish; | 268 | goto finish; |
269 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | 269 | Index: systemd-stable/src/nspawn/nspawn.c |
270 | index 734dee1130e0..71add9a055d2 100644 | 270 | =================================================================== |
271 | --- a/src/nspawn/nspawn.c | 271 | --- systemd-stable.orig/src/nspawn/nspawn.c |
272 | +++ b/src/nspawn/nspawn.c | 272 | +++ systemd-stable/src/nspawn/nspawn.c |
273 | @@ -2440,7 +2440,7 @@ static int reset_audit_loginuid(void) { | 273 | @@ -2493,7 +2493,7 @@ static int reset_audit_loginuid(void) { |
274 | if (streq(p, "4294967295")) | 274 | if (streq(p, "4294967295")) |
275 | return 0; | 275 | return 0; |
276 | 276 | ||
@@ -279,7 +279,7 @@ index 734dee1130e0..71add9a055d2 100644 | |||
279 | if (r < 0) { | 279 | if (r < 0) { |
280 | log_error_errno(r, | 280 | log_error_errno(r, |
281 | "Failed to reset audit login UID. This probably means that your kernel is too\n" | 281 | "Failed to reset audit login UID. This probably means that your kernel is too\n" |
282 | @@ -3665,13 +3665,13 @@ static int setup_uid_map(pid_t pid) { | 282 | @@ -3726,13 +3726,13 @@ static int setup_uid_map(pid_t pid) { |
283 | 283 | ||
284 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); | 284 | xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); |
285 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); | 285 | xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); |
@@ -295,11 +295,11 @@ index 734dee1130e0..71add9a055d2 100644 | |||
295 | if (r < 0) | 295 | if (r < 0) |
296 | return log_error_errno(r, "Failed to write GID map: %m"); | 296 | return log_error_errno(r, "Failed to write GID map: %m"); |
297 | 297 | ||
298 | diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c | 298 | Index: systemd-stable/src/shared/cgroup-setup.c |
299 | index e8398cbde5ba..ba682ec0c9e7 100644 | 299 | =================================================================== |
300 | --- a/src/shared/cgroup-setup.c | 300 | --- systemd-stable.orig/src/shared/cgroup-setup.c |
301 | +++ b/src/shared/cgroup-setup.c | 301 | +++ systemd-stable/src/shared/cgroup-setup.c |
302 | @@ -267,7 +267,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { | 302 | @@ -267,7 +267,7 @@ int cg_attach(const char *controller, co |
303 | 303 | ||
304 | xsprintf(c, PID_FMT "\n", pid); | 304 | xsprintf(c, PID_FMT "\n", pid); |
305 | 305 | ||
@@ -317,11 +317,11 @@ index e8398cbde5ba..ba682ec0c9e7 100644 | |||
317 | if (r < 0) { | 317 | if (r < 0) { |
318 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", | 318 | log_debug_errno(r, "Failed to %s controller %s for %s (%s): %m", |
319 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); | 319 | FLAGS_SET(mask, bit) ? "enable" : "disable", n, p, fs); |
320 | diff --git a/src/shared/sysctl-util.c b/src/shared/sysctl-util.c | 320 | Index: systemd-stable/src/shared/sysctl-util.c |
321 | index 8543dbd2d05f..76162599817e 100644 | 321 | =================================================================== |
322 | --- a/src/shared/sysctl-util.c | 322 | --- systemd-stable.orig/src/shared/sysctl-util.c |
323 | +++ b/src/shared/sysctl-util.c | 323 | +++ systemd-stable/src/shared/sysctl-util.c |
324 | @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, const char *ifname, const char *property, c | 324 | @@ -93,7 +93,7 @@ int sysctl_write_ip_property(int af, con |
325 | 325 | ||
326 | log_debug("Setting '%s' to '%s'", p, value); | 326 | log_debug("Setting '%s' to '%s'", p, value); |
327 | 327 | ||
@@ -330,11 +330,11 @@ index 8543dbd2d05f..76162599817e 100644 | |||
330 | } | 330 | } |
331 | 331 | ||
332 | int sysctl_read(const char *property, char **content) { | 332 | int sysctl_read(const char *property, char **content) { |
333 | diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c | 333 | Index: systemd-stable/src/sleep/sleep.c |
334 | index fbfddc0262fc..7cc2902154e9 100644 | 334 | =================================================================== |
335 | --- a/src/sleep/sleep.c | 335 | --- systemd-stable.orig/src/sleep/sleep.c |
336 | +++ b/src/sleep/sleep.c | 336 | +++ systemd-stable/src/sleep/sleep.c |
337 | @@ -47,7 +47,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca | 337 | @@ -48,7 +48,7 @@ static int write_hibernate_location_info |
338 | assert(hibernate_location->swap); | 338 | assert(hibernate_location->swap); |
339 | 339 | ||
340 | xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); | 340 | xsprintf(resume_str, "%u:%u", major(hibernate_location->devno), minor(hibernate_location->devno)); |
@@ -343,7 +343,7 @@ index fbfddc0262fc..7cc2902154e9 100644 | |||
343 | if (r < 0) | 343 | if (r < 0) |
344 | return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", | 344 | return log_debug_errno(r, "Failed to write partition device to /sys/power/resume for '%s': '%s': %m", |
345 | hibernate_location->swap->device, resume_str); | 345 | hibernate_location->swap->device, resume_str); |
346 | @@ -74,7 +74,7 @@ static int write_hibernate_location_info(const HibernateLocation *hibernate_loca | 346 | @@ -75,7 +75,7 @@ static int write_hibernate_location_info |
347 | } | 347 | } |
348 | 348 | ||
349 | xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); | 349 | xsprintf(offset_str, "%" PRIu64, hibernate_location->offset); |
@@ -352,7 +352,7 @@ index fbfddc0262fc..7cc2902154e9 100644 | |||
352 | if (r < 0) | 352 | if (r < 0) |
353 | return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", | 353 | return log_debug_errno(r, "Failed to write swap file offset to /sys/power/resume_offset for '%s': '%s': %m", |
354 | hibernate_location->swap->device, offset_str); | 354 | hibernate_location->swap->device, offset_str); |
355 | @@ -91,7 +91,7 @@ static int write_mode(char **modes) { | 355 | @@ -92,7 +92,7 @@ static int write_mode(char **modes) { |
356 | STRV_FOREACH(mode, modes) { | 356 | STRV_FOREACH(mode, modes) { |
357 | int k; | 357 | int k; |
358 | 358 | ||
@@ -361,7 +361,7 @@ index fbfddc0262fc..7cc2902154e9 100644 | |||
361 | if (k >= 0) | 361 | if (k >= 0) |
362 | return 0; | 362 | return 0; |
363 | 363 | ||
364 | @@ -110,7 +110,7 @@ static int write_state(FILE **f, char **states) { | 364 | @@ -114,7 +114,7 @@ static int write_state(FILE **f, char ** |
365 | STRV_FOREACH(state, states) { | 365 | STRV_FOREACH(state, states) { |
366 | int k; | 366 | int k; |
367 | 367 | ||
@@ -370,11 +370,11 @@ index fbfddc0262fc..7cc2902154e9 100644 | |||
370 | if (k >= 0) | 370 | if (k >= 0) |
371 | return 0; | 371 | return 0; |
372 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); | 372 | log_debug_errno(k, "Failed to write '%s' to /sys/power/state: %m", *state); |
373 | diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c | 373 | Index: systemd-stable/src/udev/udevadm-trigger.c |
374 | index 60c68b5029cf..fdca03d3d42c 100644 | 374 | =================================================================== |
375 | --- a/src/udev/udevadm-trigger.c | 375 | --- systemd-stable.orig/src/udev/udevadm-trigger.c |
376 | +++ b/src/udev/udevadm-trigger.c | 376 | +++ systemd-stable/src/udev/udevadm-trigger.c |
377 | @@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerator *e, const char *action, Set *settle_se | 377 | @@ -43,7 +43,7 @@ static int exec_list(sd_device_enumerato |
378 | if (!filename) | 378 | if (!filename) |
379 | return log_oom(); | 379 | return log_oom(); |
380 | 380 | ||
@@ -383,11 +383,11 @@ index 60c68b5029cf..fdca03d3d42c 100644 | |||
383 | if (r < 0) { | 383 | if (r < 0) { |
384 | bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); | 384 | bool ignore = IN_SET(r, -ENOENT, -EACCES, -ENODEV, -EROFS); |
385 | 385 | ||
386 | diff --git a/src/udev/udevd.c b/src/udev/udevd.c | 386 | Index: systemd-stable/src/udev/udevd.c |
387 | index ca65474f2763..38780681431a 100644 | 387 | =================================================================== |
388 | --- a/src/udev/udevd.c | 388 | --- systemd-stable.orig/src/udev/udevd.c |
389 | +++ b/src/udev/udevd.c | 389 | +++ systemd-stable/src/udev/udevd.c |
390 | @@ -1089,7 +1089,7 @@ static int synthesize_change_one(sd_device *dev, const char *syspath) { | 390 | @@ -1153,7 +1153,7 @@ static int synthesize_change_one(sd_devi |
391 | 391 | ||
392 | filename = strjoina(syspath, "/uevent"); | 392 | filename = strjoina(syspath, "/uevent"); |
393 | log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); | 393 | log_device_debug(dev, "device is closed, synthesising 'change' on %s", syspath); |
@@ -396,11 +396,11 @@ index ca65474f2763..38780681431a 100644 | |||
396 | if (r < 0) | 396 | if (r < 0) |
397 | return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); | 397 | return log_device_debug_errno(dev, r, "Failed to write 'change' to %s: %m", filename); |
398 | return 0; | 398 | return 0; |
399 | diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c | 399 | Index: systemd-stable/src/vconsole/vconsole-setup.c |
400 | index 9d706085fb47..30dcfa86f4d0 100644 | 400 | =================================================================== |
401 | --- a/src/vconsole/vconsole-setup.c | 401 | --- systemd-stable.orig/src/vconsole/vconsole-setup.c |
402 | +++ b/src/vconsole/vconsole-setup.c | 402 | +++ systemd-stable/src/vconsole/vconsole-setup.c |
403 | @@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *name, int fd, bool utf8) { | 403 | @@ -116,7 +116,7 @@ static int toggle_utf8_vc(const char *na |
404 | static int toggle_utf8_sysfs(bool utf8) { | 404 | static int toggle_utf8_sysfs(bool utf8) { |
405 | int r; | 405 | int r; |
406 | 406 | ||