From b43185abb474fb48c92367ad855ce12b9cd85b83 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko.korhonen@reekynet.com>
Date: Mon, 27 Apr 2020 09:49:01 +0300
Subject: [PATCH] Make the hook systemd compatible

---
 PKGBUILD                  | 26 +++++++++++++++++---------
 sd-welcomemessage.install | 11 +++++++++++
 usage.install             |  2 ++
 welcomemessage.hook       |  5 +++--
 welcomemessage.install    | 10 +++++-----
 welcomemessage.service    | 11 +++++++++++
 6 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 sd-welcomemessage.install
 create mode 100644 welcomemessage.service

diff --git a/PKGBUILD b/PKGBUILD
index c0170a9..46a4162 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,17 +10,25 @@ depends=(mkinitcpio)
 install="usage.install"
 backup=('etc/welcomemessage.conf')
 source=('welcomemessage.hook'
-        'welcomemessage.install'
+		'welcomemessage.install'
+		'sd-welcomemessage.install'
+		'welcomemessage.service'
         'welcomemessage.conf')
-md5sums=('178136ddc22bf41020bb8d002054aea0'
-         '79d4b4f282151004d6df31ac064e48f8'
+md5sums=('1450374618d2bb5fbc5daef3860bc714'
+         'e4246c99463e1b20bcd75da31f6e0895'
+         '3cb0d49c9cff46f4cf948c6325614fea'
+         '9ddc39f0c29cd05949c5fd3eeba3dda7'
          '7a08874d14bf2b7945ef638945550b83')
 
 package() {  
-  install -Dm 644 welcomemessage.hook \
-     "${pkgdir}/usr/lib/initcpio/hooks/welcomemessage"
-  install -Dm 644 welcomemessage.install \
-     "${pkgdir}/usr/lib/initcpio/install/welcomemessage"
-  install -Dm 644 welcomemessage.conf \
-     "${pkgdir}/etc/welcomemessage.conf"
+	install -Dm 644 welcomemessage.hook \
+	"${pkgdir}/usr/lib/initcpio/hooks/welcomemessage"
+	install -Dm 644 welcomemessage.install \
+	"${pkgdir}/usr/lib/initcpio/install/welcomemessage"
+	install -Dm 644 sd-welcomemessage.install \
+	"${pkgdir}/usr/lib/initcpio/install/sd-welcomemessage"
+	install -Dm 644 welcomemessage.conf \
+	"${pkgdir}/etc/welcomemessage.conf"
+	install -Dm 644 welcomemessage.service \
+	"${pkgdir}/usr/lib/systemd/system/welcomemessage.service"
 }
diff --git a/sd-welcomemessage.install b/sd-welcomemessage.install
new file mode 100644
index 0000000..b70e96e
--- /dev/null
+++ b/sd-welcomemessage.install
@@ -0,0 +1,11 @@
+# vim:ft=sh
+
+build() {
+	cat $(cat /etc/welcomemessage.conf | sed -n '/filename=/p' | sed 's/filename=//') > "$BUILDROOT/welcomemessage"
+	add_systemd_unit "welcomemessage.service"
+}
+help() {
+cat<<HELPEOF
+	This hook will print a welcome message before the encryption password is required
+HELPEOF
+}
diff --git a/usage.install b/usage.install
index 27216b3..b58489d 100644
--- a/usage.install
+++ b/usage.install
@@ -1,3 +1,5 @@
+# vim:ft=sh
+
 post_install() {
 	echo ""
   echo " This hook will print a welcome message before the encryption password is required."
diff --git a/welcomemessage.hook b/welcomemessage.hook
index befb57d..c51df72 100644
--- a/welcomemessage.hook
+++ b/welcomemessage.hook
@@ -1,4 +1,5 @@
-run_hook ()
-{
+# vim:ft=sh
+
+run_hook() {
     cat welcomemessage
 }
diff --git a/welcomemessage.install b/welcomemessage.install
index e622f0b..13f6335 100644
--- a/welcomemessage.install
+++ b/welcomemessage.install
@@ -1,11 +1,11 @@
-build ()
-{
+# vim:ft=sh
+
+build() {
     cat $(cat /etc/welcomemessage.conf | sed -n '/filename=/p' | sed 's/filename=//') > "$BUILDROOT/welcomemessage"
     add_runscript
 }
-help ()
-{
+help() {
 cat<<HELPEOF
   This hook will print a welcome message before the encryption password is required
 HELPEOF
-}
\ No newline at end of file
+}
diff --git a/welcomemessage.service b/welcomemessage.service
new file mode 100644
index 0000000..c4cdc94
--- /dev/null
+++ b/welcomemessage.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Print welcome message
+DefaultDependencies=no
+ConditionPathExists=/welcomemessage
+
+[Service]
+Type=oneshot
+ExecStart=cat /welcomemessage
+
+[Install]
+WantedBy=sysinit.target