wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-05 07:13:44 +07:00
Code Issues Packages Projects Releases Wiki Activity

initctl: skip errors from disable while deleting services

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2021-02-28 11:51:37 +01:00
parent 928110b19e
commit c5db989bed
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serv.c
+9 -4
View File
@@ -190,7 +190,7 @@ int serv_enable(char *arg)
return symlink(path, arg) != 0;
}
int serv_disable(char *arg)
int do_disable(char *arg, int check)
{
struct stat st;
char corr[40];
@@ -209,15 +209,20 @@ int serv_disable(char *arg)
err(1, "failed cd %s", FINIT_RCSD);
chdir("enabled"); /* System *may* have enabled/ dir. */
if (stat(arg, &st))
if (check && stat(arg, &st))
errx(1, "%s not (an) enabled (service).", arg);
if ((st.st_mode & S_IFMT) == S_IFLNK)
if (check && (st.st_mode & S_IFMT) == S_IFLNK)
errx(1, "cannot disable %s, not a symlink.", arg);
return remove(arg) != 0;
}
int serv_disable(char *arg)
{
return do_disable(arg, 1);
}
int serv_touch(char *arg)
{
char path[256];
@@ -351,7 +356,7 @@ int serv_delete(char *arg)
errx(1, "Cannot find %s", fn);
if (yorn("Remove %s and any enabled symlink (y/N)? ", fn)) {
serv_disable(arg);
do_disable(arg, 0);
remove(fn);
}