From patchwork Fri Dec 9 16:22:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2283 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 09 Dec 2022 17:22:46 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f62.google.com (mail-wm1-f62.google.com [209.85.128.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2B9GMkZr015328 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 9 Dec 2022 17:22:46 +0100 Received: by mail-wm1-f62.google.com with SMTP id v125-20020a1cac83000000b003cfa148576dsf111938wme.3; Fri, 09 Dec 2022 08:22:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670602961; cv=pass; d=google.com; s=arc-20160816; b=DU4fGKHderXrG550YVHouPSYny9PuQvZTZiBvD8WY56O+xMHneKgQSmmNB5PsIzvuL 5KlzvaXd/7DhzuiLRpcFdpag5G8ViIWjqVsdVx8SkQfwoUycYFEZAvTXpM3K0deLY//W pVfZLJlc4R9RxMviS3Jro+e8UwP8A/nclBhZ+TBZecgTzcinb9sREDQgbm/BTLSo5XW7 REG3T8I8onU1p/0SGqsilyqlCLIAlDotwZSQbJ5NbbK+MWp/NSgbOQxrVJ5pkmIFqAo2 DbfX4e16jLuIZFERCWpe/YD1jQYJDqQPvunGKKQZm2viVYNjU63xIUDXhb44C+0Zwgub y6xg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:message-id :date:subject:cc:to:from:sender:dkim-signature; bh=KzHG6CT+rBxjO365zxGbS+kV62kkUU8bL/9+KWBNIAA=; b=KA55IoDAaE0u7K25cEaptZm3RHrwSjS3PY9fqEvXJxRVQ753FMLmd2+FXZwuaPeliJ Dh/3lfY7oMoG6hEmRxqWdtjkND4qx38qrQ1iHdRmlUJljbspPtEcdgHYH9nVOw2fNf8V WELEkpqsEYt8zAj0BXSRX3E+BaUNmsWYDijxn3e8lixNpDsbnx2S8oAbwsCUZ8rYLKeg 1l83U4o4KyOB0WM5ZRs8U3Kzp8eeh2NRUKViPahxv1OZ2WIcfbWA6YSZGUHACh7SoRTl ApAGTfm6U2ejNMFcWloJmZigUSVFcSSybxYRxX04oHXeeuDDHZ//o78kptn/cvNT5Lbq aB/A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=U3yrfeew; spf=pass (google.com: domain of fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:message-id:date:subject :cc:to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=KzHG6CT+rBxjO365zxGbS+kV62kkUU8bL/9+KWBNIAA=; b=q4P0zuI3p3+JwoKVdxvMz2KB5yaGxvEbFFR48VcTwYXbNb8dWr4w9Gf86N3JYJhy3c Z2+se/ikDfg+hWeVSWxrVcdUXvp8yjG8Tq2PNrDUvkonbLHwSXpGFszEW/3AiSFawEpM vISVncnLRKkGpGcON8twP7FosVaYxq0sOh7hpeoTJlJ1Z0Hn6ctCvZkSDq+WK2+fWXvX P57Cfer3bTrTd50Sn3GYCz8xYkdWZbpcpuxRDW7JdUSh7K3D6tAIsANNTn3qa0iv7xox NaDtpoxoANt7mp1aYh9/9sWsvAU00mSdOuoAJwIXiyvw78/9M2bMVwj2hoSLjEuGV0jG hE5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=KzHG6CT+rBxjO365zxGbS+kV62kkUU8bL/9+KWBNIAA=; b=OrzMcMWITGzhkk+zxXcQmh7Bb+IYAl9xMovpkjUhU9fof2QLNICclZSQHSJnTLUTO9 aICmnighloDeX9SeEe3VicZV0Mo8ZG2bsD0cyNg3U0abUpGtSYOPCYwHTyF8G3O5NgKK kMMk8J0uh35u0TCJf9qb+3QIaOhdjNfgmJVlOjIL0WjDAu31zLD0fui6b36cB3AttHbK A7KH2pcJB5Ug92hqGXkTuCo+CsdO8XSAKqWypc8t2SpQRLoLqAI9igd6d4RQdh5AiOCA oZN7Dl6Soz2U1EX0S+TLKDwIxsXMmcLuWOzza7AE46h3zjUmxuTkZyzs3dq5ku92ClTO gu1g== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pn5bu3b42Br4Iyv0JjpKisQ+G5Lx7ZrCryyCm3JPxuRKOHVZZ80 CRukMFer0DHX5QskmBnwemo= X-Google-Smtp-Source: AA0mqf6GCuesIDyFFNm6xGWm6qq6fln4E7Fi91RpoXgGj/NUytB4+6WieT0p6BICzZQ+1ws3k0RnxQ== X-Received: by 2002:a5d:6a4d:0:b0:242:4b0a:dd52 with SMTP id t13-20020a5d6a4d000000b002424b0add52mr14557669wrw.551.1670602960813; Fri, 09 Dec 2022 08:22:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3b17:b0:3d1:be63:3b63 with SMTP id m23-20020a05600c3b1700b003d1be633b63ls6600463wms.1.-pod-canary-gmail; Fri, 09 Dec 2022 08:22:39 -0800 (PST) X-Received: by 2002:a05:600c:310e:b0:3cf:b07a:cd2f with SMTP id g14-20020a05600c310e00b003cfb07acd2fmr5634163wmo.37.1670602959797; Fri, 09 Dec 2022 08:22:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670602959; cv=none; d=google.com; s=arc-20160816; b=Hdc+7OquJ3KvGZMaJq+te9Iyv3ly2+nmPUtzNnPET0IXDdVhrZq4JICuaU4Z4WE0Ll rTrnCJkFHogwusj2awUTZKL7km3AOFE6paUM5FC6a88+mRWsvz7+6hbonKN3P5/y8W4X 8rsfjbRyIAOV0kYK7lnUJkCHOG/UBcJtxTCNKGhg6423rGV6gqk3/lW2/CDeaSn+DXVv 9qVDZ2L17cVdZ5R6JJynoJnpNSOZdhum9ZiMgi9LqHmBnN9lx/l5ADVzElFTQEt0l9oo SsfEyY4TPX2WrXkxWrhmqjWuQycHt8OecUP3ALfjF9S8vO2+2cUziv01rDTbJMVXWNRR dMgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=SGba0HJdz3VH8Tf8cvJl3kV2Ck2LhLd0iLTCjFo42RE=; b=N3BeGq95CkrrKrZuyvhJrBq/g4b8QURAnOnJCOAofUjR4Njo07STF9SDlH9XPbL+LG xmBKKKhSwSE9e63Gw/B6d4L+4VGTBpZpcmuvBZEqPUtb8ZADXcig3YBY7ho7T2vM4xBR 0lDccq3GLMlkRLgT/VcaTLwI969oYwWwOVMhnP5KZoDjlWo5Q22TQexrtn6HtnivcUjt 0KYB5pwvAveytNTtks4iwPGs5JEYjjmfCzI07/xNgialJKJA3M5qldr3jjgHwAUfoBFP m2enXxAejKCjJHncMuJeXc7EaxVTCnNzxKIDhnk0RcS3mYCoAPLpQbDk9YPBok1+jDcO SJZw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=U3yrfeew; spf=pass (google.com: domain of fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id m187-20020a1ca3c4000000b003d1d8d3577dsi562760wme.2.2022.12.09.08.22.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2022 08:22:39 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20221209162239450161d61d50424c32 for ; Fri, 09 Dec 2022 17:22:39 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Tobias Schaffner , felix.moessbauer@siemens.com, jan.kiszka@siemens.com, Henning Schild Subject: [PATCH] expand-on-first-boot: switch back away from systemd-growfs Date: Fri, 9 Dec 2022 17:22:37 +0100 Message-Id: <20221209162237.13420-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=U3yrfeew; spf=pass (google.com: domain of fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-20221209162239450161d61d50424c32-x9xk0u@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Henning Schild systemd-growfs in some versions has runtime deps on symlinks created by udev and we have a race there that shows especially on smaller/slower devices. We had patches dealing with that but they ended up looking rather complex. The gain of systemd-growfs is potentially a bunch more filesystems. But we can add them as well in sort of a switch-case. We never used it the way it is intended because it did not really fit, so better not use it. Signed-off-by: Henning Schild --- ...oot_1.2.bb => expand-on-first-boot_1.3.bb} | 0 .../files/expand-last-partition.sh | 26 ++++--------------- 2 files changed, 5 insertions(+), 21 deletions(-) rename meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.2.bb => expand-on-first-boot_1.3.bb} (100%) diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb similarity index 100% rename from meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb rename to meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh index 57055ccdcbd8..93eddda2a3b7 100755 --- a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh +++ b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh @@ -57,29 +57,13 @@ sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ # Inform the kernel about the partitioning change partx -u "${LAST_PART}" -# this is for debian stretch or systemd < 236 -if [ ! -x /lib/systemd/systemd-growfs ]; then - # Do not fail resize2fs if no mtab entry is found, e.g., - # when using systemd mount units. - export EXT2FS_NO_MTAB_OK=1 - - resize2fs "${LAST_PART}" - exit 0 -fi - if grep -q x-systemd.growfs /etc/fstab; then - echo "Found x-systemd.growfs option in /etc/fstab, won't call it explicitly." >&2 + echo "Found x-systemd.growfs option in /etc/fstab, won't grow." >&2 exit 0 fi -# mount $LAST_PART out of tree, so we won't conflict with other mounts -MOUNT_POINT=$(mktemp -d -p /mnt "$(basename "$0").XXXXXXXXXX") -if [ ! -d "${MOUNT_POINT}" ]; then - echo "Cannot create temporary mount point ${MOUNT_POINT}." >&2 - exit 1 -fi +# Do not fail resize2fs if no mtab entry is found, e.g., +# when using systemd mount units. +export EXT2FS_NO_MTAB_OK=1 -mount "${LAST_PART}" "${MOUNT_POINT}" -/lib/systemd/systemd-growfs "${MOUNT_POINT}" -umount "${MOUNT_POINT}" -rmdir "${MOUNT_POINT}" +resize2fs "${LAST_PART}"