diff options
author | Martin Sivak <msivak@redhat.com> | 2013-01-16 16:53:26 +0100 |
---|---|---|
committer | Martin Sivak <msivak@redhat.com> | 2013-01-16 16:53:26 +0100 |
commit | 9724f70261c68d2a92cec43881c8ad803fef3d4c (patch) | |
tree | dbf1b1580c8e9e16c8d3abafc4e28b773866f49f /systemd | |
parent | 70c462614dcbe0e81ddc74ac2edb35b45771fd2b (diff) | |
download | firstboot2-9724f70261c68d2a92cec43881c8ad803fef3d4c.tar.gz firstboot2-9724f70261c68d2a92cec43881c8ad803fef3d4c.tar.xz firstboot2-9724f70261c68d2a92cec43881c8ad803fef3d4c.zip |
Update spec file, setup.py and add systemd service for xserver
Diffstat (limited to 'systemd')
-rw-r--r-- | systemd/inital-setup-graphical.service | 7 | ||||
-rw-r--r-- | systemd/inital-setup-text.service | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/systemd/inital-setup-graphical.service b/systemd/inital-setup-graphical.service index 4171a6c..2a28698 100644 --- a/systemd/inital-setup-graphical.service +++ b/systemd/inital-setup-graphical.service @@ -1,13 +1,14 @@ [Unit] -Description=Inital Setup configuration program (graphical mode) +Description=Inital Setup configuration program After=livesys.service plymouth-quit.service Before=display-manager.service getty@tty1.service -Conflicts=plymouth-quit.service +Conflicts=plymouth-quit.service inital-setup-text.service +PartOf=inital-setup-xserver.service [Service] Type=oneshot ExecStartPre=-/bin/plymouth quit -ExecStart=/usr/sbin/inital-setup +ExecStart=/usr/sbin/inital-setup --display=:9 ExecStartPost=/bin/systemctl disable inital-setup-graphical.service TimeoutSec=0 RemainAfterExit=yes diff --git a/systemd/inital-setup-text.service b/systemd/inital-setup-text.service index d6d5de6..dadb7a3 100644 --- a/systemd/inital-setup-text.service +++ b/systemd/inital-setup-text.service @@ -1,6 +1,7 @@ [Unit] Description=Inital Setup configuration program (text mode) After=livesys.service plymouth-quit.service +After=systemd-vconsole-setup.service Before=display-manager.service getty@tty1.service Conflicts=plymouth-quit.service @@ -14,4 +15,4 @@ RemainAfterExit=yes SysVStartPriority=99 [Install] -WantedBy=graphical.target #TODO +WantedBy=multi-user.target |