2b583ce657
Instead of the /dev/.run trick we have currently implemented, we decided
to move the early-boot runtime dir to /run.
An existing /var/run directory is bind-mounted to /run. If /var/run is
already a symlink, no action is taken.
An existing /var/lock directory is bind-mounted to /run/lock.
If /var/lock is already a symlink, no action is taken.
To implement the directory vs. symlink logic, we have a:
ConditionPathIsDirectory=
now, which is used in the mount units.
Skipped mount unit in case of symlink:
$ systemctl status var-run.mount
var-run.mount - Runtime Directory
Loaded: loaded (/lib/systemd/system/var-run.mount)
Active: inactive (dead)
start condition failed at Fri, 25 Mar 2011 04:51:41 +0100; 6min ago
Where: /var/run
What: /run
CGroup: name=systemd:/system/var-run.mount
The systemd rpm needs to make sure to add something like:
%pre
mkdir -p -m0755 /run >/dev/null 2>&1 || :
or it needs to be added to filesystem.rpm.
Udev -git already uses /run if that exists, and is writable at bootup.
Otherwise it falls back to the current /dev/.udev.
Dracut and plymouth need to be adopted to switch from /dev/.run to run
too.
Cheers,
Kay
64 lines
1.8 KiB
C
64 lines
1.8 KiB
C
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
|
|
|
#ifndef fooconditionhfoo
|
|
#define fooconditionhfoo
|
|
|
|
/***
|
|
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 General Public License as published by
|
|
the Free Software Foundation; either version 2 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
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include "list.h"
|
|
|
|
typedef enum ConditionType {
|
|
CONDITION_PATH_EXISTS,
|
|
CONDITION_PATH_IS_DIRECTORY,
|
|
CONDITION_DIRECTORY_NOT_EMPTY,
|
|
CONDITION_KERNEL_COMMAND_LINE,
|
|
CONDITION_VIRTUALIZATION,
|
|
CONDITION_NULL,
|
|
_CONDITION_TYPE_MAX,
|
|
_CONDITION_TYPE_INVALID = -1
|
|
} ConditionType;
|
|
|
|
typedef struct Condition {
|
|
ConditionType type;
|
|
char *parameter;
|
|
|
|
bool trigger:1;
|
|
bool negate:1;
|
|
|
|
LIST_FIELDS(struct Condition, conditions);
|
|
} Condition;
|
|
|
|
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate);
|
|
void condition_free(Condition *c);
|
|
void condition_free_list(Condition *c);
|
|
|
|
bool condition_test(Condition *c);
|
|
bool condition_test_list(Condition *c);
|
|
|
|
void condition_dump(Condition *c, FILE *f, const char *prefix);
|
|
void condition_dump_list(Condition *c, FILE *f, const char *prefix);
|
|
|
|
const char* condition_type_to_string(ConditionType t);
|
|
int condition_type_from_string(const char *s);
|
|
|
|
#endif
|