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

core: fix require $XDG_RUNTIME_DIR

Browse source 
$ sudo dracut -f
  Trying to run as user instance, but $XDG_RUNTIME_DIR is not set.
  /usr/lib/dracut/modules.d/98systemd/module-setup.sh: line 10:
    ((: >= 198 : syntax error: operand expected (error token is ">= 198 ")
This commit is contained in:
Kay Sievers 2013-11-07 14:14:22 +01:00
parent 86198b2788
commit 8be28fb1e0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/core/main.c
View file

@ -1383,12 +1383,6 @@ int main(int argc, char *argv[]) {
goto finish;
}
if (arg_running_as == SYSTEMD_USER &&
!getenv("XDG_RUNTIME_DIR")) {
log_error("Trying to run as user instance, but $XDG_RUNTIME_DIR is not set.");
goto finish;
}
if (arg_running_as == SYSTEMD_SYSTEM &&
arg_action == ACTION_RUN &&
running_in_chroot() > 0) {
@ -1411,6 +1405,12 @@ int main(int argc, char *argv[]) {
goto finish;
}
if (arg_running_as == SYSTEMD_USER &&
!getenv("XDG_RUNTIME_DIR")) {
log_error("Trying to run as user instance, but $XDG_RUNTIME_DIR is not set.");
goto finish;
}
assert_se(arg_action == ACTION_RUN || arg_action == ACTION_TEST);
/* Close logging fds, in order not to confuse fdset below */