From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7021952409904611328 X-Received: by 2002:a65:6bcf:0:b0:478:9509:2e8f with SMTP id e15-20020a656bcf000000b0047895092e8fmr24113130pgw.2.1670642967391; Fri, 09 Dec 2022 19:29:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:aa19:0:b0:574:f07:8a36 with SMTP id e25-20020a62aa19000000b005740f078a36ls3865512pff.4.-pod-prod-gmail; Fri, 09 Dec 2022 19:29:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf4aYik8HUQlq/+VwoEkd8uINeKc5dJM+P7i2JHCbgMGFlUJYt/nk2z/bGJBPewppQoDgXDG X-Received: by 2002:aa7:8552:0:b0:576:a500:2c7c with SMTP id y18-20020aa78552000000b00576a5002c7cmr7406625pfn.27.1670642966266; Fri, 09 Dec 2022 19:29:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670642966; cv=none; d=google.com; s=arc-20160816; b=FtrTlvoWzWDO1CAOQVjAZc6vdOA13EmFqjDuLYpXrKZiQ2tio0fucxMd0kbwu5eS/7 crMp6UZZrcD9/dnDuBNPyWcy6L43YiQstMQzVNakLExdJChT5Oo2qYyzKeYAeRWNcFyV 0Wx+1VTrahoTJx3RZ/MH6Kf9Zlzn4tKbkdy0fZoz7HnPkKGtVTzWKgDekf7NtC6NReww 1FwyMiG0MV1DheP6GWUxzE+MblOmA3784MR4YPkVJRYW1K1YzEEoa98GaqHj7TaTSQa5 1Pg1VGMve/4dvrQKX2VP1m/446gS4t3TvvJDJ/D+btLYvwyfEOnc8UjcNVUeqnCZOzb3 QVSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=REKVIjAgxoEuus2aVtgQxUisTmVDze1EqR5cabdoDwo=; b=GgcT0s8C6Kx3Zq40WwcXQBbN/2lOKi/qpXceJbWzLU0cH8/jcCd5YFJSo4i2qH5F+D hGGh909zBCb/GrYiJAOlnUqBovAi4tRblx7OtQURedMPDeAKQAdta7jV/smYPKbQ7ato crwcOm3izqF+bFfIcFZac6RUqslyoFqq5QXRq9YCXqO2W7/+aytCUztu72HBHFZkjw6W ZygHaV1bQB/NgiJVi2FssJ4BXJTlcycZU10xiGS9/7gaK5k+p5h34NmIZeTUx/jQ2YGe dd11GL8oqsFEW/682Mco04hwXPLb+XSJYxk86hc4qWcU87MIalI0qF3RRTOCdHuhiqTv IY6g== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iAsGTwtK; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::f30 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qv1-xf30.google.com (mail-qv1-xf30.google.com. [2607:f8b0:4864:20::f30]) by gmr-mx.google.com with ESMTPS id i16-20020a056a00005000b005743ea3d0c3si203948pfk.0.2022.12.09.19.29.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Dec 2022 19:29:26 -0800 (PST) Received-SPF: pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::f30 as permitted sender) client-ip=2607:f8b0:4864:20::f30; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=iAsGTwtK; spf=pass (google.com: domain of roberto.foglietta@gmail.com designates 2607:f8b0:4864:20::f30 as permitted sender) smtp.mailfrom=roberto.foglietta@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-qv1-xf30.google.com with SMTP id q10so4375744qvt.10 for ; Fri, 09 Dec 2022 19:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=REKVIjAgxoEuus2aVtgQxUisTmVDze1EqR5cabdoDwo=; b=iAsGTwtKk7oo6/Re0u2ChPll5Ri8vv4a9HJN7Vw1898gVdfbOncu4mGz/RjvED3tHP pwj3UW+E9A9m0ofkP2vVZDdvQp2yqB13ofk0bc5IKHTDLxVHyPUNy0UCV6Hb3C0+Y2Wr KGvgL9bDO7buXkHQygyinLc7oJFk1Zix3EeEmN8ueF+eVyxLwK4o317h6joiSbkpE+Ck x6a1yK6yJGRwUmZ+JoWr80J5ZjTBE1+w0YR7jYIepqKLTVWpEzCjISnjTOJHrPH6pFJH Rem71Fk+qA6bwJQ2BjBl3FXcDMped3J3sL7PNKDU4EqinYTeKH5hyAYjsFjokSXxTEOb wh8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=REKVIjAgxoEuus2aVtgQxUisTmVDze1EqR5cabdoDwo=; b=yRgWVoDVpZDdLRVGyD7IrJv6D7T7bRcF+qG+uHdJuFbdrBJLjPCdMZKr0Qnma1WXOW Ow3J4rpi/3VXrpgfDpmSCKlfWHfaJf+TEP5hXhPpGS9jX7PVC61KNF5IxkWp1UvccNR6 ZKs7qKVx/4vhEARsX6KG8FAqB4F2hHTaItu3nLn6k9Nqz4JBlehBubIn7Jvp5ifwQcX9 Lp4XCiteq4Qr6CamxSOxfarMfxjss1BcGON43YNrQI4IwggY8Spr7gBtmVb40CyMeiDM 1InDnfsPDC2k+KwIAV2xQyyEYpm5WWudDPpybXICY2ziDloBmBDX/hNLcQPYG9cuCiY7 XzOg== X-Gm-Message-State: ANoB5pkLaj+WitlOivoadPq+hbPYUi3GPzzaohmYEN68dChoCkLUEEcv sb62v2tAkRf1Y5GYWUZkZ8oEAtVkEr+j3789hQ== X-Received: by 2002:ad4:444d:0:b0:4c7:8c1b:68d9 with SMTP id l13-20020ad4444d000000b004c78c1b68d9mr7434489qvt.52.1670642965324; Fri, 09 Dec 2022 19:29:25 -0800 (PST) MIME-Version: 1.0 References: <18299964-6809-d6a0-0f90-3ec6a785695c@siemens.com> <20211022195047.262589-1-joe_macdonald@mentor.com> <20221209164014.41bcdc55@md1za8fc.ad001.siemens.net> In-Reply-To: <20221209164014.41bcdc55@md1za8fc.ad001.siemens.net> From: "Roberto A. Foglietta" Date: Sat, 10 Dec 2022 04:28:48 +0100 Message-ID: Subject: Re: [PATCH v2] expand-on-first-boot: support resizing a btrfs root To: Henning Schild Cc: Joe MacDonald , isar-users@googlegroups.com, joe.macdonald@siemens.com Content-Type: multipart/mixed; boundary="0000000000007eeb1905ef70e09e" X-TUID: mek+Uszdswfh --0000000000007eeb1905ef70e09e Content-Type: text/plain; charset="UTF-8" On Fri, 9 Dec 2022 at 16:40, Henning Schild wrote: > > It all looks like we want to revert the systemd-growfs patch and go > back to using plain tools for each partition type. So i looked at this > again and will likely propose another round, keeping the author but > changing it quite a bit. > > Am Fri, 22 Oct 2021 15:50:47 -0400 > schrieb Joe MacDonald : > > > resize2fs fails if the build sets the root filesystem for an image to > > btrfs though the partition is expanded properly. Since the rest of the > > script works as intended, simply checking the last partition type with > > lsblk and adding `btrfs resize` instead of `resize2fs` in the > > appropriate circumstance allows everything to function as expected. > > It it not about "rootfs" it is about the last partition. This is the code you need to integrate btrfs filesystem case $(lsblk -fno FSTYPE "${LAST_PART}") in ext4) resize2fs "${LAST_PART}" ;; btrfs) mkdir -p /tmp/btrfs mount "${LAST_PART}" /tmp/btrfs btrfs filesystem resize max /tmp/btrfs umount /tmp/btrfs && rmdir /tmp/btrfs ;; esac In attachment the patch against the current next branch. It has been sent by elastic mail but went in moderation, as usual. Best regards, R- --0000000000007eeb1905ef70e09e Content-Type: text/x-patch; charset="US-ASCII"; name="0001-In-expand-last-partition-script-btrfs-support-added.patch" Content-Disposition: attachment; filename="0001-In-expand-last-partition-script-btrfs-support-added.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lbhdjz540 RnJvbSA3N2M4NWI2MTFkM2RhNTcxMmI4Yzg4M2U3Zjk3YWY3MjIwMWUxMWI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiAiUm9iZXJ0byBBLiBGb2dsaWV0dGEiIDxyb2JlcnRvLmZvZ2xp ZXR0YUBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMTAgRGVjIDIwMjIgMDQ6MTM6NDIgKzAxMDAKU3Vi amVjdDogW1BBVENIXSBJbiBleHBhbmQgbGFzdCBwYXJ0aXRpb24gc2NyaXB0IGJ0cmZzIHN1cHBv cnQgYWRkZWQKCmltcHJvdmVtZW50LCBleHBhbmQtb24tZmlyc3QtYm9vdDogc3VwcG9ydCBmb3Ig YnRyZnMgYWRkZWQKClNpZ25lZC1vZmYtYnk6IFJvYmVydG8gQS4gRm9nbGlldHRhIDxyb2JlcnRv LmZvZ2xpZXR0YUBnbWFpbC5jb20+Ci0tLQogLi4uL2V4cGFuZC1vbi1maXJzdC1ib290XzEuMi5i YiAgICAgICAgICAgICAgIHwgIDIgKy0KIC4uLi9maWxlcy9leHBhbmQtbGFzdC1wYXJ0aXRpb24u c2ggICAgICAgICAgICB8IDM3ICsrKysrKy0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwg MTMgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWV0YS9yZWNp cGVzLXN1cHBvcnQvZXhwYW5kLW9uLWZpcnN0LWJvb3QvZXhwYW5kLW9uLWZpcnN0LWJvb3RfMS4y LmJiIGIvbWV0YS9yZWNpcGVzLXN1cHBvcnQvZXhwYW5kLW9uLWZpcnN0LWJvb3QvZXhwYW5kLW9u LWZpcnN0LWJvb3RfMS4yLmJiCmluZGV4IDA5OTYwMDAuLmZlN2I3MmIgMTAwNjQ0Ci0tLSBhL21l dGEvcmVjaXBlcy1zdXBwb3J0L2V4cGFuZC1vbi1maXJzdC1ib290L2V4cGFuZC1vbi1maXJzdC1i b290XzEuMi5iYgorKysgYi9tZXRhL3JlY2lwZXMtc3VwcG9ydC9leHBhbmQtb24tZmlyc3QtYm9v dC9leHBhbmQtb24tZmlyc3QtYm9vdF8xLjIuYmIKQEAgLTEwLDcgKzEwLDcgQEAgaW5oZXJpdCBk cGtnLXJhdwogREVTQ1JJUFRJT04gPSAiVGhpcyBzZXJ2aWNlIGdyb3dzIHRoZSBsYXN0IHBhcnRp dGlvbiB0byB0aGUgZnVsbCBtZWRpdW0gZHVyaW5nIGZpcnN0IGJvb3QiCiBNQUlOVEFJTkVSID0g ImlzYXItdXNlcnMgPGlzYXItdXNlcnNAZ29vZ2xlZ3JvdXBzLmNvbT4iCiAKLURFQklBTl9ERVBF TkRTID0gInN5c3RlbWQsIHNlZCwgZ3JlcCwgY29yZXV0aWxzLCBtb3VudCwgZTJmc3Byb2dzLCBm ZGlzayAoPj0yLjI5LjItMykgfCB1dGlsLWxpbnV4ICg8Mi4yOS4yLTMpLCB1dGlsLWxpbnV4Igor REVCSUFOX0RFUEVORFMgPSAic3lzdGVtZCwgc2VkLCBncmVwLCBjb3JldXRpbHMsIG1vdW50LCBl MmZzcHJvZ3MsIGZkaXNrICg+PTIuMjkuMi0zKSB8IHV0aWwtbGludXggKDwyLjI5LjItMyksIHV0 aWwtbGludXgsIGJ0cmZzLXByb2dzIgogCiBTUkNfVVJJID0gIiBcCiAgICAgZmlsZTovL2V4cGFu ZC1vbi1maXJzdC1ib290LnNlcnZpY2UgXApkaWZmIC0tZ2l0IGEvbWV0YS9yZWNpcGVzLXN1cHBv cnQvZXhwYW5kLW9uLWZpcnN0LWJvb3QvZmlsZXMvZXhwYW5kLWxhc3QtcGFydGl0aW9uLnNoIGIv bWV0YS9yZWNpcGVzLXN1cHBvcnQvZXhwYW5kLW9uLWZpcnN0LWJvb3QvZmlsZXMvZXhwYW5kLWxh c3QtcGFydGl0aW9uLnNoCmluZGV4IDU3MDU1Y2MuLmFjZmVmOGEgMTAwNzU1Ci0tLSBhL21ldGEv cmVjaXBlcy1zdXBwb3J0L2V4cGFuZC1vbi1maXJzdC1ib290L2ZpbGVzL2V4cGFuZC1sYXN0LXBh cnRpdGlvbi5zaAorKysgYi9tZXRhL3JlY2lwZXMtc3VwcG9ydC9leHBhbmQtb24tZmlyc3QtYm9v dC9maWxlcy9leHBhbmQtbGFzdC1wYXJ0aXRpb24uc2gKQEAgLTU3LDI5ICs1NywxNiBAQCBzZmRp c2sgLWQgIiR7Qk9PVF9ERVZ9IiAyPi9kZXYvbnVsbCB8IFwKICMgSW5mb3JtIHRoZSBrZXJuZWwg YWJvdXQgdGhlIHBhcnRpdGlvbmluZyBjaGFuZ2UKIHBhcnR4IC11ICIke0xBU1RfUEFSVH0iCiAK LSMgdGhpcyBpcyBmb3IgZGViaWFuIHN0cmV0Y2ggb3Igc3lzdGVtZCA8IDIzNgotaWYgWyAhIC14 IC9saWIvc3lzdGVtZC9zeXN0ZW1kLWdyb3dmcyBdOyB0aGVuCi0JIyBEbyBub3QgZmFpbCByZXNp emUyZnMgaWYgbm8gbXRhYiBlbnRyeSBpcyBmb3VuZCwgZS5nLiwKLQkjIHdoZW4gdXNpbmcgc3lz dGVtZCBtb3VudCB1bml0cy4KLQlleHBvcnQgRVhUMkZTX05PX01UQUJfT0s9MQorIyBEbyBub3Qg ZmFpbCByZXNpemUyZnMgaWYgbm8gbXRhYiBlbnRyeSBpcyBmb3VuZCwgZS5nLiwKKyMgd2hlbiB1 c2luZyBzeXN0ZW1kIG1vdW50IHVuaXRzLgorZXhwb3J0IEVYVDJGU19OT19NVEFCX09LPTEKIAot CXJlc2l6ZTJmcyAiJHtMQVNUX1BBUlR9IgotCWV4aXQgMAotZmkKLQotaWYgZ3JlcCAtcSB4LXN5 c3RlbWQuZ3Jvd2ZzIC9ldGMvZnN0YWI7IHRoZW4KLQllY2hvICJGb3VuZCB4LXN5c3RlbWQuZ3Jv d2ZzIG9wdGlvbiBpbiAvZXRjL2ZzdGFiLCB3b24ndCBjYWxsIGl0IGV4cGxpY2l0bHkuIiA+JjIK LQlleGl0IDAKLWZpCi0KLSMgbW91bnQgJExBU1RfUEFSVCBvdXQgb2YgdHJlZSwgc28gd2Ugd29u J3QgY29uZmxpY3Qgd2l0aCBvdGhlciBtb3VudHMKLU1PVU5UX1BPSU5UPSQobWt0ZW1wIC1kIC1w IC9tbnQgIiQoYmFzZW5hbWUgIiQwIikuWFhYWFhYWFhYWCIpCi1pZiBbICEgLWQgIiR7TU9VTlRf UE9JTlR9IiBdOyB0aGVuCi0JZWNobyAiQ2Fubm90IGNyZWF0ZSB0ZW1wb3JhcnkgbW91bnQgcG9p bnQgJHtNT1VOVF9QT0lOVH0uIiA+JjIKLQlleGl0IDEKLWZpCi0KLW1vdW50ICIke0xBU1RfUEFS VH0iICIke01PVU5UX1BPSU5UfSIKLS9saWIvc3lzdGVtZC9zeXN0ZW1kLWdyb3dmcyAiJHtNT1VO VF9QT0lOVH0iCi11bW91bnQgIiR7TU9VTlRfUE9JTlR9Igotcm1kaXIgIiR7TU9VTlRfUE9JTlR9 IgorY2FzZSAkKGxzYmxrIC1mbm8gRlNUWVBFICIke0xBU1RfUEFSVH0iKSBpbgorCWV4dDQpIAly ZXNpemUyZnMgIiR7TEFTVF9QQVJUfSIKKwkJOzsKKwlidHJmcykgCW1rZGlyIC1wIC90bXAvYnRy ZnMKKwkJbW91bnQgIiR7TEFTVF9QQVJUfSIgL3RtcC9idHJmcworCQlidHJmcyBmaWxlc3lzdGVt IHJlc2l6ZSBtYXggL3RtcC9idHJmcworCQl1bW91bnQgL3RtcC9idHJmcyAmJiBybWRpciAvdG1w L2J0cmZzCisJCTs7Citlc2FjCi0tIAoyLjM0LjEKCg== --0000000000007eeb1905ef70e09e--