ed987cb954
(bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
91 lines
2.9 KiB
Diff
91 lines
2.9 KiB
Diff
Index: systemd-195/src/cryptsetup/cryptsetup-generator.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/cryptsetup/cryptsetup-generator.c
|
|
+++ systemd-195/src/cryptsetup/cryptsetup-generator.c
|
|
@@ -136,7 +136,7 @@ static int create_disk(
|
|
const char *password,
|
|
const char *options) {
|
|
|
|
- char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
|
|
+ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL, *path_file = NULL;
|
|
int r;
|
|
FILE *f = NULL;
|
|
bool noauto, nofail;
|
|
@@ -168,11 +168,63 @@ static int create_disk(
|
|
goto fail;
|
|
}
|
|
|
|
- d = unit_name_from_path(u, ".device");
|
|
- if (!d) {
|
|
- r = -ENOMEM;
|
|
- log_error("Failed to allocate device name.");
|
|
- goto fail;
|
|
+ if (!startswith(device,"/dev/")) {
|
|
+ char *e;
|
|
+
|
|
+ d = strdup(n);
|
|
+ if (!d) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to allocate path name.");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ e = endswith(d,".service");
|
|
+ if (!e) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to modify path name.");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ *e = 0;
|
|
+
|
|
+ d = strcat(d,".path");
|
|
+ if (asprintf(&path_file, "%s/%s", arg_dest, d) < 0) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to allocate unit file name.");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ f = fopen(path_file, "wxe");
|
|
+ if (!f) {
|
|
+ r = -errno;
|
|
+ log_error("Failed to create unit file %s: %m", path_file);
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ fprintf(f,
|
|
+ "[Unit]\n"
|
|
+ "Description=Cryptography Setup for %s\n"
|
|
+ "DefaultDependencies=no\n"
|
|
+ "[Path]\n"
|
|
+ "PathExists=%s\n",
|
|
+ device, device);
|
|
+
|
|
+ fflush(f);
|
|
+
|
|
+ if (ferror(f)) {
|
|
+ r = -errno;
|
|
+ log_error("Failed to write file: %m");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ f = NULL;
|
|
+ } else {
|
|
+ d = unit_name_from_path(u, ".device");
|
|
+ if (!d) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to allocate device name.");
|
|
+ goto fail;
|
|
+ }
|
|
}
|
|
|
|
f = fopen(p, "wxe");
|
|
@@ -298,6 +350,7 @@ fail:
|
|
free(n);
|
|
free(d);
|
|
free(e);
|
|
+ free(path_file);
|
|
|
|
free(from);
|
|
free(to);
|