diff options
| author | Jonathan Bauer | 2021-05-06 14:32:01 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2021-05-06 14:32:01 +0200 |
| commit | 4394c02b3db8fe1fc03f0b738c986b5f0dbdf938 (patch) | |
| tree | 4118d1a74a4b322fc75231998bf132473a4abd3a | |
| parent | [slx-splash] initial support for splashtool (diff) | |
| download | systemd-init-4394c02b3db8fe1fc03f0b738c986b5f0dbdf938.tar.gz systemd-init-4394c02b3db8fe1fc03f0b738c986b5f0dbdf938.tar.xz systemd-init-4394c02b3db8fe1fc03f0b738c986b5f0dbdf938.zip | |
[slx-splash] inst_hook does not like <()
6 files changed, 16 insertions, 7 deletions
diff --git a/modules.d/slx-splash/module-setup.sh b/modules.d/slx-splash/module-setup.sh index 8cc0a50e..9f2abaaa 100755 --- a/modules.d/slx-splash/module-setup.sh +++ b/modules.d/slx-splash/module-setup.sh @@ -17,9 +17,9 @@ install() { inst_hook pre-pivot 00 "${moddir}/scripts/slx-splash-exam.sh" inst_hook pre-pivot 20 "${moddir}/scripts/restore-cursor.sh" - inst_hook pre-mount 00 <(sed 's/%ICON%/hdd/' "${moddir}/templates/splash.sh") - inst_hook pre-mount 99 <(sed 's/%ICON%/config/' "${moddir}/templates/splash.sh") - inst_hook pre-pivot 00 <(sed 's/%ICON%/rootfs/' "${moddir}/templates/splash.sh") - inst_hook pre-pivot 99 <(sed 's/%ICON%/puzzle/' "${moddir}/templates/splash.sh") + inst_hook pre-mount 00 "${moddir}/scripts/slx-splash-icon-hdd.sh" + inst_hook pre-mount 99 "${moddir}/scripts/slx-splash-icon-config.sh" + inst_hook pre-pivot 00 "${moddir}/scripts/slx-splash-icon-rootfs.sh" + inst_hook pre-pivot 99 "${moddir}/scripts/slx-splash-icon-puzzle.sh" # NOTE: network related stuff is in integrated in slx-network } diff --git a/modules.d/slx-splash/scripts/slx-splash-icon-config.sh b/modules.d/slx-splash/scripts/slx-splash-icon-config.sh new file mode 100644 index 00000000..de0b0c46 --- /dev/null +++ b/modules.d/slx-splash/scripts/slx-splash-icon-config.sh @@ -0,0 +1,3 @@ +#!/bin/ash + +splashtool --icon "/opt/openslx/icons/active/??-config.ppm" diff --git a/modules.d/slx-splash/scripts/slx-splash-icon-hdd.sh b/modules.d/slx-splash/scripts/slx-splash-icon-hdd.sh new file mode 100644 index 00000000..290aaf41 --- /dev/null +++ b/modules.d/slx-splash/scripts/slx-splash-icon-hdd.sh @@ -0,0 +1,3 @@ +#!/bin/ash + +splashtool --icon "/opt/openslx/icons/active/??-hdd.ppm" diff --git a/modules.d/slx-splash/scripts/slx-splash-icon-puzzle.sh b/modules.d/slx-splash/scripts/slx-splash-icon-puzzle.sh new file mode 100644 index 00000000..afa3e942 --- /dev/null +++ b/modules.d/slx-splash/scripts/slx-splash-icon-puzzle.sh @@ -0,0 +1,3 @@ +#!/bin/ash + +splashtool --icon "/opt/openslx/icons/active/??-puzzle.ppm" diff --git a/modules.d/slx-splash/scripts/slx-splash-icon-rootfs.sh b/modules.d/slx-splash/scripts/slx-splash-icon-rootfs.sh new file mode 100644 index 00000000..9decd3ac --- /dev/null +++ b/modules.d/slx-splash/scripts/slx-splash-icon-rootfs.sh @@ -0,0 +1,3 @@ +#!/bin/ash + +splashtool --icon "/opt/openslx/icons/active/??-rootfs.ppm" diff --git a/modules.d/slx-splash/templates/splash.sh b/modules.d/slx-splash/templates/splash.sh deleted file mode 100644 index ff14fa79..00000000 --- a/modules.d/slx-splash/templates/splash.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/ash - -splashtool --icon "/opt/openslx/icons/active/??-%ICON%.ppm" |