diff options
| author | Martin Sivak <msivak@redhat.com> | 2013-03-26 17:44:22 +0100 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2013-03-26 17:44:22 +0100 |
| commit | d293abe606e4c35775ff9ed42444fa8385ae7b18 (patch) | |
| tree | 0b2cc5f800fdc4e00b84f5d3e3f515d5a35ed18a | |
| parent | c8ea48d502604c4e0801a4b8138d1e8e7095bf92 (diff) | |
| download | firstboot2-d293abe606e4c35775ff9ed42444fa8385ae7b18.tar.gz firstboot2-d293abe606e4c35775ff9ed42444fa8385ae7b18.tar.xz firstboot2-d293abe606e4c35775ff9ed42444fa8385ae7b18.zip | |
Systemd units improved
- both modes use plymouth-quit-wait service to ensure there is
no Plymouth running
- text mode sends signals to systemd to disable/enable status
messages printing (they corrupt the screen text and settings)
| -rw-r--r-- | systemd/initial-setup-graphical.service | 6 | ||||
| -rw-r--r-- | systemd/initial-setup-text.service | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/systemd/initial-setup-graphical.service b/systemd/initial-setup-graphical.service index 1e1c82d..d6d3f15 100644 --- a/systemd/initial-setup-graphical.service +++ b/systemd/initial-setup-graphical.service @@ -1,12 +1,12 @@ [Unit] Description=Initial Setup configuration program -After=livesys.service plymouth-quit.service +After=livesys.service plymouth-quit-wait.service Before=display-manager.service getty@tty1.service -Conflicts=plymouth-quit.service initial-setup-text.service +Conflicts=plymouth-quit-wait.service initial-setup-text.service [Service] Type=oneshot -ExecStartPre=-/bin/plymouth quit +ExecStartPre= 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 diff --git a/systemd/initial-setup-text.service b/systemd/initial-setup-text.service index c4bb298..7ed5b07 100644 --- a/systemd/initial-setup-text.service +++ b/systemd/initial-setup-text.service @@ -1,16 +1,17 @@ [Unit] Description=Initial Setup configuration program (text mode) -After=livesys.service plymouth-quit.service +After=livesys.service plymouth-quit-wait.service After=systemd-vconsole-setup.service Before=display-manager.service getty@tty1.service -Conflicts=plymouth-quit.service +Conflicts=plymouth-quit-wait.service Conflicts=initial-setup-graphical.service After=initial-setup-graphical.service [Service] Type=oneshot -ExecStartPre= +ExecStartPre=/bin/kill -55 1 ExecStart=/bin/initial-setup +ExecStartPost=/bin/kill -54 1 ExecStartPost=/bin/systemctl disable initial-setup-text.service initial-setup-graphical.service TimeoutSec=0 RemainAfterExit=yes |