mirror of
https://github.com/troglobit/finit.git
synced 2026-11-09 16:21:24 +00:00
initctl: follow-up to 700c32fd, fix enable regression
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
e8170e1216
commit
9a6c68c952
1 file changed
+3
-1
+3
-1
@@ -273,7 +273,7 @@ int serv_enable(char *arg)
|
|||||||
ERR(73, "failed creating %s/enabled directory", finit_rcsd);
|
ERR(73, "failed creating %s/enabled directory", finit_rcsd);
|
||||||
|
|
||||||
len = snprintf(NULL, 0, "%s/available/%s", finit_rcsd, src);
|
len = snprintf(NULL, 0, "%s/available/%s", finit_rcsd, src);
|
||||||
arglen = snprintf(NULL, 0, "%s/enabled/%s", finit_rcsd, arg);
|
arglen = snprintf(NULL, 0, "%s/enabled/%s.conf", finit_rcsd, arg);
|
||||||
char argpath[arglen + 1], path[len + 1];
|
char argpath[arglen + 1], path[len + 1];
|
||||||
|
|
||||||
snprintf(path, sizeof(path), "%s/available/%s", finit_rcsd, src);
|
snprintf(path, sizeof(path), "%s/available/%s", finit_rcsd, src);
|
||||||
@@ -289,6 +289,8 @@ int serv_enable(char *arg)
|
|||||||
ERRX(72, "cannot find %s%s", ptr ? "template ": "", path);
|
ERRX(72, "cannot find %s%s", ptr ? "template ": "", path);
|
||||||
|
|
||||||
snprintf(argpath, sizeof(argpath), "%s/enabled/%s", finit_rcsd, arg);
|
snprintf(argpath, sizeof(argpath), "%s/enabled/%s", finit_rcsd, arg);
|
||||||
|
if (!strstr(argpath, ".conf"))
|
||||||
|
strlcat(argpath, ".conf", sizeof(argpath));
|
||||||
if (fexist(argpath))
|
if (fexist(argpath))
|
||||||
ERRX(noerr ? 0 : 1, "%s already enabled", arg);
|
ERRX(noerr ? 0 : 1, "%s already enabled", arg);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user