From 2968644080fd103062f070e83edd620e0a58c44d Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 27 Jun 2014 12:12:07 -0400 Subject: Move x-systemd-device.timeout handling from core to fstab-generator Instead of adjusting job timeouts in the core, let fstab-generator write out a dropin snippet with the appropriate JobTimeout. x-systemd-device.timeout option is removed from Options= line in the generated unit. The functions to write dropins are moved from core/unit.c to shared/dropin.c, to make them available outside of core. generator.c is moved to libsystemd-label, because it now uses functions defined in dropin.c, which are in libsystemd-label. --- src/shared/generator.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/shared/generator.h') diff --git a/src/shared/generator.h b/src/shared/generator.h index 0140aa943f..64bd28f596 100644 --- a/src/shared/generator.h +++ b/src/shared/generator.h @@ -24,3 +24,6 @@ #include int generator_write_fsck_deps(FILE *f, const char *dest, const char *what, const char *where, const char *type); + +int generator_write_timeouts(const char *dir, const char *what, const char *where, + const char *opts, char **filtered); -- cgit v1.2.3-54-g00ecf