From 04b6f7c1a7ba7e7baef99b2b0db9842864c0ff82 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 3 May 2012 15:55:38 +0200 Subject: rc-local-generator: hook halt-local in based on generator too --- src/rc-local-generator/rc-local-generator.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/rc-local-generator') diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c index 42d7ae41ed..a5987f977e 100644 --- a/src/rc-local-generator/rc-local-generator.c +++ b/src/rc-local-generator/rc-local-generator.c @@ -29,21 +29,23 @@ #include "mkdir.h" #if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) -#define SCRIPT_PATH "/etc/rc.d/rc.local" +#define SCRIPT_PATH_START "/etc/rc.d/rc.local" #elif defined(TARGET_SUSE) -#define SCRIPT_PATH "/etc/init.d/boot.local" +#define SCRIPT_PATH_START "/etc/init.d/boot.local" #endif +#define SCRIPT_PATH_STOP "/sbin/halt.local" + const char *arg_dest = "/tmp"; -static int add_symlink(const char *service) { +static int add_symlink(const char *service, const char *where) { char *from = NULL, *to = NULL; int r; assert(service); asprintf(&from, SYSTEM_DATA_UNIT_PATH "/%s", service); - asprintf(&to, "%s/multi-user.target.wants/%s", arg_dest, service); + asprintf(&to, "%s/%s.wants/%s", arg_dest, where, service); if (!from || !to) { log_error("Out of memory"); @@ -96,12 +98,18 @@ int main(int argc, char *argv[]) { if (argc > 1) arg_dest = argv[1]; - if (file_is_executable(SCRIPT_PATH)) { + if (file_is_executable(SCRIPT_PATH_START)) { log_debug("Automatically adding rc-local.service."); - if (add_symlink("rc-local.service") < 0) + if (add_symlink("rc-local.service", "multi-user.target") < 0) r = EXIT_FAILURE; + } + if (file_is_executable(SCRIPT_PATH_STOP)) { + log_debug("Automatically adding halt-local.service."); + + if (add_symlink("halt-local.service", "final.target") < 0) + r = EXIT_FAILURE; } return r; -- cgit v1.2.3-54-g00ecf