diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-08-13 01:55:16 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-08-19 09:55:55 -0400 |
| commit | 0064dcc0fc1c6519d54c5a104990c1db94f19ddf (patch) | |
| tree | 96fdf1057252dceed05f5beeac6f59db869722d6 | |
| parent | 58a6dd15582c038a25bd7059435833943e2e4617 (diff) | |
units: synchronize Makefile and presets settings
Enable reboot.target and disable exit.target: the first is used on normal
machines, the second only in containers, and the more general one
should be enabled by default.
Also fix the Makefile to match what preset-all does.
With this and the previous commits, doing "make instal DESTDIR=…" followed
by "systemctl preset-all --root=…" doesn't result in any changes.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | system-preset/90-systemd.preset | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index d4e3e9a013..bc615bdc3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -634,6 +634,10 @@ EXTRA_DIST += \ units/rc-local.service.in \ units/halt-local.service.in +GENERAL_ALIASES += \ + $(systemunitdir)/reboot.target $(pkgsysconfdir)/system/ctrl-alt-del.target \ + $(systemunitdir)/machines.target $(pkgsysconfdir)/system/multi-user.target.wants/machines.target + # automake is broken and can't handle files with a dash in front # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8 units-install-hook: diff --git a/system-preset/90-systemd.preset b/system-preset/90-systemd.preset index 09f920a5f7..0f494b7552 100644 --- a/system-preset/90-systemd.preset +++ b/system-preset/90-systemd.preset @@ -24,8 +24,9 @@ disable debug-shell.service disable halt.target disable kexec.target disable poweroff.target -disable reboot.target +enable reboot.target disable rescue.target +disable exit.target disable syslog.socket |