summaryrefslogtreecommitdiffstats
path: root/initial-setup.spec
diff options
context:
space:
mode:
authorMartin Sivak <msivak@redhat.com>2013-03-08 14:19:46 +0100
committerMartin Sivak <msivak@redhat.com>2013-03-08 16:26:36 +0100
commite2927e730fe7053b819ff09672de3d6043870862 (patch)
treefbce30908b448b35ee96ba3451e416e6a266163f /initial-setup.spec
parent2fec10595bae9ca4ebf44ad2e80bd3521fa2244b (diff)
downloadfirstboot2-e2927e730fe7053b819ff09672de3d6043870862.tar.gz
firstboot2-e2927e730fe7053b819ff09672de3d6043870862.tar.xz
firstboot2-e2927e730fe7053b819ff09672de3d6043870862.zip
Fix graphical and text systemd target
- the xserver unit approach worked (after some patch fixes), but still had one serious issue. The graphical unit (initial-setup) started before Xserver was fully initialized... - this update starts the initial-setup process inside the xinit session and thus ensures that the Xserver is initialized by the time initial-setup tests the DISPLAY variable - text target was configured to conflict with graphical and to have it's stdout and stdin routed to terminal
Diffstat (limited to 'initial-setup.spec')
-rw-r--r--initial-setup.spec4
1 files changed, 0 insertions, 4 deletions
diff --git a/initial-setup.spec b/initial-setup.spec
index 1d844b4..ab8fcc9 100644
--- a/initial-setup.spec
+++ b/initial-setup.spec
@@ -66,19 +66,16 @@ if [ $1 -ne 2 -a ! -f /etc/sysconfig/initial-setup ]; then
else
%systemd_post initial-setup-graphical.service
%systemd_post initial-setup-text.service
- %systemd_post initial-setup-xserver.service
fi
fi
%preun
%systemd_preun initial-setup-graphical.service
%systemd_preun initial-setup-text.service
-%systemd_preun initial-setup-xserver.service
%postun
%systemd_postun_with_restart initial-setup-graphical.service
%systemd_postun_with_restart initial-setup-text.service
-%systemd_postun_with_restart initial-setup-xserver.service
%files -f %{name}.lang
%doc COPYING README
@@ -91,7 +88,6 @@ fi
%{_unitdir}/initial-setup-graphical.service
%{_unitdir}/initial-setup-text.service
-%{_unitdir}/initial-setup-xserver.service
%ifarch s390 s390x
%{_sysconfdir}/profile.d/initial-setup.sh