[X2Go-Commits] [live-build-x2go] 76/108: we need to make sure this script is executable under busybox sh as well, also, no output is desired when run from inside initrd

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit 550566bae0897dd08c2a588f93b512617a4f05b2
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Jan 11 14:02:19 2019 +0000

    we need to make sure this script is executable under busybox sh as well, also, no output is desired when run from inside initrd
---
 .../etc/initramfs-tools/hooks/0000-initrdblankdpmsfix              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix
index 3bbdfbe..f2e2a8d 100755
--- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix
+++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix
@@ -22,6 +22,11 @@ if [ ! -x "../../lib/live/config/0000-earlyblankdpmsfix" ]; then
 fi
 
 # for some silly reason, this file is needed in two places
-sed -e 's/early/initrd/g' -e 's/Early/Initrd/g' ../../lib/live/config/0000-earlyblankdpmsfix | tee "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix"
+sed \
+	-e 's#/bin/bash#/bin/sh#' \
+	-e '/^echo -n/d' \
+	-e 's/early/initrd/g' \
+	-e 's/Early/Initrd/g' \
+../../lib/live/config/0000-earlyblankdpmsfix | tee "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix"
 chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix"
 exit 0

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git