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=wBQmS6lA0XfzFIp3k/lZXExvNOm3sKKAF/xC9JtaqE8=; b=Gei8x1cfRUafU5TmKU+Z7mb5JHF202nwp6jk5pbER6FUk5xCN5r09TV/8JiBYDcDGv 5K1MBhnAh/K/wQOpkp6AsxAk7XSTypvvec7BeZPOzShu725ka3+ToU0YM2Z+3oxl1xhU RnGWWoHjvGklgKtlngsAH8CUJpJHZmKRk6G7/xR0pJO3EjcxRghaxE7Nen+FGXA+rwJa T4/Nw5wdLewN3znHn/ABEiskkCznDTGc0ls7Jos2e4BmO5ADndoJI0Bvmj8TgRdXH3L/ bQyEcoubkOFp3JXf+jz/8KCR5qViK9PRdU0LBquWfXjnQoLUkLgzZTNgNw8XaieqSUpW FBTg== 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=wBQmS6lA0XfzFIp3k/lZXExvNOm3sKKAF/xC9JtaqE8=; b=YaCdtG2lZS36elokMobmShmIhwv0XsfZhQMfdzOAjQuzoA8h/5ANRQysCWfsUFLSio 8Jwu9jyoyIfpLiMEDsTu0MJfdt3hcWKgkRmtPeXRGt1DlN/qb2h09vHEVRQyxmqKS1nP XENHtbIJYO2MkGBPYg8N7wgIWFacp5jRIKkJDuKytYeqU4LJvnQPXhorJAiG6ZmVlV9u cS0VRsoUsH0VRLDrJYQE8zddaCfz5OmqXQkVpLRg+wgWmOnKHwzxdAxiypKvUNrAzLJ/ PdZHFLE5Vnr5DDGva2N2NprR4d/BCkFXe1MhUduzE1ajnv5wXQwBmanEIvzREFGR+ngo TNMg== X-Gm-Message-State: AOAM530BPf1bx9qsCmP3zF5l2MvoC1xcHe0bYup2byW/RRqYQvct3WdK EN4j4xZfiN9MGr5dcNPL/NosPD06hMg= X-Google-Smtp-Source: ABdhPJwnlttWBHngvfNxBYb3NwvwxlYUmHwjiV8roqmS7m0J8uvyaHmBm2fn+TzTvtV7P/XCeZpQUw== X-Received: by 2002:ac2:5f71:: with SMTP id c17mr10009932lfc.555.1632499008859; Fri, 24 Sep 2021 08:56:48 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <2aa9a399-14c7-4eee-635c-0383d515e3cc@gmail.com> Date: Fri, 24 Sep 2021 18:56:48 +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 13/41] fork pipeline: rootfs 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:51 -0000 Archived-At: List-Archive: --- .../bootchain-core/data/lib/bootchain/rootfs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs b/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs index e4b2ca9..1801a81 100755 --- a/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs +++ b/make-initrd/features/bootchain-core/data/lib/bootchain/rootfs @@ -1,10 +1,11 @@ #!/bin/bash -efu -. pipeline-sh-functions +. bootchain-sh-functions -[ -n "$prevdir" ] || - fatal "no previous step to use as rootfs" - -run mount --move "$prevdir" "$rootmnt" +launch_step_once +[ -n "$prevdir" ] && mountpoint -q -- "$prevdir" || + fatal "no previous step results to use as rootfs" +[ "$prevdir" = "$rootmnt" ] || + run mount --move -- "$prevdir" "$rootmnt" echo localdev > /etc/initrd/method -exit 2 +break_bc_loop -- 2.21.0