packaging: Add default.target just like user has

Remove graphical.target as default boot target
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>

diff --git a/packaging/default.target b/packaging/default.target
new file mode 100644 (file)
index 0000000..0eb0a96
--- /dev/null
+++ b/packaging/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

diff --git a/packaging/default.target.ivi b/packaging/default.target.ivi
new file mode 100644 (file)
index 0000000..43727a8
--- /dev/null
+++ b/packaging/default.target.ivi
@@ -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=multi-user.target
+After=multi-user.target
+Conflicts=rescue.target
+AllowIsolate=yes

diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 5ff2a51..cecc69d 100644 (file)
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -13,6 +13,8 @@ Group:          Base/Startup
 Source0:        http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
 Source1:        pamconsole-tmp.conf
 Source2:        %{name}-rpmlintrc
+Source3:        default.target
+Source4:        default.target.ivi
 Source1001:     systemd.manifest
 BuildRequires:  gperf
 BuildRequires:  hwdata
@@ -216,7 +218,13 @@ 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
+rm -f %{buildroot}/%{_prefix}/lib/systemd/system/default.target
+install -m 755 -d %{buildroot}/%{_prefix}/lib/systemd/system
+%if "%{profile}" != "ivi"
+install -m 644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/system/
+%else
+install -m 644 %{SOURCE4} %{buildroot}/%{_prefix}/lib/systemd/system/default.target
+%endif
 
 rm -rf %{buildroot}/%{_docdir}/%{name}
 
@@ -260,8 +268,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
@@ -378,6 +384,7 @@ fi
 %{_prefix}/lib/systemd/user/busnames.target
 %exclude %{_prefix}/lib/systemd/network/80-container-ve.network
 %exclude %{_prefix}/lib/systemd/network/80-container-host0.network
+%{_prefix}/lib/systemd/user/default.target
 %{_prefix}/lib/systemd/network/99-default.link
 %exclude %{_prefix}/lib/systemd/system-preset/90-systemd.preset