mirror of
https://github.com/systemd/systemd.git
synced 2025-01-11 09:18:07 +03:00
condition: add ConditionPathIsSymbolicLink
This commit is contained in:
parent
8571962ca3
commit
0d60602c3b
@ -665,6 +665,7 @@
|
||||
<term><varname>ConditionPathExists=</varname></term>
|
||||
<term><varname>ConditionPathExistsGlob=</varname></term>
|
||||
<term><varname>ConditionPathIsDirectory=</varname></term>
|
||||
<term><varname>ConditionPathIsSymbolicLink=</varname></term>
|
||||
<term><varname>ConditionPathIsMountPoint=</varname></term>
|
||||
<term><varname>ConditionDirectoryNotEmpty=</varname></term>
|
||||
<term><varname>ConditionFileIsExecutable=</varname></term>
|
||||
@ -702,7 +703,12 @@
|
||||
<varname>ConditionPathExists=</varname>
|
||||
but verifies whether a certain path
|
||||
exists and is a
|
||||
directory. <varname>ConditionPathIsMountPoint=</varname>
|
||||
directory. <varname>ConditionPathIsSymbolicLink=</varname>
|
||||
is similar to
|
||||
<varname>ConditionPathExists=</varname>
|
||||
but verifies whether a certain path
|
||||
exists and is a
|
||||
symbolic link. <varname>ConditionPathIsMountPoint=</varname>
|
||||
is similar to
|
||||
<varname>ConditionPathExists=</varname>
|
||||
but verifies whether a certain path
|
||||
@ -780,8 +786,9 @@
|
||||
prefix an argument with the pipe
|
||||
symbol and an exclamation mark the
|
||||
pipe symbol must be passed first, the
|
||||
exclamation second. All path checks
|
||||
follow symlinks.</para></listitem>
|
||||
exclamation second. Except for
|
||||
<varname>ConditionPathIsSymbolicLink=</varname>,
|
||||
all path checks follow symlinks.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
|
@ -167,6 +167,14 @@ bool condition_test(Condition *c) {
|
||||
return S_ISDIR(st.st_mode) == !c->negate;
|
||||
}
|
||||
|
||||
case CONDITION_PATH_IS_SYMBOLIC_LINK: {
|
||||
struct stat st;
|
||||
|
||||
if (lstat(c->parameter, &st) < 0)
|
||||
return !c->negate;
|
||||
return S_ISLNK(st.st_mode) == !c->negate;
|
||||
}
|
||||
|
||||
case CONDITION_PATH_IS_MOUNT_POINT:
|
||||
return (path_is_mount_point(c->parameter, true) > 0) == !c->negate;
|
||||
|
||||
@ -256,6 +264,7 @@ static const char* const condition_type_table[_CONDITION_TYPE_MAX] = {
|
||||
[CONDITION_PATH_EXISTS] = "ConditionPathExists",
|
||||
[CONDITION_PATH_EXISTS_GLOB] = "ConditionPathExistsGlob",
|
||||
[CONDITION_PATH_IS_DIRECTORY] = "ConditionPathIsDirectory",
|
||||
[CONDITION_PATH_IS_SYMBOLIC_LINK] = "ConditionPathIsSymbolicLink",
|
||||
[CONDITION_PATH_IS_MOUNT_POINT] = "ConditionPathIsMountPoint",
|
||||
[CONDITION_DIRECTORY_NOT_EMPTY] = "ConditionDirectoryNotEmpty",
|
||||
[CONDITION_KERNEL_COMMAND_LINE] = "ConditionKernelCommandLine",
|
||||
|
@ -30,6 +30,7 @@ typedef enum ConditionType {
|
||||
CONDITION_PATH_EXISTS,
|
||||
CONDITION_PATH_EXISTS_GLOB,
|
||||
CONDITION_PATH_IS_DIRECTORY,
|
||||
CONDITION_PATH_IS_SYMBOLIC_LINK,
|
||||
CONDITION_PATH_IS_MOUNT_POINT,
|
||||
CONDITION_DIRECTORY_NOT_EMPTY,
|
||||
CONDITION_FILE_IS_EXECUTABLE,
|
||||
|
@ -112,6 +112,7 @@ Unit.JobTimeoutSec, config_parse_usec, 0,
|
||||
Unit.ConditionPathExists, config_parse_unit_condition_path, CONDITION_PATH_EXISTS, 0
|
||||
Unit.ConditionPathExistsGlob, config_parse_unit_condition_path, CONDITION_PATH_EXISTS_GLOB, 0
|
||||
Unit.ConditionPathIsDirectory, config_parse_unit_condition_path, CONDITION_PATH_IS_DIRECTORY, 0
|
||||
Unit.ConditionPathIsSymbolicLink,config_parse_unit_condition_path, CONDITION_PATH_IS_SYMBOLIC_LINK,0
|
||||
Unit.ConditionPathIsMountPoint, config_parse_unit_condition_path, CONDITION_PATH_IS_MOUNT_POINT, 0
|
||||
Unit.ConditionDirectoryNotEmpty, config_parse_unit_condition_path, CONDITION_DIRECTORY_NOT_EMPTY, 0
|
||||
Unit.ConditionFileIsExecutable, config_parse_unit_condition_path, CONDITION_FILE_IS_EXECUTABLE, 0
|
||||
|
@ -10,6 +10,7 @@ Description=Lock Directory
|
||||
Before=local-fs.target
|
||||
# skip mounting if the directory does not exist or is a symlink
|
||||
ConditionPathIsDirectory=/var/lock
|
||||
ConditionPathIsSymbolicLink=!/var/lock
|
||||
|
||||
[Mount]
|
||||
What=/run/lock
|
||||
|
@ -10,6 +10,7 @@ Description=Runtime Directory
|
||||
Before=local-fs.target
|
||||
# skip mounting if the directory does not exist or is a symlink
|
||||
ConditionPathIsDirectory=/var/run
|
||||
ConditionPathIsSymbolicLink=!/var/run
|
||||
|
||||
[Mount]
|
||||
What=/run
|
||||
|
Loading…
Reference in New Issue
Block a user