Make-initrd development discussion
 help / color / mirror / Atom feed
From: Leonid Krivoshein <klark.devel@gmail.com>
To: make-initrd@lists.altlinux.org
Subject: [make-initrd] [PATCH v1 08/41] fork pipeline: getimage step modified
Date: Fri, 24 Sep 2021 18:56:14 +0300
Message-ID: <4c4691f4-67d9-1d21-3df4-20edb3970886@gmail.com> (raw)

---
  .../bootchain-getimage/data/lib/bootchain/getimage       | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/make-initrd/features/bootchain-getimage/data/lib/bootchain/getimage 
b/make-initrd/features/bootchain-getimage/data/lib/bootchain/getimage
index 409ad14..49c5ebf 100755
--- a/make-initrd/features/bootchain-getimage/data/lib/bootchain/getimage
+++ b/make-initrd/features/bootchain-getimage/data/lib/bootchain/getimage
@@ -1,6 +1,6 @@
  #!/bin/bash -efu
  -. pipeline-sh-functions
+. bootchain-sh-functions
   check_parameter GETIMAGE
  url="$(get_parameter GETIMAGE)"
@@ -9,12 +9,13 @@ if [ -n "${url##file://*}" ]; then
  	# FIXME: make a better waiting for network
  	n=0
  	while [ "$n" != 5 ]; do
-		! wget -O "$datadir/image" "$url" ||
+		! run wget -O "$datadir/image" -- "$url" ||
  			break
  		n=$(($n + 1))
  		sleep 3
  	done
  else
-	cp -f -- "${url#file://}" "$datadir/image"
+	run cp -Lf -- "${url#file://}" "$datadir/image"
  fi
-run mount -o ro,loop "$datadir/image" "$destdir"
+
+run mount -o ro,loop -- "$datadir/image" "$destdir"
-- 
2.21.0




                 reply	other threads:[~2021-09-24 15:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4c4691f4-67d9-1d21-3df4-20edb3970886@gmail.com \
    --to=klark.devel@gmail.com \
    --cc=make-initrd@lists.altlinux.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Make-initrd development discussion

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/make-initrd/0 make-initrd/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 make-initrd make-initrd/ http://lore.altlinux.org/make-initrd \
		make-initrd@lists.altlinux.org make-initrd@lists.altlinux.ru make-initrd@lists.altlinux.com
	public-inbox-index make-initrd

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.make-initrd


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git