From 41b6311d9e5f1351952a1180c82ee684ec712cd3 Mon Sep 17 00:00:00 2001
From: Oleg Kalachev <okalachev@gmail.com>
Date: Thu, 18 Apr 2024 06:17:31 +0300
Subject: [PATCH] Enable echo in image-init, move disabling ld preload to the
 top

---
 builder/image-init.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/builder/image-init.sh b/builder/image-init.sh
index bf84ec0c..1c8d5220 100755
--- a/builder/image-init.sh
+++ b/builder/image-init.sh
@@ -12,7 +12,7 @@
 # copies or substantial portions of the Software.
 #
 
-set -e # Exit immidiately on non-zero result
+set -ex # Exit immidiately on non-zero result
 
 echo_stamp() {
   # TEMPLATE: echo_stamp <TEXT> <TYPE>
@@ -34,8 +34,10 @@ echo_stamp() {
   echo -e ${TEXT}
 }
 
-echo_stamp "Write Clover information"
+echo_stamp "Move /etc/ld.so.preload out of the way"
+mv /etc/ld.so.preload /etc/ld.so.preload.disabled-for-build
 
+echo_stamp "Write Clover information"
 # Clover image version
 echo "$1" >> /etc/clover_version
 # Origin image file name
@@ -57,7 +59,4 @@ echo_stamp "Set max space for syslogs"
 # https://unix.stackexchange.com/questions/139513/how-to-clear-journalctl
 sed -i 's/#SystemMaxUse=/SystemMaxUse=200M/' /etc/systemd/journald.conf
 
-echo_stamp "Move /etc/ld.so.preload out of the way"
-mv /etc/ld.so.preload /etc/ld.so.preload.disabled-for-build
-
 echo_stamp "End of init image"