From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <klark.devel@gmail.com>
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on
 sa.local.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.1 required=5.0 tests=ALL_TRUSTED,BAYES_00,
 DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,MISSING_DATE,MISSING_MID,
 NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1
From: "Leonid Krivoshein" <klark.devel@gmail.com>
To: make-initrd@lists.altlinux.org
Subject: [make-initrd] [PATCH v6 05/22] bootchain-core,
	bootchain-waitdev: whitespace
X-BeenThere: make-initrd@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: make-initrd@lists.altlinux.org
List-Id: <make-initrd.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/make-initrd>,
 <mailto:make-initrd-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/make-initrd>
List-Post: <mailto:make-initrd@lists.altlinux.org>
List-Help: <mailto:make-initrd-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/make-initrd>,
 <mailto:make-initrd-request@lists.altlinux.org?subject=subscribe>
Date: Sun, 24 Oct 2021 17:20:36 -0000
X-List-Received-Date: Sun, 24 Oct 2021 17:20:36 -0000
Message-ID: <20211024172036.hUQXjvSpT9JabTOM1v_Nu-c08S6C_2biHd1AsKGf9qQ@z>
Archived-At: <http://lore.altlinux.org/make-initrd/20211024172036.hUQXjvSpT9JabTOM1v_Nu-c08S6C_2biHd1AsKGf9qQ@z/>
List-Archive: <http://lore.altlinux.org/make-initrd/>

Signed-off-by: Leonid Krivoshein <klark.devel@gmail.com>
---
 .../data/bin/bootchain-sh-functions           | 28 +++++++++++--------
 features/bootchain-core/data/sbin/chaind      |  6 ++--
 .../data/lib/bootchain/waitdev                |  1 +
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/features/bootchain-core/data/bin/bootchain-sh-functions b/features/bootchain-core/data/bin/bootchain-sh-functions
index fa6201f..f337767 100644
--- a/features/bootchain-core/data/bin/bootchain-sh-functions
+++ b/features/bootchain-core/data/bin/bootchain-sh-functions
@@ -9,9 +9,11 @@ __bootchain_sh_functions=1
 handlerdir=/lib/bootchain
 [ "${ROOT-}" = pipeline ] && mntdir=/dev/pipeline || mntdir=/dev/bootchain
 
+
 check_parameter()
 {
 	local v
+
 	eval "v=\"\${$1-}\""
 	[ -n "$v" ] ||
 		fatal "Parameter '$1' required"
@@ -25,20 +27,22 @@ get_parameter()
 resolve_target()
 {
 	local target="$1"
+
 	case "${target%%/*}" in
-		'')
-			;;
-		pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
-			target="$mntdir/dst/step${target:4}"
-			;;
-		*)
-			if [ -z "${prevdir-}" ]; then
-				message "no previous stop to use"
-				return
-			fi
-			target="$prevdir/${target#/}"
-			;;
+	'')
+		;;
+	pipe[0-9]|pipe[0-9][0-9]|pipe[0-9][0-9][0-9])
+		target="$mntdir/dst/step${target:4}"
+		;;
+	*)
+		if [ -z "${prevdir-}" ]; then
+			message "no previous stop to use"
+			return
+		fi
+		target="$prevdir/${target#/}"
+		;;
 	esac
+
 	printf '%s' "$target"
 }
 
diff --git a/features/bootchain-core/data/sbin/chaind b/features/bootchain-core/data/sbin/chaind
index d401101..08e5e58 100755
--- a/features/bootchain-core/data/sbin/chaind
+++ b/features/bootchain-core/data/sbin/chaind
@@ -7,6 +7,7 @@ message_time=1
 pidfile="/var/run/$PROG.pid"
 logfile="/var/log/$PROG.log"
 
+
 exit_handler()
 {
 	local rc="$?"
@@ -15,6 +16,7 @@ exit_handler()
 	exit $rc
 }
 
+
 [ ! -f "$pidfile" ] ||
 	fatal "already running"
 
@@ -60,8 +62,8 @@ while [ -n "$chainsteps" ]; do
 
 			export name callnum datadir destdir prevdir
 
-			rc=0
-			"$exe" || rc=$?
+				rc=0
+				"$exe" || rc=$?
 
 			if [ "$rc" != 0 ]; then
 				[ "$rc" != 2 ] ||
diff --git a/features/bootchain-waitdev/data/lib/bootchain/waitdev b/features/bootchain-waitdev/data/lib/bootchain/waitdev
index 74af6ea..bc81673 100755
--- a/features/bootchain-waitdev/data/lib/bootchain/waitdev
+++ b/features/bootchain-waitdev/data/lib/bootchain/waitdev
@@ -20,5 +20,6 @@ while [ -n "$devspec" ]; do
 			break
 		fi
 	fi
+
 	sleep 1
 done
-- 
2.24.1