diff options
Diffstat (limited to 'src/shared/generator.c')
| -rw-r--r-- | src/shared/generator.c | 97 |
1 files changed, 77 insertions, 20 deletions
diff --git a/src/shared/generator.c b/src/shared/generator.c index 7f16d5cbef..807569a1b8 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -19,7 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <string.h> #include <unistd.h> #include "util.h" @@ -29,17 +28,63 @@ #include "generator.h" #include "path-util.h" #include "fstab-util.h" +#include "fileio.h" #include "dropin.h" +static int write_fsck_sysroot_service(const char *dir, const char *what) { + const char *unit; + _cleanup_free_ char *device = NULL; + _cleanup_fclose_ FILE *f = NULL; + int r; + + unit = strjoina(dir, "/systemd-fsck-root.service"); + log_debug("Creating %s", unit); + + r = unit_name_from_path(what, ".device", &device); + if (r < 0) + return log_error_errno(r, "Failed to convert device \"%s\" to unit name: %m", what); + + f = fopen(unit, "wxe"); + if (!f) + return log_error_errno(errno, "Failed to create unit file %s: %m", unit); + + fprintf(f, + "# Automatically generated by %1$s\n\n" + "[Unit]\n" + "Documentation=man:systemd-fsck-root.service(8)\n" + "Description=File System Check on %2$s\n" + "DefaultDependencies=no\n" + "BindsTo=%3$s\n" + "After=%3$s\n" + "Before=shutdown.target\n" + "\n" + "[Service]\n" + "Type=oneshot\n" + "RemainAfterExit=yes\n" + "ExecStart=" SYSTEMD_FSCK_PATH " %2$s\n" + "TimeoutSec=0\n", + program_invocation_short_name, + what, + device); + + r = fflush_and_check(f); + if (r < 0) + return log_error_errno(r, "Failed to write unit file %s: %m", unit); + + return 0; +} + int generator_write_fsck_deps( FILE *f, - const char *dest, + const char *dir, const char *what, const char *where, const char *fstype) { + int r; + assert(f); - assert(dest); + assert(dir); assert(what); assert(where); @@ -49,7 +94,6 @@ int generator_write_fsck_deps( } if (!isempty(fstype) && !streq(fstype, "auto")) { - int r; r = fsck_exists(fstype); if (r == -ENOENT) { /* treat missing check as essentially OK */ @@ -59,34 +103,48 @@ int generator_write_fsck_deps( return log_warning_errno(r, "Checking was requested for %s, but fsck.%s cannot be used: %m", what, fstype); } - if (streq(where, "/")) { + if (path_equal(where, "/")) { char *lnk; - lnk = strjoina(dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service"); + lnk = strjoina(dir, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service"); mkdir_parents(lnk, 0755); if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-fsck-root.service", lnk) < 0) return log_error_errno(errno, "Failed to create symlink %s: %m", lnk); } else { - _cleanup_free_ char *fsck = NULL; + _cleanup_free_ char *_fsck = NULL; + const char *fsck; + + if (in_initrd() && path_equal(where, "/sysroot")) { + r = write_fsck_sysroot_service(dir, what); + if (r < 0) + return r; + + fsck = "systemd-fsck-root.service"; + } else { + r = unit_name_from_path_instance("systemd-fsck", what, ".service", &_fsck); + if (r < 0) + return log_error_errno(r, "Failed to create fsck service name: %m"); - fsck = unit_name_from_path_instance("systemd-fsck", what, ".service"); - if (!fsck) - return log_oom(); + fsck = _fsck; + } fprintf(f, - "RequiresOverridable=%s\n" - "After=%s\n", - fsck, + "RequiresOverridable=%1$s\n" + "After=%1$s\n", fsck); } return 0; } -int generator_write_timeouts(const char *dir, const char *what, const char *where, - const char *opts, char **filtered) { +int generator_write_timeouts( + const char *dir, + const char *what, + const char *where, + const char *opts, + char **filtered) { /* Allow configuration how long we wait for a device that * backs a mount point to show up. This is useful to support @@ -104,8 +162,7 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher r = parse_sec(timeout, &u); if (r < 0) { - log_warning("Failed to parse timeout for %s, ignoring: %s", - where, timeout); + log_warning("Failed to parse timeout for %s, ignoring: %s", where, timeout); return 0; } @@ -113,9 +170,9 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher if (!node) return log_oom(); - unit = unit_name_from_path(node, ".device"); - if (!unit) - return log_oom(); + r = unit_name_from_path(node, ".device", &unit); + if (r < 0) + return log_error_errno(r, "Failed to make unit name from path: %m"); return write_drop_in_format(dir, unit, 50, "device-timeout", "# Automatically generated by %s\n\n" |