From 804f8e1729e7663c75a88fcf0997539442b891d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 21 Feb 2019 07:29:25 +0100 Subject: [PATCH] generator: rename systemd-mkfs@.service to systemd-makefs@.service The second name was used in documentation, and the first in the code that generated the unit. 'systemd-makefs' is the name we want, for example for consistency with the systemd-makefs executable. In principle this breaks compatibility, but in practice this is unlikely to be noticeable. Each instance of the unit is created by writing out a full definition, so the template was never defined. So the name could only be used for ordering, and there is not reason to order things against this unit from the outside: the ordering would rather be against the final mount unit. Fixes #11769. --- src/shared/generator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/generator.c b/src/shared/generator.c index b2085040f06..ed7f037e918 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -391,7 +391,7 @@ int generator_hook_up_mkfs( "Cannot format partition %s, filesystem type is not specified", node); - r = unit_name_from_path_instance("systemd-mkfs", node, ".service", &unit); + r = unit_name_from_path_instance("systemd-makefs", node, ".service", &unit); if (r < 0) return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m", node); @@ -417,7 +417,7 @@ int generator_hook_up_mkfs( "# Automatically generated by %s\n\n" "[Unit]\n" "Description=Make File System on %%f\n" - "Documentation=man:systemd-mkfs@.service(8)\n" + "Documentation=man:systemd-makefs@.service(8)\n" "DefaultDependencies=no\n" "BindsTo=%%i.device\n" "Conflicts=shutdown.target\n" -- 2.47.3