-Mon Sep 17 00:00:00 2001
-From: Theodor Gherzan <theodor@resin.io>
-Date: Thu, 17 Dec 2015 03:07:34 +0100
-Subject: plymouth: Systemd append
+From 86d1a1016b9ffa401c8596383183f97f53834e10 Mon Sep 17 00:00:00 2001
+From: Andrei Gherzan <andrei@resin.io>
+Date: Thu, 17 May 2018 13:03:25 +0100
+Subject: [PATCH] plymouth: systemd append
 
-Change systemd services in order to make the boot partition mount available
-and provide custom kernel command line.
+Change systemd services in order to make the boot partition mount available and
+provide custom kernel command line.
 
 Signed-off-by: Theodor Gherzan <theodor@resin.io>
+Signed-off-by: Andrei Gherzan <andrei@resin.io>
 ---
  systemd-units/plymouth-halt.service.in     | 4 +++-
  systemd-units/plymouth-kexec.service.in    | 4 +++-
  systemd-units/plymouth-poweroff.service.in | 4 +++-
  systemd-units/plymouth-reboot.service.in   | 4 +++-
- systemd-units/plymouth-start.service.in    | 6 ++++--
- 5 files changed, 16 insertions(+), 6 deletions(-)
+ systemd-units/plymouth-start.service.in    | 8 +++++---
+ 5 files changed, 17 insertions(+), 7 deletions(-)
 
+diff --git a/systemd-units/plymouth-halt.service.in b/systemd-units/plymouth-halt.service.in
+index 59a1912..bb977db 100644
 --- a/systemd-units/plymouth-halt.service.in
 +++ b/systemd-units/plymouth-halt.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
--- a/systemd-units/plymouth-poweroff.service.in
+++ b/systemd-units/plymouth-poweroff.service.in
@@ -2,10 +2,12 @@

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

