From 1376386fc63a246772c7c4ea04f76ce28b2306fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= 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 . (cherry picked from commit a2ae516a25dafe41e0cd296ab7b5d022fa62b95f) (cherry picked from commit 98023e096875cde4662a62e862279f8685d166fd) Conflicts: src/getty-generator/getty-generator.c --- src/getty-generator/getty-generator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c index 625a87e..2f790b8 100644 --- a/src/getty-generator/getty-generator.c +++ b/src/getty-generator/getty-generator.c @@ -77,7 +77,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();