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

systemctl: skip writing of utmp if we booted using systemd, under the assumption that systemd-update-utmp is used

Browse source
This commit is contained in:
Lennart Poettering 2010-08-14 19:14:52 +02:00
parent 36c32ba297
commit d90e1a301d
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fixme
View file

@ -1,7 +1,7 @@
* dot output for --test showing the 'initial transaction'
* check 'disable'
<Viking-Ice> "Warning: Unit file changed in disk, 'systemctl --system daemon-reload' recomended
<Viking-Ice> "Warning: Unit file changed in disk, 'systemctl --system daemon-reload' recommended
<kay> when does it do that?
<Viking-Ice> if you disable the service

1
src/fdset.c
View file

@ -144,7 +144,6 @@ finish:
set_free(MAKE_SET(s));
return r;
}
int fdset_cloexec(FDSet *fds, bool b) {

7
src/systemctl.c
View file

@ -4680,9 +4680,12 @@ static int halt_main(DBusConnection *bus) {
if (!arg_dry && !arg_immediate)
return start_with_fallback(bus);
if (!arg_no_wtmp)
if ((r = utmp_put_shutdown(0)) < 0)
if (!arg_no_wtmp) {
if (sd_booted() > 0)
log_debug("Not writing utmp record, assuming that systemd-update-utmp is used.");
else if ((r = utmp_put_shutdown(0)) < 0)
log_warning("Failed to write utmp record: %s", strerror(-r));
}
if (!arg_no_sync)
sync();