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=Uf33vNNkQaZ/tSZ5SsjhL+JgpeMB8qwQ2ejQyUKnamE=; b=KpNC2V9mTF0xfatx/4wM1RU6tgIYPG6lmGxNLEC0zDEnQxQmB9gPVR5bdAe2fHVJlJ +0y4Hrq8nXgiv7B97fxX5nN/Hgur1Wa8myzitpC8iPvd77hRtleyn1vDjtXOACN2pCcR gW9+twCTdgVQ53k/McXokhkMjnlHu6exoRh0ta4nZkn9rVXZa4749SHoU996ufR+ZTh2 wsTvLX1yBa3TcAj6oatj3whyZZUhG3jdUShd/5pqPIExOFi44q1oGts3T9zsftK700/O axExQePHml4TXx9HGOwBg2QomkUIFdAetMw/G90elTP8ye/nz3eF17MFTw2JhBv8+F1q 8VkA== 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=Uf33vNNkQaZ/tSZ5SsjhL+JgpeMB8qwQ2ejQyUKnamE=; b=AlGnC6tO9ElFbBTKQ9Bvc9YDiHvQJMoWRcZ8Fxsjz9deolR/3dN1lvJDz9TzY7F28K m5kF3vv4cp7jY9IPeZxmBd635J6Z6u2BqOwZJbDcyPlo+CVwG+63OdgaXQvnZzD+BH2E 3ekSUaNsfU8uq9tmUjpwPMqipWbWOwM6SZIiaZX6SC8snPdwtmbRsnTvlpNUZ+7if1HX UOlZPW+RwIJiGxFy7BAvdZTmopVOhFQ3i18DdATL+ktcjTpKuJp8xawHpxtpwUSGzW5O wnq0ZX7JpZ1K7Df0UYIHsWMXsiJ7f67ST4JYFDofqGIF9LqdIG1jC4go+MuhLkU1QjR6 kf0g== X-Gm-Message-State: AOAM532Raa/ZUp4tf/lWsgYyMoa2OWvbUvlIScWOgv6rkh8o3qgcQpV1 +FGvXvOuZOfZzYZjf/NiY3mTaQIqDuE= X-Google-Smtp-Source: ABdhPJwNIiJz8rRQ1iFAKq9BBmgPY92qEQAktO61b/AJBBcGJ5CfMDoSeVz+LuYsnk9+8KDtMjilEA== X-Received: by 2002:a05:6512:2203:: with SMTP id h3mr10233763lfu.151.1632499002841; Fri, 24 Sep 2021 08:56:42 -0700 (PDT) From: Leonid Krivoshein To: make-initrd@lists.altlinux.org Message-ID: <146dd20e-866c-0e26-8071-8ba3a643a1f7@gmail.com> Date: Fri, 24 Sep 2021 18:56:41 +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 12/41] fork pipeline: overlayfs 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:45 -0000 Archived-At: List-Archive: --- .../data/lib/bootchain/overlayfs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/make-initrd/features/bootchain-core/data/lib/bootchain/overlayfs b/make-initrd/features/bootchain-core/data/lib/bootchain/overlayfs index 23b869b..48f9b7c 100755 --- a/make-initrd/features/bootchain-core/data/lib/bootchain/overlayfs +++ b/make-initrd/features/bootchain-core/data/lib/bootchain/overlayfs @@ -1,26 +1,27 @@ #!/bin/bash -efu -. pipeline-sh-functions +. bootchain-sh-functions target="$(get_parameter OVERLAYFS)" [ -n "$target" ] || [ -n "$prevdir" ] || - fatal "no previous step to use as lower directory" + fatal "no previous step results to use as lower directory" -pipe="${target:-$prevdir}" +chain="${target:-$prevdir}" lowerdirs= -while [ -n "$pipe" ]; do - name="${pipe%%,*}" +while [ -n "$chain" ]; do + name="${chain%%,*}" dir="$(resolve_target "$name")" lowerdirs="${lowerdirs:+$lowerdirs,}$dir" - pipe="${pipe#$name}" - pipe="${pipe#,}" + chain="${chain#$name}" + chain="${chain#,}" done -mkdir -p -- "$datadir/rw" "$datadir/work" +run mkdir -p -- "$datadir/rw" "$datadir/work" -run mount -o "lowerdir=$lowerdirs,upperdir=$datadir/rw,workdir=$datadir/work" \ - -t overlay overlay "$destdir" +opts="lowerdir=$lowerdirs,upperdir=$datadir/rw,workdir=$datadir/work" + +run mount -t overlay -o "$opts" -- overlay "$destdir" -- 2.21.0