diff options
| author | Jussi Laako <jussi.laako@linux.intel.com> | 2014-11-05 18:02:38 +0200 |
|---|---|---|
| committer | Jussi Laako <jussi.laako@linux.intel.com> | 2014-11-26 19:04:31 +0200 |
| commit | 090ec34266495bac905b317cb4742c6a3e928e46 (patch) | |
| tree | 71087299f34f4119d80156d2f21078c71644e626 | |
| parent | 946095230fe92a254df7795c14fac4910df094a2 (diff) | |
| download | systemd-sandbox/jlaako/multiseat.tar.gz systemd-sandbox/jlaako/multiseat.tar.bz2 systemd-sandbox/jlaako/multiseat.zip | |
Remove graphical.target as default boot targetsandbox/jlaako/multiseat
and replace it with a real default.target that
will Require either multi-user.target or some
other previously final target. This allows proper
use of default.target.wants.
Change-Id: Ic0a3083dff6b3d398d3fccffcedcba2e30809f87
Signed-off-by: Jussi Laako <jussi.laako@linux.intel.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/systemd.spec | 7 | ||||
| -rw-r--r-- | units/default.target | 14 |
3 files changed, 19 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index c43403adc1..850fe23704 100644 --- a/Makefile.am +++ b/Makefile.am @@ -392,6 +392,7 @@ dist_sysctl_DATA = \ sysctl.d/50-default.conf dist_systemunit_DATA = \ + units/default.target \ units/graphical.target \ units/multi-user.target \ units/emergency.service \ @@ -4949,7 +4950,6 @@ SYSTEM_UNIT_ALIASES += \ endif SYSTEM_UNIT_ALIASES += \ - graphical.target default.target \ reboot.target ctrl-alt-del.target \ getty@.service autovt@.service diff --git a/packaging/systemd.spec b/packaging/systemd.spec index df3afd36b9..9aa404a670 100644 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -208,7 +208,9 @@ install -Dm644 tmpfiles.d/legacy.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/lega install -m644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/ -rm -rf %{buildroot}/%{_prefix}/lib/systemd/user/default.target +%if "%{profile}" == "ivi" +sed -i "/^Requires=/s/=.*/=multi-user.target/" %{buildroot}/%{_prefix}/lib/systemd/system/default.target +%endif rm -rf %{buildroot}/%{_docdir}/%{name} @@ -247,8 +249,6 @@ if [ $1 -eq 0 ] ; then remote-fs.target \ systemd-readahead-replay.service \ systemd-readahead-collect.service >/dev/null 2>&1 || : - - /usr/bin/rm -f /etc/systemd/system/default.target >/dev/null 2>&1 || : fi %post -n libsystemd -p /sbin/ldconfig @@ -363,6 +363,7 @@ fi %{_prefix}/lib/systemd/user/smartcard.target %{_prefix}/lib/systemd/user/timers.target %{_prefix}/lib/systemd/user/busnames.target +%{_prefix}/lib/systemd/user/default.target %{_prefix}/lib/systemd/network/80-container-host0.network %{_prefix}/lib/systemd/network/99-default.link diff --git a/units/default.target b/units/default.target new file mode 100644 index 0000000000..0eb0a96a66 --- /dev/null +++ b/units/default.target @@ -0,0 +1,14 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Default target +Documentation=man:systemd.special(7) +Requires=graphical.target +After=multi-user.target +Conflicts=rescue.target +AllowIsolate=yes |