f2341e0a87
This changes log_unit_info() (and friends) to take a real Unit* object insted of just a unit name as parameter. The call will now prefix all logged messages with the unit name, thus allowing the unit name to be dropped from the various passed romat strings, simplifying invocations drastically, and unifying log output across messages. Also, UNIT= vs. USER_UNIT= is now derived from the Manager object attached to the Unit object, instead of getpid(). This has the benefit of correcting the field for --test runs. Also contains a couple of other logging improvements: - Drops a couple of strerror() invocations in favour of using %m. - Not only .mount units now warn if a symlinks exist for the mount point already, .automount units do that too, now. - A few invocations of log_struct() that didn't actually pass any additional structured data have been replaced by simpler invocations of log_unit_info() and friends. - For structured data a new LOG_UNIT_MESSAGE() macro has been added, that works like LOG_MESSAGE() but prefixes the message with the unit name. Similar, there's now LOG_LINK_MESSAGE() and LOG_NETDEV_MESSAGE(). - For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(), LOG_NETDEV_INTERFACE() macros have been added that generate the necessary per object fields. The old log_unit_struct() call has been removed in favour of these new macros used in raw log_struct() invocations. In addition to removing one more function call this allows generated structured log messages that contain two object fields, as necessary for example for network interfaces that are joined into another network interface, and whose messages shall be indexed by both. - The LOG_ERRNO() macro has been removed, in favour of log_struct_errno(). The latter has the benefit of ensuring that %m in format strings is properly resolved to the specified error number. - A number of logging messages have been converted to use log_unit_info() instead of log_info() - The client code in sysv-generator no longer #includes core code from src/core/. - log_unit_full_errno() has been removed, log_unit_full() instead takes an errno now, too. - log_unit_info(), log_link_info(), log_netdev_info() and friends, now avoid double evaluation of their parameters
134 lines
3.6 KiB
C
134 lines
3.6 KiB
C
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
|
|
|
#pragma once
|
|
|
|
/***
|
|
This file is part of systemd.
|
|
|
|
Copyright 2010 Lennart Poettering
|
|
|
|
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 <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
typedef struct Mount Mount;
|
|
|
|
#include "kill.h"
|
|
#include "execute.h"
|
|
|
|
typedef enum MountState {
|
|
MOUNT_DEAD,
|
|
MOUNT_MOUNTING, /* /bin/mount is running, but the mount is not done yet. */
|
|
MOUNT_MOUNTING_DONE, /* /bin/mount is running, and the mount is done. */
|
|
MOUNT_MOUNTED,
|
|
MOUNT_REMOUNTING,
|
|
MOUNT_UNMOUNTING,
|
|
MOUNT_MOUNTING_SIGTERM,
|
|
MOUNT_MOUNTING_SIGKILL,
|
|
MOUNT_REMOUNTING_SIGTERM,
|
|
MOUNT_REMOUNTING_SIGKILL,
|
|
MOUNT_UNMOUNTING_SIGTERM,
|
|
MOUNT_UNMOUNTING_SIGKILL,
|
|
MOUNT_FAILED,
|
|
_MOUNT_STATE_MAX,
|
|
_MOUNT_STATE_INVALID = -1
|
|
} MountState;
|
|
|
|
typedef enum MountExecCommand {
|
|
MOUNT_EXEC_MOUNT,
|
|
MOUNT_EXEC_UNMOUNT,
|
|
MOUNT_EXEC_REMOUNT,
|
|
_MOUNT_EXEC_COMMAND_MAX,
|
|
_MOUNT_EXEC_COMMAND_INVALID = -1
|
|
} MountExecCommand;
|
|
|
|
typedef enum MountResult {
|
|
MOUNT_SUCCESS,
|
|
MOUNT_FAILURE_RESOURCES,
|
|
MOUNT_FAILURE_TIMEOUT,
|
|
MOUNT_FAILURE_EXIT_CODE,
|
|
MOUNT_FAILURE_SIGNAL,
|
|
MOUNT_FAILURE_CORE_DUMP,
|
|
_MOUNT_RESULT_MAX,
|
|
_MOUNT_RESULT_INVALID = -1
|
|
} MountResult;
|
|
|
|
typedef struct MountParameters {
|
|
char *what;
|
|
char *options;
|
|
char *fstype;
|
|
} MountParameters;
|
|
|
|
struct Mount {
|
|
Unit meta;
|
|
|
|
char *where;
|
|
|
|
MountParameters parameters_proc_self_mountinfo;
|
|
MountParameters parameters_fragment;
|
|
|
|
bool from_proc_self_mountinfo:1;
|
|
bool from_fragment:1;
|
|
|
|
/* Used while looking for mount points that vanished or got
|
|
* added from/to /proc/self/mountinfo */
|
|
bool is_mounted:1;
|
|
bool just_mounted:1;
|
|
bool just_changed:1;
|
|
|
|
bool reset_cpu_usage:1;
|
|
|
|
bool sloppy_options;
|
|
|
|
MountResult result;
|
|
MountResult reload_result;
|
|
|
|
mode_t directory_mode;
|
|
|
|
usec_t timeout_usec;
|
|
|
|
ExecCommand exec_command[_MOUNT_EXEC_COMMAND_MAX];
|
|
|
|
ExecContext exec_context;
|
|
KillContext kill_context;
|
|
CGroupContext cgroup_context;
|
|
|
|
ExecRuntime *exec_runtime;
|
|
|
|
MountState state, deserialized_state;
|
|
|
|
ExecCommand* control_command;
|
|
MountExecCommand control_command_id;
|
|
pid_t control_pid;
|
|
|
|
sd_event_source *timer_event_source;
|
|
|
|
unsigned n_retry_umount;
|
|
};
|
|
|
|
extern const UnitVTable mount_vtable;
|
|
|
|
void mount_fd_event(Manager *m, int events);
|
|
|
|
const char* mount_state_to_string(MountState i) _const_;
|
|
MountState mount_state_from_string(const char *s) _pure_;
|
|
|
|
const char* mount_exec_command_to_string(MountExecCommand i) _const_;
|
|
MountExecCommand mount_exec_command_from_string(const char *s) _pure_;
|
|
|
|
const char* mount_result_to_string(MountResult i) _const_;
|
|
MountResult mount_result_from_string(const char *s) _pure_;
|
|
|
|
void unit_warn_if_dir_nonempty(Unit *u, const char* where);
|
|
int unit_fail_if_symlink(Unit *u, const char* where);
|