From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=bXfH4lI+sSVYyxBX3m3J7Fc1JRXmp0IGmb0eFzvp1ag=; b=K6vq3GvzxI4rYLQio03c/1ECwycAAwv7ElQPzEkguml8PiOON8WdcXF7ymRfv46deD T/b+d9bBglQCQMheyx3/sX+T3RMWBaNFzaLa/zE5F0LS9p74QlxlQe5vgdqRv7O6QrlG TiH54ohdFYFE7kar03TBfJGLgv/gbck6S2HFLzgaWj1jLKJSuRljdRyTJejMsTukReO5 o4lYvTtB7XUSb1XpgPhXwFwzLPeAwYMPc6jVQBhnpyLk1VcamNCH57ry1bUnYxS7eUzY 63aZKjiunIKZfAKWWVlcScHRgy5lJ9ZvQF3PBlYtQqfl9vD03WmKr6ce6di6xYfRGS6q HrFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=bXfH4lI+sSVYyxBX3m3J7Fc1JRXmp0IGmb0eFzvp1ag=; b=SMdwLcNuA9y7leF1PuhdZrqcEV8BbKHQdeS7wCxIf+G8gPzhDU/RqRhmUxXMyYxDbH Kjb3oKSLQxzxCbFITg2thMUqC3udnp77EblS2OYogaSXBQo80iOupYlS3vcO9krrwZil ecaOEWt9UiFQ4x3OdvXziStyR5H7NG0z89DRgteadHXv3KXk8o/IP2E7+aEM9yyyY9FT xoFe7eTYqHFJdD5wmkofwx09Nk+vwNKDi2JaMchxTQKvJfu7Ar5H3qjddBZQPl7DCEgm XhxWwQ0nsxu1oZrBmc/FZdfShDq4CAP80SKVBetD+nYPgSB0zflvE5AA2q10gmxOxpAt F4Pw== X-Gm-Message-State: AOAM533BFUzU6h/HCrlYAZPuVi9Xinzr01t4VZ1OEJ5wWiMXP4dCGinE uhA6q0LNcF/nINHpu98DT83eaga4z/Y= X-Google-Smtp-Source: ABdhPJxiE5KtoKi/8mUv8lr04mVlmmzFjhatpx29mw5RPF1C0iM9yiAV5PaMBFLZS9HXuT5A90eD8w== X-Received: by 2002:a05:6512:3c9c:: with SMTP id h28mr10069598lfv.411.1632498974898; Fri, 24 Sep 2021 08:56:14 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <4c4691f4-67d9-1d21-3df4-20edb3970886@gmail.com> Date: Fri, 24 Sep 2021 18:56:14 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=windows-1251; format=flowed Content-Language: ru Content-Transfer-Encoding: 7bit Subject: [make-initrd] [PATCH v1 08/41] fork pipeline: getimage step modified X-BeenThere: make-initrd@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: make-initrd@lists.altlinux.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 15:56:17 -0000 Archived-At: List-Archive: --- .../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