diff options
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | install/archlogo | 3 | ||||
-rw-r--r-- | systemd/archlogo | 4 | ||||
-rw-r--r-- | systemd/archlogo.service | 4 |
4 files changed, 12 insertions, 8 deletions
@@ -1,17 +1,18 @@ # Makefile for mkinitcpio-archlogo -VERSION=0.3.0 +VERSION=0.3.1 all: @echo "Just run make install..." .PHONY: install install: - # install install script and unit file - install -D -m0644 install/archlogo $(DESTDIR)/usr/lib/initcpio/install/archlogo + # install script and unit file + install -D -m0755 systemd/archlogo $(DESTDIR)/usr/lib/systemd/scripts/archlogo install -D -m0644 systemd/archlogo.service $(DESTDIR)/usr/lib/systemd/system/archlogo.service - # install hook for plain old script based initramfs + # install install-script and hook for plain old script based initramfs + install -D -m0644 install/archlogo $(DESTDIR)/usr/lib/initcpio/install/archlogo install -D -m0755 hook/archlogo $(DESTDIR)/usr/lib/initcpio/hooks/archlogo # install config diff --git a/install/archlogo b/install/archlogo index a84e32a..40768b6 100644 --- a/install/archlogo +++ b/install/archlogo @@ -4,7 +4,8 @@ build() { source /etc/archlogo.conf add_file /etc/archlogo.conf add_file "/usr/share/archlogo/${ARCHLOGO}" - if add_systemd_unit archlogo.service 2>/dev/null; then + if command -v add_systemd_unit >/dev/null; then + add_systemd_unit "archlogo.service" add_symlink "/usr/lib/systemd/system/sysinit.target.wants/archlogo.service" "../archlogo.service" else add_runscript diff --git a/systemd/archlogo b/systemd/archlogo new file mode 100644 index 0000000..1c05ab7 --- /dev/null +++ b/systemd/archlogo @@ -0,0 +1,4 @@ +#!/bin/sh + +source /etc/archlogo.conf +cat /usr/share/archlogo/"${ARCHLOGO}" diff --git a/systemd/archlogo.service b/systemd/archlogo.service index 60ace62..dc46573 100644 --- a/systemd/archlogo.service +++ b/systemd/archlogo.service @@ -7,6 +7,4 @@ Before=sysinit.target systemd-ask-password-console.service Type=oneshot RemainAfterExit=yes StandardOutput=tty -EnvironmentFile=/etc/archlogo.conf -WorkingDirectory=/usr/share/archlogo -ExecStart=/usr/bin/cat "${ARCHLOGO}" +ExecStart=/usr/lib/systemd/scripts/archlogo |