  ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
  Type=forking
  KillMode=none
---
-2.1.4
+-- 
+2.7.4
+

+PartOf=resin-boot.service
 DefaultDependencies=no
 ConditionKernelCommandLine=!plymouth.enable=0

 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+Environment='CMDLINE=plymouth.ignore-serial-consoles splash'
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --tty=tty1 --mode=shutdown --attach-to-session --kernel-command-line=${CMDLINE}
 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
 Type=forking
--- a/systemd-units/plymouth-poweroff.service.in
+++ b/systemd-units/plymouth-poweroff.service.in
@@ -2,10 +2,12 @@

+PartOf=resin-boot.service
 DefaultDependencies=no
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session
+Environment='CMDLINE=plymouth.ignore-serial-consoles splash'
+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --tty=tty1 --mode=shutdown --attach-to-session --kernel-command-line=${CMDLINE}
 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
 Type=forking
diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in
index ddfb08f..5735ffb 100644
--- a/systemd-units/plymouth-start.service.in
+++ b/systemd-units/plymouth-start.service.in
@@ -1,13 +1,15 @@
 [Unit]
 Description=Show Plymouth Boot Screen
 DefaultDependencies=no
-Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service
-After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
+Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service systemd-udev-settle.service
+After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service systemd-udev-settle.service resin-boot.service
 Before=systemd-ask-password-plymouth.service
+Requires=resin-boot.service
 ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
+Environment='CMDLINE=plymouth.ignore-serial-consoles splash'
