From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7021952409904611328 X-Received: by 2002:a1f:f887:: with SMTP id w129mr638419vkh.23.1634932250936; Fri, 22 Oct 2021 12:50:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1f:7f06:: with SMTP id o6ls1488314vki.5.gmail; Fri, 22 Oct 2021 12:50:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHjkgy1hAW8OSb8YKAFVDBEJfdqGOz8Ftvd7vSp84/jDZInV6HDJOI1vA0j+tqPISlzxVN X-Received: by 2002:a1f:784b:: with SMTP id t72mr1101532vkc.15.1634932250357; Fri, 22 Oct 2021 12:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634932250; cv=none; d=google.com; s=arc-20160816; b=rOhA8FK1d4tlsZ3nDB2rR5tv72gnHKo/URLyNIpdaP1xZnXBSoQkYp8qi+WZfTiPbR DaXpDxeOkCBmymDflTX8y9F+fFKSaxIlWbwBjTzP7RyFsLNeS0McrvF2Ne5JtU2TEm5k Uz+QCcmLRbK3xQF9c7KvO12HtCHFAuBoPYNuiROhW45yW92XwAyczqlzi8F4n1+COJH9 HeabAXXvy4rFPcwgmYgQ8pdF+/t1LuD51zTL2l/slAKqjsLCyHsUBLC54ACriCNpUzhL fYb81X22tysF41hl6Qu6MI4tgpUwQ/OR29eIrl/VceHxhdGafXBzkyZnHB+cWM+FupOm EDdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=oOAvYVewuBXcMtDKniZvN3A5FFz/f1HjK4hOkQj4LLI=; b=zqRajDE6NJ2HwJSrcrgA4PvnvhqC2qdOnyDLMgguK/hiPucU1wfsP1+rkCITJELCcL CiJ50lojyTqvv4r2qYPfXkfm0FlrnlBv1zm061y+6NDeOnZ59TEPaCb+Lrf43jjEHHaK fLv6hfE4zIgnBblI6bG5zsWwFAf/qrPh6pvwKQmvF9WP1hW4GRmRqo3/UW2fLgPI86qW vLxNMooq0PXG9VKzMwWENAC1rjcaTKVXRfd9ki6G7j9i0cAXulwUN5dhdkeiIuKWdtcM 1/an4HfQE5akMLJQr7ZGyCFbEM4pdnXJRGBugayGixgmKVPUL4tf7xgicMr/WIxDNSdL vvEQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Dk2DIq7O; spf=pass (google.com: domain of joe.macdonald@gmail.com designates 2607:f8b0:4864:20::82f as permitted sender) smtp.mailfrom=joe.macdonald@gmail.com Return-Path: Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com. [2607:f8b0:4864:20::82f]) by gmr-mx.google.com with ESMTPS id q70si84433vka.0.2021.10.22.12.50.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Oct 2021 12:50:50 -0700 (PDT) Received-SPF: pass (google.com: domain of joe.macdonald@gmail.com designates 2607:f8b0:4864:20::82f as permitted sender) client-ip=2607:f8b0:4864:20::82f; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Dk2DIq7O; spf=pass (google.com: domain of joe.macdonald@gmail.com designates 2607:f8b0:4864:20::82f as permitted sender) smtp.mailfrom=joe.macdonald@gmail.com Received: by mail-qt1-x82f.google.com with SMTP id w8so4545545qts.4 for ; Fri, 22 Oct 2021 12:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oOAvYVewuBXcMtDKniZvN3A5FFz/f1HjK4hOkQj4LLI=; b=Dk2DIq7OUZUBDLGuIgFX4J/M1FvretC1cbkCYg8b7Jprlz8f4L7HW5TcNKHvXvFRdP qi0Y8nqfiA4UysJCKF1s/LcWV4Kh1KA23eHvKP/yvvcLoa3/28QGWOUeVkhYZGAj2RS5 rueyGMCPT09mwBU+JwQxwA1Jk8ttz+XMh9ES9zMbKkL7j5B0+O4dam9/n59QPxxn4ODs 7uAb0aYixJL3jdNBuIbOpav+4+bdQRjG3woGgtY6cHdNZBs2G5fL+mC8akzOQWSyE/zs h3ig2zKENCzroN5M0RXLHECZ/GVSOEn9pDq6GhK7WoKrFpdqSo9VBVkT0ZCeDqDXRvsV xN3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oOAvYVewuBXcMtDKniZvN3A5FFz/f1HjK4hOkQj4LLI=; b=yRTMKKU6Eu5dpKO1bU8AqiR2qbee6efHHcmdztAkVrO3ZK/i0S/7TxEUt40Z5bLJvW QIl/+yrqWX3dy77G3EyYbcafNk6/7hxP96o8rox/I9l2lQk4EPVfKs76Hq41iIX9mHDS 7kNSNlU6VOD6s0mGuZPK07tXZ3agBLYMRqo8tY1+dQn/RRKi3Ik/XzLcjVQZOs3hzTca 6jILxbrDh8TXqkMwt4VQVJO9PZh8defjyKh/NjRXoQElIGBUdssSgMt5592NkdXMe+Jb KM4nJ1/kpzx4Fo5nVKmZOKcCR6cW1YZVXdYYUftNEbHATV2U3jkzm+W1YHzPad6B7xRi ON0w== X-Gm-Message-State: AOAM530xbvbmRkvgNwFq+Gmt4qpj1KfCsitCdpRO0MkgnihepmkmFDb9 R1wSiu3rDFL9TykSNbRfTD545m/7BaYz80ri X-Received: by 2002:a05:622a:ca:: with SMTP id p10mr2021920qtw.207.1634932249657; Fri, 22 Oct 2021 12:50:49 -0700 (PDT) Return-Path: Received: from burninator3.deserted.net (23-233-31-59.cpe.pppoe.ca. [23.233.31.59]) by smtp.gmail.com with ESMTPSA id z6sm4873783qta.31.2021.10.22.12.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Oct 2021 12:50:48 -0700 (PDT) Sender: Joe MacDonald From: Joe MacDonald To: isar-users@googlegroups.com Cc: joe.macdonald@siemens.com Subject: [PATCH v2] expand-on-first-boot: support resizing a btrfs root Date: Fri, 22 Oct 2021 15:50:47 -0400 Message-Id: <20211022195047.262589-1-joe_macdonald@mentor.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <18299964-6809-d6a0-0f90-3ec6a785695c@siemens.com> References: <18299964-6809-d6a0-0f90-3ec6a785695c@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: vHvdsb0CMr/a 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. Signed-off-by: Joe MacDonald --- .../files/expand-last-partition.sh | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) 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 7175dfd..6975d9c 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 @@ -36,8 +36,20 @@ sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ # Inform the kernel about the partitioning change partx -u "${LAST_PART}" -# 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}" +# Determine the filesystem type and perform the appropriate resize function +ROOTFS_TYPE=$(lsblk -fno FSTYPE ${ROOT_DEV}) +case ${ROOTFS_TYPE} in + ext* ) + # 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}" + ;; + btrfs ) + btrfs filesystem resize max / + ;; + * ) + echo "Unrecognized filesystem type ${ROOTFS_TYPE} - no resize performed" + exit 1 + ;; +esac -- 2.30.2