From be9ebd799584090c1d3a1c88b7a7d6ccf2cc6f17 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 16 Feb 2024 16:41:58 +0100 Subject: [slx-splash] Use exit not return now that it's standalone --- modules.d/slx-splash/hooks/s3-splash-stage4.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules.d/slx-splash/hooks/s3-splash-stage4.sh b/modules.d/slx-splash/hooks/s3-splash-stage4.sh index b88a6a90..9ec3659e 100755 --- a/modules.d/slx-splash/hooks/s3-splash-stage4.sh +++ b/modules.d/slx-splash/hooks/s3-splash-stage4.sh @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/ash -grep -qw 'splash' "/proc/cmdline" || return 0 +grep -qw 'splash' "/proc/cmdline" || exit 0 # Set option that we want splash @@ -11,9 +11,9 @@ echo "SLX_SPLASH='yes'" >> "$NEWROOT/opt/openslx/config" # is restored when starting gettys. mkdir -p "$NEWROOT/etc/systemd/system/getty@.service.d/" -cat <<- EOF > "$NEWROOT/etc/systemd/system/getty@.service.d/restore-cursor.conf" - [Service] - ExecStartPre=-/usr/bin/env bash -c "echo -en '\033c' > /dev/%I" +cat > "$NEWROOT/etc/systemd/system/getty@.service.d/restore-cursor.conf" < /dev/%I" EOF # Copy icons and tools, so we can trigger the HDD icon in @@ -22,4 +22,4 @@ EOF cp -n "$( which splashtool )" "$NEWROOT/opt/openslx/bin/splashtool" cp -n -r "/opt/openslx/icons" -t "$NEWROOT/opt/openslx/" -: +exit 0 -- cgit v1.2.3-55-g7522