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/dropin.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/shared/dropin.h (limited to 'src/shared/dropin.h') diff --git a/src/shared/dropin.h b/src/shared/dropin.h new file mode 100644 index 0000000000..2958632963 --- /dev/null +++ b/src/shared/dropin.h @@ -0,0 +1,31 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#pragma once + +/*** + This file is part of systemd. + + Copyright 2014 Zbigniew Jędrzejewski-Szmek + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see . +***/ + +int drop_in_file(const char *dir, const char *unit, + const char *name, char **_p, char **_q); + +int write_drop_in(const char *dir, const char *unit, + const char *name, const char *data); + +int write_drop_in_format(const char *dir, const char *unit, + const char *name, const char *format, ...); -- cgit v1.2.3-54-g00ecf