forked from pool/systemd
9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From a2ae516a25dafe41e0cd296ab7b5d022fa62b95f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Thu, 19 Jun 2014 22:02:55 -0400
|
|
Subject: [PATCH] getty-generator: properly escape instance names
|
|
|
|
Otherwise the add_symlink() function tries to make directories for
|
|
each slash even for the slash after the @ symbol in the final link
|
|
name, failing for /dev/3270/tty1.
|
|
|
|
Based on a patch by Werner Fink <werner@suse.de>.
|
|
---
|
|
src/getty-generator/getty-generator.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git src/getty-generator/getty-generator.c src/getty-generator/getty-generator.c
|
|
index 35cd858..7d4b546 100644
|
|
--- src/getty-generator/getty-generator.c
|
|
+++ src/getty-generator/getty-generator.c
|
|
@@ -67,7 +67,7 @@ static int add_serial_getty(const char *tty) {
|
|
|
|
log_debug("Automatically adding serial getty for /dev/%s.", tty);
|
|
|
|
- n = unit_name_replace_instance("serial-getty@.service", tty);
|
|
+ n = unit_name_from_path_instance("serial-getty", tty, ".service");
|
|
if (!n)
|
|
return log_oom();
|
|
|
|
@@ -81,7 +81,7 @@ static int add_container_getty(const char *tty) {
|
|
|
|
log_debug("Automatically adding container getty for /dev/pts/%s.", tty);
|
|
|
|
- n = unit_name_replace_instance("container-getty@.service", tty);
|
|
+ n = unit_name_from_path_instance("container-getty", tty, ".service");
|
|
if (!n)
|
|
return log_oom();
|
|
|
|
--
|
|
1.7.9.2
|
|
|