X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Finstall.c;h=2d6316aa8fbb17034b9091b3cc0b7b248acec93b;hp=a05002d073e805ab1b11e3f693d07963fd47903c;hb=9d8a57fff160cc14873ebcbc79a4216a18b42f70;hpb=b4f10a5e8956d26f0bc6b9aef12846b57caee08b diff --git a/src/install.c b/src/install.c index a05002d07..2d6316aa8 100644 --- a/src/install.c +++ b/src/install.c @@ -24,6 +24,8 @@ #include #include #include +#include +#include #include "log.h" #include "path-lookup.h" @@ -35,6 +37,8 @@ #include "sd-daemon.h" static bool arg_force = false; +static bool arg_all = false; +static bool arg_verbose = false; static enum { WHERE_SYSTEM, @@ -46,6 +50,7 @@ static enum { ACTION_INVALID, ACTION_ENABLE, ACTION_DISABLE, + ACTION_REALIZE, ACTION_TEST } arg_action = ACTION_INVALID; @@ -65,7 +70,8 @@ typedef struct { char **wanted_by; } InstallInfo; -Hashmap *will_install = NULL, *have_installed = NULL; +static Hashmap *will_install = NULL, *have_installed = NULL; +static Set *remove_symlinks_to = NULL; static int help(void) { @@ -73,14 +79,19 @@ static int help(void) { "Install init system units.\n\n" " -h --help Show this help\n" " --force Override existing links\n" + " --verbose Show what is being done as it is done\n" " --system Install into system\n" " --session Install into session\n" " --global Install into all sessions\n" + " --all When disabling, remove all symlinks, not\n" + " just those listed in the [Install] section\n" " --realize[=MODE] Start/stop/restart unit after installation\n" " Takes 'no', 'minimal', 'maybe' or 'yes'\n\n" "Commands:\n" " enable [NAME...] Enable one or more units\n" " disable [NAME...] Disable one or more units\n" + " realize [NAME...] Test whether any of the specified units are enabled\n" + " and the start/stop/restart units accordingly\n" " test [NAME...] Test whether any of the specified units are enabled\n", program_invocation_short_name); @@ -94,7 +105,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_SYSTEM, ARG_GLOBAL, ARG_FORCE, - ARG_REALIZE + ARG_REALIZE, + ARG_ALL }; static const struct option options[] = { @@ -104,15 +116,18 @@ static int parse_argv(int argc, char *argv[]) { { "global", no_argument, NULL, ARG_GLOBAL }, { "force", no_argument, NULL, ARG_FORCE }, { "realize", optional_argument, NULL, ARG_REALIZE }, + { "all", no_argument, NULL, ARG_ALL }, + { "verbose", no_argument, NULL, 'v' }, { NULL, 0, NULL, 0 } }; int c; + bool realize_switch = false; assert(argc >= 1); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hv", options, NULL)) >= 0) { switch (c) { @@ -138,8 +153,10 @@ static int parse_argv(int argc, char *argv[]) { case ARG_REALIZE: + realize_switch = true; + if (!optarg) - arg_realize = REALIZE_MAYBE; + arg_realize = REALIZE_MINIMAL; else if (streq(optarg, "no")) arg_realize = REALIZE_NO; else if (streq(optarg, "minimal")) @@ -148,6 +165,8 @@ static int parse_argv(int argc, char *argv[]) { arg_realize = REALIZE_MAYBE; else if (streq(optarg, "yes")) arg_realize = REALIZE_YES; + else if (streq(optarg, "reload")) + arg_realize = REALIZE_RELOAD; else { log_error("Invalid --realize argument %s", optarg); return -EINVAL; @@ -155,6 +174,14 @@ static int parse_argv(int argc, char *argv[]) { break; + case ARG_ALL: + arg_all = true; + break; + + case 'v': + arg_verbose = true; + break; + case '?': return -EINVAL; @@ -175,7 +202,12 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_DISABLE; else if (streq(argv[optind], "test")) arg_action = ACTION_TEST; - else { + else if (streq(argv[optind], "realize")) { + arg_action = ACTION_REALIZE; + + if (!realize_switch) + arg_realize = REALIZE_MINIMAL; + } else { log_error("Unknown verb %s.", argv[optind]); return -EINVAL; } @@ -266,6 +298,9 @@ static int daemon_reload(DBusConnection *bus) { dbus_error_init(&error); + if (arg_verbose) + log_info("Reloading daemon configuration."); + if (!(m = dbus_message_new_method_call( "org.freedesktop.systemd1", "/org/freedesktop/systemd1", @@ -295,7 +330,7 @@ finish: return r; } -static int install_info_run(DBusConnection *bus, InstallInfo *i) { +static int install_info_run(DBusConnection *bus, InstallInfo *i, bool enabled) { DBusMessage *m = NULL, *reply = NULL; DBusError error; int r; @@ -306,7 +341,8 @@ static int install_info_run(DBusConnection *bus, InstallInfo *i) { dbus_error_init(&error); - if (arg_action == ACTION_ENABLE) { + if (arg_action == ACTION_ENABLE || + (arg_action == ACTION_REALIZE && enabled)) { if (arg_realize == REALIZE_MAYBE) { char **k; @@ -414,6 +450,9 @@ static int install_info_run(DBusConnection *bus, InstallInfo *i) { } } + if (arg_verbose) + log_info("Restarting %s.", i->name); + if (!(m = dbus_message_new_method_call( "org.freedesktop.systemd1", "/org/freedesktop/systemd1", @@ -434,7 +473,11 @@ static int install_info_run(DBusConnection *bus, InstallInfo *i) { } - } else if (arg_action == ACTION_DISABLE) { + } else if (arg_action == ACTION_DISABLE || + (arg_action == ACTION_REALIZE && !enabled)) { + + if (arg_verbose) + log_info("Stopping %s.", i->name); if (!(m = dbus_message_new_method_call( "org.freedesktop.systemd1", @@ -454,10 +497,11 @@ static int install_info_run(DBusConnection *bus, InstallInfo *i) { r = -ENOMEM; goto finish; } - } + } else + assert_not_reached("install_info_run() called but nothing to do?"); if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to reload configuration: %s", error.message); + log_error("Failed to realize unit: %s", error.message); r = -EIO; goto finish; } @@ -510,6 +554,184 @@ static int config_parse_also( return 0; } +static int mark_symlink_for_removal(const char *p) { + char *n; + int r; + + assert(p); + assert(path_is_absolute(p)); + + if (!remove_symlinks_to) + return 0; + + if (!(n = canonicalize_file_name(p))) + if (!(n = strdup(p))) + return -ENOMEM; + + path_kill_slashes(n); + + if ((r = set_put(remove_symlinks_to, n)) < 0) { + free(n); + return r; + } + + return 0; +} + +static int remove_marked_symlinks_fd(int fd, const char *config_path, const char *root, bool *deleted) { + int r = 0; + DIR *d; + struct dirent *de; + + assert(fd >= 0); + assert(root); + assert(deleted); + + if (!(d = fdopendir(fd))) + return -errno; + + rewinddir(d); + + while ((de = readdir(d))) { + bool is_dir = false, is_link = false; + + if (ignore_file(de->d_name)) + continue; + + if (de->d_type == DT_LNK) + is_link = true; + else if (de->d_type == DT_DIR) + is_dir = true; + else if (de->d_type == DT_UNKNOWN) { + struct stat st; + + if (fstatat(fd, de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0) { + log_error("Failed to stat %s/%s: %m", root, de->d_name); + + if (r == 0) + r = -errno; + continue; + } + + is_link = S_ISLNK(st.st_mode); + is_dir = S_ISDIR(st.st_mode); + } else + continue; + + if (is_dir) { + int nfd, q; + char *p; + + if ((nfd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) { + log_error("Failed to open %s/%s: %m", root, de->d_name); + + if (r == 0) + r = -errno; + continue; + } + + if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { + log_error("Failed to allocate directory string."); + close_nointr_nofail(nfd); + r = -ENOMEM; + break; + } + + q = remove_marked_symlinks_fd(nfd, config_path, p, deleted); + free(p); + close_nointr_nofail(nfd); + + if (r == 0) + q = r; + + } else if (is_link) { + char *p, *dest, *c; + int q; + + if (asprintf(&p, "%s/%s", root, de->d_name) < 0) { + log_error("Failed to allocate symlink string."); + r = -ENOMEM; + break; + } + + if ((q = readlink_and_make_absolute(p, &dest)) < 0) { + log_error("Cannot read symlink %s: %s", p, strerror(-q)); + free(p); + + if (r == 0) + r = q; + continue; + } + + if ((c = canonicalize_file_name(dest))) { + /* This might fail if the destination + * is already removed */ + + free(dest); + dest = c; + } + + path_kill_slashes(dest); + if (set_get(remove_symlinks_to, dest)) { + + if (arg_verbose) + log_info("rm '%s'", p); + + if (unlink(p) < 0) { + log_error("Cannot unlink symlink %s: %m", p); + + if (r == 0) + r = -errno; + } else { + rmdir_parents(p, config_path); + path_kill_slashes(p); + + if (!set_get(remove_symlinks_to, p)) { + + if ((r = mark_symlink_for_removal(p)) < 0) { + if (r == 0) + r = q; + } else + *deleted = true; + } + } + } + + free(p); + free(dest); + } + } + + return r; +} + +static int remove_marked_symlinks(const char *config_path) { + int fd, r = 0; + bool deleted; + + assert(config_path); + + if (set_size(remove_symlinks_to) <= 0) + return 0; + + if ((fd = open(config_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW)) < 0) + return -errno; + + do { + int q; + deleted = false; + + if ((q = remove_marked_symlinks_fd(fd, config_path, config_path, &deleted)) < 0) { + if (r == 0) + r = q; + } + } while (deleted); + + close_nointr_nofail(fd); + + return r; +} + static int create_symlink(const char *old_path, const char *new_path) { int r; @@ -554,6 +776,9 @@ static int create_symlink(const char *old_path, const char *new_path) { free(dest); unlink(new_path); + if (arg_verbose) + log_info("ln -s '%s' '%s'", old_path, new_path); + if (symlink(old_path, new_path) >= 0) return 0; @@ -563,6 +788,9 @@ static int create_symlink(const char *old_path, const char *new_path) { } else if (arg_action == ACTION_DISABLE) { char *dest; + if ((r = mark_symlink_for_removal(old_path)) < 0) + return r; + if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { if (errno == ENOENT) return 0; @@ -582,14 +810,22 @@ static int create_symlink(const char *old_path, const char *new_path) { return 0; } + free(dest); + + if ((r = mark_symlink_for_removal(new_path)) < 0) + return r; + + if (arg_verbose) + log_info("rm '%s'", new_path); + if (unlink(new_path) >= 0) return 0; log_error("Cannot unlink %s: %m", new_path); return -errno; - } else if (arg_action == ACTION_TEST) { + } else if (arg_action == ACTION_TEST || arg_action == ACTION_REALIZE) { char *dest; if ((r = readlink_and_make_absolute(new_path, &dest)) < 0) { @@ -706,22 +942,32 @@ static int install_info_apply(LookupPaths *paths, InstallInfo *i, const char *co assert(i); STRV_FOREACH(p, paths->unit_path) { + int fd; if (!(filename = path_make_absolute(i->name, *p))) { log_error("Out of memory"); return -ENOMEM; } - if ((f = fopen(filename, "re"))) - break; + /* Ensure that we don't follow symlinks */ + if ((fd = open(filename, O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NOCTTY)) >= 0) + if ((f = fdopen(fd, "re"))) + break; - free(filename); - filename = NULL; + if (errno == ELOOP) { + log_error("Refusing to operate on symlinks, please pass unit names or absolute paths to unit files."); + free(filename); + return -errno; + } if (errno != ENOENT) { log_error("Failed to open %s: %m", filename); + free(filename); return -errno; } + + free(filename); + filename = NULL; } if (!f) { @@ -744,6 +990,12 @@ static int install_info_apply(LookupPaths *paths, InstallInfo *i, const char *co if ((r = install_info_symlink_wants(i, config_path)) != 0) return r; + if ((r = mark_symlink_for_removal(filename)) < 0) + return r; + + if ((r = remove_marked_symlinks(config_path)) < 0) + return r; + return 0; } @@ -771,7 +1023,7 @@ static char *get_config_path(void) { } } -static int do_run(void) { +static int do_realize(bool enabled) { DBusConnection *bus = NULL; DBusError error; int r, q; @@ -788,13 +1040,13 @@ static int do_run(void) { return 0; } - if (arg_action != ACTION_ENABLE && arg_action != ACTION_DISABLE) { + if (arg_action == ACTION_TEST) { log_warning("Warning: --realize has no effect with test."); return 0; } if (arg_where == WHERE_SYSTEM && sd_booted() <= 0) { - log_info("systemd is not running, --realize has not effect."); + log_info("systemd is not running, --realize has no effect."); return 0; } @@ -810,13 +1062,13 @@ static int do_run(void) { r = 0; - if (arg_action == ACTION_ENABLE) + if (arg_action == ACTION_ENABLE || arg_action == ACTION_REALIZE) if ((r = daemon_reload(bus)) < 0) goto finish; if (arg_realize != REALIZE_RELOAD) { HASHMAP_FOREACH(j, have_installed, i) - if ((q = install_info_run(bus, j)) < 0) + if ((q = install_info_run(bus, j, enabled)) < 0) r = q; } @@ -825,8 +1077,10 @@ static int do_run(void) { r = q; finish: - if (bus) + if (bus) { + dbus_connection_close(bus); dbus_connection_unref(bus); + } dbus_error_free(&error); @@ -869,10 +1123,17 @@ int main(int argc, char *argv[]) { goto finish; } + if (arg_all) + if (!(remove_symlinks_to = set_new(string_hash_func, string_compare_func))) { + log_error("Failed to allocate symlink sets."); + goto finish; + } + for (j = optind; j < argc; j++) if ((r = install_info_add(argv[j])) < 0) goto finish; + while ((i = hashmap_first(will_install))) { assert_se(hashmap_move_one(have_installed, will_install, i->name) == 0); @@ -883,19 +1144,19 @@ int main(int argc, char *argv[]) { /* In test mode and found something */ retval = 0; - goto finish; + break; } } - if (do_run() < 0) + if (do_realize(!retval) < 0) goto finish; - retval = arg_action == ACTION_TEST ? 1 : 0; - finish: install_info_hashmap_free(will_install); install_info_hashmap_free(have_installed); + set_free_free(remove_symlinks_to); + lookup_paths_free(&paths); free(config_path);