shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

generator: rename systemd-mkfs@.service to systemd-makefs@.service

Browse Source 
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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-02-21 07:29:25 +01:00 committed by Lennart Poettering
parent 56ee4d7001
commit 804f8e1729
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/generator.c
View File

@ -391,7 +391,7 @@ int generator_hook_up_mkfs(
"Cannot format partition %s, filesystem type is not specified", "Cannot format partition %s, filesystem type is not specified",
node); 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) if (r < 0)
return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m", return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m",
node); node);
@ -417,7 +417,7 @@ int generator_hook_up_mkfs(
"# Automatically generated by %s\n\n" "# Automatically generated by %s\n\n"
"[Unit]\n" "[Unit]\n"
"Description=Make File System on %%f\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" "DefaultDependencies=no\n"
"BindsTo=%%i.device\n" "BindsTo=%%i.device\n"
"Conflicts=shutdown.target\n" "Conflicts=shutdown.target\n"