forked from pool/systemd
Frederic Crozat
9bf0c2c838
- Remove storage-after-cryptsetup.service, add
storage-after-cryptsetup.patch instead to prevent dependency
cycle (bnc#722539).
- Add delay-fsck-cryptsetup-after-md-lvm-dmraid.patch: ensure
fsck/cryptsetup is run after lvm/md/dmraid have landed
(bnc#724912).
- Add cron-tty-pam.patch: Fix cron filling logs (bnc#731358).
- Add do_not_warn_pidfile.patch: Fix PID warning in logs
(bnc#732912).
- Add mount-swap-log.patch: Ensure swap and mount output is
redirected to default log target (rhb#750032).
- Add color-on-boot.patch: ensure colored status are displayed at
boot time.
- Update modules_on_boot.patch to fix bnc#732041.
- Replace private_tmp_crash.patch with log_on_close.patch, better
upstream fix for bnc#699829 and fix bnc#731719.
- Update vconsole patch to fix memleaks and crash (bnc#734527).
- Add handle-racy-daemon.patch: fix warnings with sendmail
(bnc#732912).
- Add new-lsb-headers.patch: support PIDFile: and
X-Systemd-RemainAfterExit: header in initscript (bnc#727771).
- Update bootsplash services to not start if vga= is missing from
cmdline (bnc#727771)
- Add lock-opensuse.patch: disable /var/lock/{subsys,lockdev} and
change default permissions on /var/lock (bnc#733523).
- Add garbage_collect_units: ensure error units are correctly
garbage collected (rhb#680122).
- Add crypt-loop-file.patch: add support for crypt file loop
(bnc#730496).
OBS-URL: https://build.opensuse.org/request/show/96123
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=228
77 lines
2.6 KiB
Diff
77 lines
2.6 KiB
Diff
Index: systemd-37/src/cryptsetup-generator.c
|
|
===================================================================
|
|
--- systemd-37.orig/src/cryptsetup-generator.c
|
|
+++ systemd-37/src/cryptsetup-generator.c
|
|
@@ -138,7 +138,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;
|
|
@@ -167,10 +167,50 @@ static int create_disk(
|
|
goto fail;
|
|
}
|
|
|
|
- if (!(d = unit_name_from_path(u, ".device"))) {
|
|
- r = -ENOMEM;
|
|
- log_error("Failed to allocate device name.");
|
|
- goto fail;
|
|
+ if (!startswith(device,"/dev/")) {
|
|
+
|
|
+ if (!(d = unit_name_build_escape("cryptsetup", name, ".path"))) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to allocate path name.");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ if (asprintf(&path_file, "%s/%s", arg_dest, d) < 0) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to allocate unit file name.");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ if (!(f = fopen(path_file, "wxe"))) {
|
|
+ r = -errno;
|
|
+ log_error("Failed to create unit file: %m");
|
|
+ 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 {
|
|
+
|
|
+ if (!(d = unit_name_from_path(u, ".device"))) {
|
|
+ r = -ENOMEM;
|
|
+ log_error("Failed to allocate device name.");
|
|
+ goto fail;
|
|
+ }
|
|
}
|
|
|
|
if (!(f = fopen(p, "wxe"))) {
|
|
@@ -300,6 +340,7 @@ fail:
|
|
free(n);
|
|
free(d);
|
|
free(e);
|
|
+ free(path_file);
|
|
|
|
free(from);
|
|
free(to);
|