diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:38:51 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-17 02:38:51 -0500 |
| commit | b6d071f1df46eb841ba3f88cdb2b248eaf5f35f8 (patch) | |
| tree | e9136a6d96322d8c8fe52a4a234275d368be36eb | |
| parent | 3f0ba0278cd61b2d3bb01abc744d98a6ba3d7730 (diff) | |
| parent | 0064dcc0fc1c6519d54c5a104990c1db94f19ddf (diff) | |
Merge commit '0064dcc0fc1c6519d54c5a104990c1db94f19ddf' into notsystemd/premove
# Conflicts:
# system-preset/90-systemd.preset
| -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 2cffd44421..537207c6a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -719,6 +719,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 138937011c..07ef1e1bf6 100644 --- a/system-preset/90-systemd.preset +++ b/system-preset/90-systemd.preset @@ -20,5 +20,6 @@ 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 |