From 93f9856da8e2c08377daf5dd11a64b67e3c5f512 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 28 Feb 2021 12:12:03 +0100 Subject: [PATCH] initctl: ignore missing files to delete command, simplify yorn() str Signed-off-by: Joachim Wiberg --- src/serv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/serv.c b/src/serv.c index bd9bfa1d..6a09d6ad 100644 --- a/src/serv.c +++ b/src/serv.c @@ -352,10 +352,12 @@ int serv_delete(char *arg) if (!fn) errx(1, FINIT_RCSD " missing on system."); - if (!fexist(fn)) - errx(1, "Cannot find %s", fn); + if (!fexist(fn)) { + warnx(1, "Cannot find %s", fn); + return 1; + } - if (yorn("Remove %s and any enabled symlink (y/N)? ", fn)) { + if (yorn("Remove file and symlink(s) to %s (y/N)? ", fn)) { do_disable(arg, 0); remove(fn); }