picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tmpfiles: rename --unsafe to --boot 

As suggested by Kay, it is better to describe what is done,
not what might happen.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-12-30 13:00:38 -05:00
parent 8f8770706e
commit 8181565124
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd-tmpfiles.xml
View File

@ -147,7 +147,7 @@
removed.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--unsafe</option></term>
<term><option>--boot</option></term>
<listitem><para>Also execute lines
with an exclamation mark.
</para></listitem>

4
man/tmpfiles.d.xml
View File

@ -273,7 +273,7 @@ L /tmp/foobar - - - - /dev/null</programlisting>
execute at any time, e.g. on package upgrades.
<command>systemd-tmpfiles</command> will
execute line with an exclamation mark only if
option <option>--unsafe</option> is given.
option <option>--boot</option> is given.
</para>
<para>For example:
@ -286,7 +286,7 @@ r! /tmp/.X[0-9]*-lock
</programlisting>
The second line in contrast to the first one
would break a running system, and will only be
executed with <option>--unsafe</option>.</para>
executed with <option>--boot</option>.</para>
</refsect2>
<refsect2>

14
src/tmpfiles/tmpfiles.c
View File

@ -107,7 +107,7 @@ static Set *unix_sockets = NULL;
static bool arg_create = false;
static bool arg_clean = false;
static bool arg_remove = false;
static bool arg_unsafe = false;
static bool arg_boot = false;
static char **include_prefixes = NULL;
static char **exclude_prefixes = NULL;
@ -1104,7 +1104,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
if (strlen(action) > 2 || (strlen(action) > 1 && action[1] != '!')) {
log_error("[%s:%u] Unknown modifier '%s'", fname, line, action);
return -EINVAL;
} else if (strlen(action) > 1 && !arg_unsafe)
} else if (strlen(action) > 1 && !arg_boot)
return 0;
type = action[0];
@ -1280,7 +1280,7 @@ static int help(void) {
" --create Create marked files/directories\n"
" --clean Clean up marked directories\n"
" --remove Remove marked files/directories\n"
" --unsafe Execute actions only safe at boot\n"
" --boot Execute actions only safe at boot\n"
" --prefix=PATH Only apply rules that apply to paths with the specified prefix\n"
" --exclude-prefix=PATH Ignore rules that apply to paths with the specified prefix\n",
program_invocation_short_name);
@ -1295,7 +1295,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_CREATE,
ARG_CLEAN,
ARG_REMOVE,
ARG_UNSAFE,
ARG_BOOT,
ARG_PREFIX,
ARG_EXCLUDE_PREFIX,
};
@ -1306,7 +1306,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "create", no_argument, NULL, ARG_CREATE },
{ "clean", no_argument, NULL, ARG_CLEAN },
{ "remove", no_argument, NULL, ARG_REMOVE },
{ "unsafe", no_argument, NULL, ARG_UNSAFE },
{ "boot", no_argument, NULL, ARG_BOOT },
{ "prefix", required_argument, NULL, ARG_PREFIX },
{ "exclude-prefix", required_argument, NULL, ARG_EXCLUDE_PREFIX },
{}
@ -1341,8 +1341,8 @@ static int parse_argv(int argc, char *argv[]) {
arg_remove = true;
break;
case ARG_UNSAFE:
arg_unsafe = true;
case ARG_BOOT:
arg_boot = true;
break;
case ARG_PREFIX:

2
units/systemd-tmpfiles-setup.service.in
View File

@ -24,4 +24,4 @@ RefuseManualStop=yes
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --unsafe --exclude-prefix=/dev
ExecStart=@rootbindir@/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev