From patchwork Thu Dec 15 22:16:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2329 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 23:16:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGK15013479 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:20 +0100 Received: by mail-wm1-f61.google.com with SMTP id h9-20020a1c2109000000b003cfd37aec58sf315827wmh.1; Thu, 15 Dec 2022 14:16:20 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142575; cv=pass; d=google.com; s=arc-20160816; b=hTqVTZY3YT+tur7LKZcHojrz14rbKzOOAyDIsZ2d4Hn6nBEdBSt3uNgTvZnxoUfSWY FM0yW6yWcbyYnXXm+NiYDF1UJ+xn82gHdl7SY3LHHYecn5GuqXlx1uktwQrFEB7R8bIM KZ3y6abZHb332yncbr/sSHbh4ulbFxbR3H/W5+57DB5XyNFeI9Nh+XHL33XNYsdm6sf2 YnJEh/Zp9dYN9I47Yi63aa1cb7rDx2nEyJ4SeJKiqcNFdOYX52Agx0MFys83udJphXF5 DYEP4ETuh1IhEF9v4z5O8ifdug7CGeTujxMc+5Q9O3Bm0hf+bVdr4K5/8/QTQJxrD+DA tRzg== 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:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=zLjADIaQEu/k1plWiRk7SgC5CdUeCmbSmeTKRvdXCdY=; b=vmlL1jDaoKR0rmJuk3ddxo3CfRp/zJsA/wNAoge8vlGAy3cZsPUsWhwQ6b1nkfxxAQ 3KeyPGGzOW8l1Er6KxnMjEXZb8rweIytN7uX7SfB1NvPA8fuZE9xar03QkSczdr+A8A9 XQ6hOJyg+66o+vedeNR9mfpEgq+N8hbqdnBpQKgWBl3OTlm2vuOMs8hetN0dRMHe/gQl UVe8w+iP0XL3JYE7Lr9e80mG6Qf/m8M9V8jRyCHgZdDB86P4/VAN7MCXw3Ss+NmF7OXV TeWDi592wDXQcFPtOqaWdWE4/sohSb4f6DpwX/GZb1D43BU0w1PWM/eMynmOqlBpM4+B lDgw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="L/aY4DOn"; spf=pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-202212152216134f3d5605de19b49380-3eCe98@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:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=zLjADIaQEu/k1plWiRk7SgC5CdUeCmbSmeTKRvdXCdY=; b=oXZiN37O25f1ygYRhrpMd0EZmzu2BcujiDCKPns68b9UKMvZTDtgIWZ/iCf1f/eGQY tmmlxloh8XJH4QJ2uRxNbRkq4ufLNQ/a0jucmSuscVAmpfHOenH9gWG2qRop8ApD4W3a Jp3VcG+gt8S3EzX9ZKr93Qn3khGPQgt8qpzjpw2XeI5hoAsfV0BYR1SwstDvbLo+I1Yi HDgcS1LVLblTlgrkK3z/bAwVMdMdAKGCJD6YwwnBJm5tTJSljwZyQYK6//CneZMARo9N 0MrXdIJgEmOvS25JHAuYBWdwCXubJD5qmxLLi4IXLIQRlnX30IZnHioxquyPuFt+ux+/ vesQ== 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=zLjADIaQEu/k1plWiRk7SgC5CdUeCmbSmeTKRvdXCdY=; b=iGj6/ClJEUp/CJAfxj55kBSNSrNFI7qfZ8x2VjtNiSUcH0gRNiCwOnlsVzH9Ur2TBI HJqD7vARYfn95Q3lpwBNTWbg5Re5fV8BrsmTc+FCufPqXCB3M4XOKCvc0Qs5RQBikMrc 7Z0Quvq+n7nhuZ1siDJfcbLrntvj87gO9mkohC7h64kSPlDzGHIxujkhSnsN1Qm8Lr6n LCX/ghNqXk2OB33wn3JGG+buy4Zk1V34YDbntEUn5Y6yzy5CfCvH9970OOXvJqyrvC9Q rTEnIcNcNxpnBnyEdnULVQvdkKF51wJ7m2sjxi7uGeouyQyqtwcOFEN4CETFK8+X08bR tInw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pmTli575mzupRCkoMUBlIu0JM0EgF3X353GUj3HFjqnY/92UVn1 35YLH+z+XhLE16FJOvLyk58= X-Google-Smtp-Source: AA0mqf7H7Zrnl7Ml6Xyldpz/hw6tUfRQS2WU2ZoJHnRpkunc2MIMBCFdflO2FRVG6hqlUkot2tFxcg== X-Received: by 2002:a05:6000:81a:b0:242:6a15:e257 with SMTP id bt26-20020a056000081a00b002426a15e257mr9815355wrb.624.1671142575004; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:230:b0:242:2700:8318 with SMTP id l16-20020a056000023000b0024227008318ls763025wrz.0.-pod-prod-gmail; Thu, 15 Dec 2022 14:16:14 -0800 (PST) X-Received: by 2002:a05:6000:81a:b0:242:69f4:cb75 with SMTP id bt26-20020a056000081a00b0024269f4cb75mr19807673wrb.54.1671142574175; Thu, 15 Dec 2022 14:16:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142574; cv=none; d=google.com; s=arc-20160816; b=hIufuy7ysASj3SiC8pB9+93OzQljO4Inl+sCpidSXwAHebl4mXGEBx2S4UFnM2aI7D I+EKVbOHW50tHiToO8raqlVoRAXUyp87+3/9z+gymGfyvs/T6Ov+CjzQYK+LS65/4BnT VWBrk+9PplhM+xbfzZPOW6/HIJWIXMP9FkZkkdcAcMG6ls5eHuD/5f1ZASU97Bc8Q/HM AZOhYUberY8W/VrAp1bmCDnoW0smDuRG/x4oBkYAc8GRZmnORfLhem77w0g1Szfw4O9q RMdaJ6Bf3JGw/hYUJpduDww075v0UEkKnW9FBNsjXAThR4aAXonH6anr+pc4/I9pfm4e RuAQ== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=AFKtBPc6ffjJLrWu1Urkzhv+pH8F9Mq9kw8C7xeW1uo=; b=VWkHQQsuLykFz0XvVK8GvSpESbvP0kLdZExMxqF9eRbuQlTs2yA0o0UazblWluwuBG n7d6huCVt45hxDbGAiSSl2cmIMzWbokSJSN5sK1KdmoFBO8FxiiMzfwiAuE/3ycYnaei cTIUHR21xUVUNcD+yomSOyG7qhaSDP97Tu09zKiEmHUEGLih+IGNrHSnucIKKFuqUTul 8i4TQDc04lYK1RgEwN4rYSvajscglTwCPRl9mtOkEiSf/oTQ5c9L79e5KrE2fAJqGC8p fcPI3ycy/VOTPBCnGkAfNBtAo2qn+EkhIwM9wd/9bPwq7BS3Va0pxAnsvqaqwN2XkV3I dQ9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="L/aY4DOn"; spf=pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-202212152216134f3d5605de19b49380-3eCe98@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 cy4-20020a056000400400b0025664a2d85bsi27933wrb.1.2022.12.15.14.16.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:14 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@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 202212152216134f3d5605de19b49380 for ; Thu, 15 Dec 2022 23:16:13 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild , Joe MacDonald Subject: [PATCH v6 2/6] expand-on-first-boot: support resizing a btrfs Date: Thu, 15 Dec 2022 23:16:02 +0100 Message-Id: <20221215221606.5623-3-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-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="L/aY4DOn"; spf=pass (google.com: domain of fm-52304-202212152216134f3d5605de19b49380-3ece98@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-52304-202212152216134f3d5605de19b49380-3eCe98@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 This adds support for resizing btrfs filesystems if they are in that last partition. It also prepares for potentially other filesystems to come in the future by introducing a switch-case. The mounting logic is taken from the systemd-growfs patches we had to revert again. Some filesystems need to online for resizing, but in order to find the filesystem of a partition (without udev) mounting it and letting the kernel detect seems a good idea. Suggested-by: Joe MacDonald Signed-off-by: Henning Schild --- ...oot_1.3.bb => expand-on-first-boot_1.4.bb} | 0 .../files/expand-last-partition.sh | 31 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) rename meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.3.bb => expand-on-first-boot_1.4.bb} (100%) diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.bb similarity index 100% rename from meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb rename to meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.4.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 93eddda2a3b7..7d658864924b 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 @@ -62,8 +62,31 @@ if grep -q x-systemd.growfs /etc/fstab; then exit 0 fi -# Do not fail resize2fs if no mtab entry is found, e.g., -# when using systemd mount units. -export EXT2FS_NO_MTAB_OK=1 +# some filesystems need to be mounted i.e. btrfs, but mounting also helps +# detect the filesystem type without having to wait for udev +# mount $LAST_PART out of tree, so we won't conflict with other mounts +MOUNT_POINT=$(mktemp -d -p "" "$(basename "$0").XXXXXXXXXX") +mount "${LAST_PART}" "${MOUNT_POINT}" -resize2fs "${LAST_PART}" +ret=0 +# Determine the filesystem type and perform the appropriate resize function +FS_TYPE=$(findmnt -fno FSTYPE "${MOUNT_POINT}" ) +case ${FS_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 "${MOUNT_POINT}" + ;; +*) + echo "Unrecognized filesystem type ${FS_TYPE} - no resize performed" + ret=1 + ;; +esac + +umount "${MOUNT_POINT}" +rmdir "${MOUNT_POINT}" +exit $ret