diff options
| author | Martin Sivak <msivak@redhat.com> | 2013-03-08 14:19:46 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2013-03-08 16:26:36 +0100 |
| commit | e2927e730fe7053b819ff09672de3d6043870862 (patch) | |
| tree | fbce30908b448b35ee96ba3451e416e6a266163f /systemd/initial-setup-graphical.service | |
| parent | 2fec10595bae9ca4ebf44ad2e80bd3521fa2244b (diff) | |
| download | firstboot2-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 'systemd/initial-setup-graphical.service')
| -rw-r--r-- | systemd/initial-setup-graphical.service | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/systemd/initial-setup-graphical.service b/systemd/initial-setup-graphical.service index da96359..1e1c82d 100644 --- a/systemd/initial-setup-graphical.service +++ b/systemd/initial-setup-graphical.service @@ -3,15 +3,14 @@ Description=Initial Setup configuration program After=livesys.service plymouth-quit.service Before=display-manager.service getty@tty1.service Conflicts=plymouth-quit.service initial-setup-text.service -PartOf=initial-setup-xserver.service [Service] Type=oneshot ExecStartPre=-/bin/plymouth quit -ExecStart=DISPLAY=:9 /usr/sbin/initial-setup -ExecStartPost=/bin/systemctl disable initial-setup-graphical.service +ExecStart=/bin/xinit /bin/firstboot-windowmanager /bin/initial-setup -- /bin/Xorg :9 -ac -nolisten tcp +ExecStartPost=/bin/systemctl disable initial-setup-graphical.service initial-setup-text.service TimeoutSec=0 -RemainAfterExit=yes +RemainAfterExit=no SysVStartPriority=99 [Install] |