Merge pull request #10892 from mbiebl/revert-systemctl-runtime-unmask-breakage

Revert "systemctl: when removing enablement or mask symlinks, cover both /run and /etc
2018-12-12 14:23:04 +01:00
parent c108ee33bc 1830ac51a4
commit 9be3c60570
3 changed files with 98 additions and 91 deletions
@@ -7919,11 +7919,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                       "--wait may not be combined with --no-block.");

-        if (arg_runtime && STRPTR_IN_SET(argv[optind], "disable", "unmask", "preset", "preset-all"))
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "--runtime cannot be used with %s",
-                                       argv[optind]);
-
        return 1;
 }