From patchwork Thu Dec 15 14:27:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2323 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 15:28:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f58.google.com (mail-ej1-f58.google.com [209.85.218.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESBwq011761 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-ej1-f58.google.com with SMTP id qf33-20020a1709077f2100b007c155ab74e9sf9693236ejc.18; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=IiYG0OT+CoifJCTiY44tucB0jdWAgGS9meNqVeo5ORiZ6K7Hr42d8XZSiBYMbxdtaJ NuLFIwkiX1fdZKY/f0aBJQ6bcGrqYXTTvuPwF4P4fCZFlEVjwz5yfiGSkcXKGOyxqF5L RrHGD2Mf8T3ByY4BDBLpm+1QHg06gWBntQ9tzMjBTugE6g35mmMgX9gL+o2zBYgkUr8s 2cqg0VFjBDiGoFWmgHzre3aWto9p70V64kvPeW5n9ZbbxWh3wxCLi7H1Q0CVfCQ7zb0k RVrCI1+Y9lBivKId3UFSMIoqCTuQZ/jOX7M85TKgZf2bvCFJzstiS7wvIN5xqZRHgmqZ evTw== 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=9o7x7T6Bia8gdrvGSsGyQk55vb0c7aZVoNor7/m/djY=; b=qnrTN6GIkiJ6IoDiDZfoMpls0DuIY+uvwtxd7UZ+IuTivJYsuaOnChPb4eu74bMgql q4tQU9bVvOVQfpZBQfTB8Its1ZyYW8+0kd0f4T8QRzCMbbyUiu7r0d3Ry2eyK7+c02Dz fjVfRETUHzFPppHu1B99nGMpIJagk+eWOF2gdTb6E84nIH7VBPF/CpEJfdOU2oOSYFZ7 cPHzPMfg3k8M+Az0xHLXPZSNnqyCaZnccQ5qlZVNeuP6Chw/FHCU1498cLAaNJ44FGlL 9SckyeTJeortOFCYf0D/isur78AUi+NnJQYAxfBnkeFA/k+fLc6eLYtcxyJgq13yK1yv lxWw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V+jkZMqS; spf=pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142803665d1745c04eaccc5d-4t9cBQ@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=9o7x7T6Bia8gdrvGSsGyQk55vb0c7aZVoNor7/m/djY=; b=pGjv5H/ggDmnyonL76rQkKawIdGqy/oLa/R78P7HIeOCzV3X6cHYUp+zfItt0lBalt dChpQIB1sGveMCg786aeH7SLcb2dnwDF5sFSD1pDQr6ZN6nbpMpP0ZNZT4+XDx8jkOZ0 wso5xpq+wr5oOEf/+LAXrncPXZvKrKxxJSI9+S95PXWn904qnsKc+SlHo710+f0GCQDe r04UW3x1ydrbhyDJLMPtngMm+fIaeUKmVa/Ru17TQZZW+9EdFgGF6Etplch3/i4qBgUX yZ4JNFNuaw/EpcfKbq4g3dVhlCxgS+q4qhPUnJ43PHsbFi521SHz7VlkUaBYU0GXfEmx 7PiQ== 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=9o7x7T6Bia8gdrvGSsGyQk55vb0c7aZVoNor7/m/djY=; b=eLqTriGdvmFW7kc9TYVZ399IC3hJBv/aOtr6l7Yp0c1qstY7VeaU7WDfzQd8CE1xDs YBFGa/ciw9ZL5vyFBJ8QV/UAci1nGG9wf1Dnurs5pAMk8QbXkfpNpGzHOdKGSm3fx8yC uu1frQPGdP0jDKSCbEU1WGjoRZ645iOh+u0mQJFN8iCmEaAKYmgWZdWrX3G3MMTKywU/ PpYx2M+D+VZR9dDKQ00PztOkaDf1YwmbJ/e9mgK1t5w4d7C+VmbElVifNsN9BnCZZXQ/ R61Q1WxHrOS41hxZq1xE2QPLuvTC5i8DtN0OteKQWu7m9vdw2gvEvWAqgI69Sk4sn1p5 HoXQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5plpYc+x2qvJpQK/mmgXZqDjBpsyYK/ZQKJGJFg8fOEv5VibzhXT jFF2BQnV2lCD3cO1JqDOcW0= X-Google-Smtp-Source: AA0mqf6e7QdvTI/GDGdkcwRFQMqv43GKpYnxSLkKcYmTcagl3hu1C8LKIHWKjv89mfi5Dgiwjt8jQg== X-Received: by 2002:aa7:da10:0:b0:46c:43ff:6961 with SMTP id r16-20020aa7da10000000b0046c43ff6961mr25220188eds.14.1671114485567; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:190a:b0:45c:bfd9:fb45 with SMTP id e10-20020a056402190a00b0045cbfd9fb45ls4791968edz.3.-pod-prod-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Received: by 2002:aa7:cd78:0:b0:46c:be9f:7c3b with SMTP id ca24-20020aa7cd78000000b0046cbe9f7c3bmr23279397edb.19.1671114484562; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=084GrTyNS/kIhcvUMGTDtcV/0tXqNZqXb3ECLW+O1tfNvhohW9RejkCnOi3mAabsUA Rm5izNDUJkqBaIypDhDEHprmAsz//ZmRhhz20l3ARS8OMtduYnz7T9jtCt6H2srSLIJn jr8d3+pICxgoILogD9710zcTivRRLuWjX6qbpANsVDlvj6oKYveaIs6XxwBUUNWJXgq/ RhcYkhQpE0NSN/5ZuGn9X1Kj8hDOmjLcAlrJGeE+Dq9FUa5dLtoHs0fTszcSqodZuv9H YR6shzfb/FDBz7eqdUZRjMOhP7xkZOM1g4YChu9a0qX3zOWVjjQNqgtLgy+0HMVEzIla 8nhw== 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=Dbw68Ih8nBWlt1Bo2w0VuFeoSiSGlqoMVywCBr2+Am4=; b=c9ydJqxc1C6W1CiM3ph0dN4Dg07h3waY4AIoSefryRfvZTuDGikrs3GpyrB4Rru8Px qdpQ2zYSnuAj0TRQ0PKBVSkKHjDI5vDvMjDTANs1JwyaPc7NpVMRf3+GksqD87d2FAVK zINMfmztX+A0X5Tg0XI6gyGeEuIP2Qgfvw3cKEJJ1nDTim23iUri50YAXW4r1aTBsnuB +BlydOJzUBwtog/dOcFmLcI1cmTDNRUbQ/8svWCW5h5RqltFBWxv4El0SNS+FADPxSBS ySh8bAiAq2YTnt0TWBzNF4vNPVHQ6Y0UFStuX3zpKkYxM+WUUpEwXvic4bKzNNSSipiC P30Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=V+jkZMqS; spf=pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142803665d1745c04eaccc5d-4t9cBQ@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ba13-20020a0564021acd00b004704657766csi361090edb.1.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221215142803665d1745c04eaccc5d for ; Thu, 15 Dec 2022 15:28:03 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild , "Roberto A . Foglietta" , Joe MacDonald Subject: [PATCH v5 2/6] expand-on-first-boot: support resizing a btrfs Date: Thu, 15 Dec 2022 15:27:55 +0100 Message-Id: <20221215142759.26327-3-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-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=V+jkZMqS; spf=pass (google.com: domain of fm-52304-20221215142803665d1745c04eaccc5d-4t9cbq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142803665d1745c04eaccc5d-4t9cBQ@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.8 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: Roberto A. Foglietta 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 | 35 ++++++++++++++++--- 2 files changed, 31 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..753b8c33399c 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,35 @@ 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 --tmpdir "$(basename "$0").XXXXXXXXXX") +if [ ! -d "${MOUNT_POINT}" ]; then + echo "Cannot create temporary mount point ${MOUNT_POINT}." >&2 + exit 1 +fi +mount "${LAST_PART}" "${MOUNT_POINT}" + +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 -resize2fs "${LAST_PART}" +umount "${MOUNT_POINT}" +rmdir "${MOUNT_POINT}" +exit $ret