From patchwork Tue Nov 8 11:28:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Schaffner X-Patchwork-Id: 2205 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 08 Nov 2022 12:29:21 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2A8BTKRK024954 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 8 Nov 2022 12:29:20 +0100 Received: by mail-lj1-f191.google.com with SMTP id x11-20020a2e9dcb000000b00277693bd344sf4998844ljj.4; Tue, 08 Nov 2022 03:29:20 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1667906955; cv=pass; d=google.com; s=arc-20160816; b=rzKCc2Degvw8RFA60zs/hz+PjFPaZHz8509Z1t5YrT5PTvPiDwiALtUSycoXwc2m4t NnJxvpFKgg3TXjY9piZgLnbZlfv2Dz2QqbIBYTxs5/WVe8zJSHH1Ieo/fz6P/L+3mbCn 91Tbbx7b5lHVwajTQgMl8/dJW45NjgGOg1iMJLhESDR5o/DuoAEr76M7txqHJ6m889Xq mLtFLkMzfUKv60IfzKw25hkLGLTd0byElOdZlARW2trWgJzzul4zpznZqc8C9cKR4EbT UWMuxRufKbK/2finKWRilJgyis9mm9TxN/M2U6vdon36EZm8emRJ/lxBfkFJ/muOKaVp hrag== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=HpDk/OU7JblUN07ySRvZeKJHssQhs1MTnj7OWe+cK8g=; b=eg5Ds2Zk/izdmzEFTjhVT9AR0vTlIUMEAFefMQdqgGpKx4niQHnYQQeTdvLYkRpb9+ LwSVNYImYT8hkR2hyZWcY/VPW0fs7CGozjYuAAVXlG/m6aw3Eh6OkpM8VDwTlixVFahM 2bHwuszz24wgqoiPYaba5fBAJYyRZa5mYsfWqNitWini5mvW+fur9OuBo4OxwJbS7ZYN 4G3+aeOLywKvZlapu3lGPOww9SLGcAXa132PqXOesGLdBvf1BL6cqnMuug+USot1Ax3m HJtMol64sXDpFVS9rtOlhEvF9Dz0vFGRlb8n0VjWmnAJY7LVilBxPUPOyVTffcfrGY/S gpTg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UStqMbn8; arc=pass (i=1); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.6.86 as permitted sender) smtp.mailfrom=tobias.schaffner@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=HpDk/OU7JblUN07ySRvZeKJHssQhs1MTnj7OWe+cK8g=; b=hJzcJkx+0q/d0v7U7Pb9k4tSteOfo7JMm06ndNmdDKGsWwb1ECWIYnA+/TqOu96MDJ 1fTIkTzQCEaPk5skB/J51NLSfgH3m/MLsFnHVFJc8GStthLlzCGxLGqGTRbcNSqFZOn6 NWrJK5tyUShFTtOeD1hy1ScNgQiLisK/Op6DcjaoxXli/MhNvKQ3XeZsTp18R8qfWpUh w6ZxvNFqJJrOWc1qhKorGKJx9VBMMWQOK7DmOl+yKhJARsdQGP79vNrDWRc24uzcnXnc +65ecCvXwkQgrmpyDZu9KbmLqSGAhl20ilXORBpkpY4s+09s9YqJxHueeigXVoGEGYKm c8Hg== 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: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=HpDk/OU7JblUN07ySRvZeKJHssQhs1MTnj7OWe+cK8g=; b=dcrpDOewusYg1xsoqcECIZw7P/HuzNjW3wHbGaADGzTiMhuw9HxGXAovKh00r4n94H 3XhX1rfui9xcsK96QWR7QozFk3d9B0gNoAp6+5o4woSAIX8rgvdhXjyIeIQiSuOYOdHh XrkMDTOJQsohd43QiESmh1GMZxj62aK07iWqtqeHGTdkAFIprxSA+zLKQZlf8aLmvsIx m6bI+YJtZlNF2H4sWlSIO0XaOUAZcBGbU++lWbBri745jaKa84Wr/LiJvCtqi/c0sgre yiZvlaDjz1ZWCtcDO5jivLLNbCH6F4VPC4xBijbRMVjRqJeLP6dJxXXpgFQRKBiwvuOh UOBg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ACrzQf3SOL7lVo1xayIJ/7WwVBLamM6UL5xSix9N7anNHQSRiKt08TvS F1nZtumtOATCm6mF7gw6Hd4= X-Google-Smtp-Source: AMsMyM5l72JgpUYYRo+WHzwBs7Viqh9gDlwbuJnltvMDdorr0s1dJR2Q3QvgPqA+az/z9BWwzuZ/Fw== X-Received: by 2002:a2e:be27:0:b0:277:4028:77b6 with SMTP id z39-20020a2ebe27000000b00277402877b6mr19336547ljq.160.1667906954582; Tue, 08 Nov 2022 03:29:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:358c:b0:48b:2227:7787 with SMTP id m12-20020a056512358c00b0048b22277787ls1977559lfr.3.-pod-prod-gmail; Tue, 08 Nov 2022 03:29:13 -0800 (PST) X-Received: by 2002:a19:c20b:0:b0:4a2:40e5:78b1 with SMTP id l11-20020a19c20b000000b004a240e578b1mr18958728lfc.228.1667906953406; Tue, 08 Nov 2022 03:29:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1667906953; cv=pass; d=google.com; s=arc-20160816; b=M8E1KVKmdt3stcQKTgicTSCt7xl66e0+rZJ3qj7HSXm4wVdYI/OBFANWD8WcK7jTyI lLs4ChiK2rTsuvrggx2cpcI1OJMZnpXhrZxZTWAgDDSKe8vNf1QBfXPrZyo3gWL00Ku2 PJgYFCrc/lIiHgDhG5FSoNgA7mmPOLBgjEOCEGidcZGQkzz50QS02YCiEIuwWhWE1PbZ vcDv96o5DnRxBAmgj5jrwQSj1vTh/DzeRRyKPrrEHO6w/2jVvRG3ssvHU+oBZyIp1Jby 6c3Pqeq/g8Lwj7vSfQZeS2vW2iuN4r+6h8CgLR8v2GmLJ3ULiScm3AUsv248n2AnVCOK Q3aQ== ARC-Message-Signature: i=2; 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:dkim-signature; bh=wD1qqDYZJwaSVDmnaXZIMQGoECCN1RcR4Yk+F4lSGf0=; b=oc/G0ylbVKupTXnGv23wI0WyIy4ffEQ5N/AtyA5Zk1SKBEyy6u1O4HuVt+F7sxCmiB 7oi5GsCRWEu3DneJUT7V7weGIAFF5WC4EOgPY6cj9p1Zj4WLy5CEAZDj0cvhxf5ij2ze q5e9iq74jkS5Yxle/DFJww1eKaYTQxQm1WSyXAOB+9nl5c6DdC8axz1XmofHJbwQ5Eri GCkhX86atFhttZ2FLzXkCshprGz6j2TIXwqDmTg3BJsFYoSdqYO+JF/EIb2FxS+ER0Ih NEnng7F7BQAY0icGY5O1VvIp37CnVHGbsyfp5Mcr5+ZBVKzQopQXLeXuzG3tBcZab287 OBnw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UStqMbn8; arc=pass (i=1); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.6.86 as permitted sender) smtp.mailfrom=tobias.schaffner@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60086.outbound.protection.outlook.com. [40.107.6.86]) by gmr-mx.google.com with ESMTPS id z14-20020a056512370e00b0048b224551b6si365877lfr.12.2022.11.08.03.29.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2022 03:29:13 -0800 (PST) Received-SPF: pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.6.86 as permitted sender) client-ip=40.107.6.86; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KAL9PskOzWzXqQkNQ7CbXHVzznch4mg2/cujL3Sz9gn7cyNLpoBVC8XF9pES2rZdqdRcH1+F9wr0lVfRfUXeh2IoVdqnRNpIj+pf7L8E3XQ64E1eU9FhfAH8iaLexKRh2MyAxpJkhx39U6HFu8BCvJ16+AfdhObYiyWXZcjCLUCbcUqTLCgOD7Ua5lfjG0RrDRlc0LHJ4gnOSXrgHCWALItq3w4MQMY5IumQNIYBB6axWjFhx1SRAZ0Lefh3q51j7VR9WiiVGDzyF9S7yX5jTfpFa4RhIJIeaU+9G9GI4wArwB4+s5UwKQPTCgEDL7dlWzaGOKFSrtTME8beyb4okA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wD1qqDYZJwaSVDmnaXZIMQGoECCN1RcR4Yk+F4lSGf0=; b=FMtOIE0C4JXqVgwlpRY5zlqya8hwBhnBz9tqKBzaOojntGGgJ2/oW9+3zWzfqLvYbDmPFIvaAsqML1dahZq5gYyXWcqWAUHgN5/ooagL21JbThfchOzJP0BE4oSlL2V9CgeK5A6xFEWTaCQKlx0xRwXQzP0l/pRQCoWEluI6xnzIhNEz2zxi78Qs7w32Gv+C5eS0gcQSwfMGZf0rbPFXzSsLTIoQq9sEix5YNcHbeewHI+whZhV8jCO9uTi7JBZtpkjm00PeATTQRKcEEsx5XLBaDJbxIG/ilHo+jSXEXI8GV2J9JQhq18sGOwliNCVkP3bFbmR4UlfE1gHjrltHIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.76) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from OS6P279CA0177.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:38::8) by AS4PR10MB5546.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4cc::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27; Tue, 8 Nov 2022 11:29:12 +0000 Received: from HE1EUR01FT065.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:38:cafe::b1) by OS6P279CA0177.outlook.office365.com (2603:10a6:e10:38::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27 via Frontend Transport; Tue, 8 Nov 2022 11:29:11 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.76) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.76) by HE1EUR01FT065.mail.protection.outlook.com (10.152.0.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20 via Frontend Transport; Tue, 8 Nov 2022 11:29:11 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Tue, 8 Nov 2022 12:29:10 +0100 Received: from L15-Gen2.ad001.siemens.net (139.25.69.126) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Tue, 8 Nov 2022 12:29:04 +0100 From: "T. Schaffner" To: CC: , Tobias Schaffner Subject: [PATCH 1/2] Check if last partition ends at GPT backup header Date: Tue, 8 Nov 2022 12:28:36 +0100 Message-ID: <20221108112837.435213-2-tobias.schaffner@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108112837.435213-1-tobias.schaffner@siemens.com> References: <20221108112837.435213-1-tobias.schaffner@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.69.126] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT065:EE_|AS4PR10MB5546:EE_ X-MS-Office365-Filtering-Correlation-Id: ab5cbd56-ee6a-43c0-e223-08dac17c756c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bTzMpxoisLszr5Mla14zlYCdujoeyM/ii/FY6sPTfklSynHO5mUMtNdipUqgpSyO5tv/zAESXbf7DvtL7wda0UKrf/4SjkroNhDAkvLKQJLn3j0y3/gTWYsc4nU06Nu7hgGt0ETofoobuspcwVlWWTkaVXuJDyKO0pwLE4E8t6edKQqZTS6r01L39RdDKKE7SPi7h00wdt6M8Cz1b6uHzXT4Etk7PAxrk0jdtGJ4ycVEDjdoHxjssDwdh/mOK2IKi4eqTjybnXVoZjRcwe3YdLqtqktdwBHLEDnK1ZiK1yBmRUTcOGp80tg9sujT9HR6Hx96qVjA3djYKWkW3ILFnovs81D0E5dqmveeKgV7ulAdq9JfT3ImfKzwTRRr0PZsV3Num73MSrLB1gqaDJeI2dzufuEf2PuhhlOPhLVL67kMC5JEQ+F9Urqnp4PMZRfNQtwlUv5ijNFhmgZ8/hjRrjniqdP/YhxrZBjZuq0RVBsx/75QReBy/w4YX1voYHOQ550g5QFrYt58WSHQiM+GLi3LIx8G7o1oBz04G+hfOz81TBg6gj4QDsI6E/NhVADJDWmdKN6jW8RDeTFU0vU3xowBD+A4IGVCrLlkf0F+yofAapX/sTXx30P5j0Kh0w9P8wAMe6IgIYikLoL3I9OgVZkZP4nURqTEZVrE4xM2BrpRFU5s77XS+QbatHvBpVQ4wWV2tmp8yCaJpo8J/xAcRQGN9nrMPwKC7Gn+r5c/IgUhSjWp5KSPElKDmS4pqGExC647pgYu2uYjfl0YU54yaErGy+UtW7DZowOPvYOnrG/KBY+5Vij/ELYjYuk4bCQX X-Forefront-Antispam-Report: CIP:194.138.21.76;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(396003)(39860400002)(346002)(376002)(136003)(451199015)(46966006)(40470700004)(36840700001)(47076005)(16526019)(1076003)(186003)(336012)(956004)(83380400001)(26005)(82960400001)(82740400003)(2616005)(36860700001)(5660300002)(2906002)(40460700003)(40480700001)(82310400005)(6666004)(107886003)(478600001)(316002)(6916009)(41300700001)(54906003)(70586007)(8936002)(4326008)(8676002)(70206006)(36756003)(356005)(86362001)(81166007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 11:29:11.5428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab5cbd56-ee6a-43c0-e223-08dac17c756c X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.76];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT065.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5546 X-Original-Sender: tobias.schaffner@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=UStqMbn8; arc=pass (i=1); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.6.86 as permitted sender) smtp.mailfrom=tobias.schaffner@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: Tobias Schaffner The GPT backup header has a fixed size of 33 512 byte blocks. Check if the last partition ends at the block before the start of the GUID partition table backup header. If so the partition is fully expanded. Signed-off-by: Tobias Schaffner --- .../files/expand-last-partition.sh | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 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 57055cc..0d662cc 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 @@ -22,24 +22,23 @@ if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then exit 1 fi -# this value is in blocks. Normally a block has 512 bytes. -BUFFER_SIZE=32768 BOOT_DEV_NAME=${BOOT_DEV##*/} +LAST_PART_NAME="$(lsblk -l -o NAME "${BOOT_DEV}" | tail -1)" +LAST_PART="/dev/${LAST_PART_NAME}" + DISK_SIZE="$(cat /sys/class/block/"${BOOT_DEV_NAME}"/size)" -ALL_PARTS_SIZE=0 -for PARTITION in /sys/class/block/"${BOOT_DEV_NAME}"/"${BOOT_DEV_NAME}"*; do - PART_SIZE=$(cat "${PARTITION}"/size) - ALL_PARTS_SIZE=$((ALL_PARTS_SIZE + PART_SIZE)) -done +LAST_PART_SIZE="$(cat /sys/class/block/"${LAST_PART_NAME}"/size)" +LAST_PART_START="$(cat /sys/class/block/"${LAST_PART_NAME}"/start)" + +# The GUID partition table stores its backup in the last 33 blocks of the table. +# Therefore the last partition ends 33 before the end of the disk if expanded. +GPT_BACKUP_SIZE=33 -MINIMAL_SIZE=$((ALL_PARTS_SIZE + BUFFER_SIZE)) -if [ "$DISK_SIZE" -lt "$MINIMAL_SIZE" ]; then +if [ $((LAST_PART_START + LAST_PART_SIZE + GPT_BACKUP_SIZE)) -lt "${DISK_SIZE}" ]; then echo "Disk is practically already full, doing nothing." >&2 exit 0 fi -LAST_PART="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | tail -1 | cut -d ' ' -f 1)" - # Transform the partition table as follows: # # - Remove any 'last-lba' header so sfdisk uses the entire available space. From patchwork Tue Nov 8 11:28:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Schaffner X-Patchwork-Id: 2206 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 08 Nov 2022 12:29:26 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f183.google.com (mail-lj1-f183.google.com [209.85.208.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2A8BTPH6024979 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 8 Nov 2022 12:29:26 +0100 Received: by mail-lj1-f183.google.com with SMTP id y7-20020a2e9787000000b0027728056580sf5000912lji.7; Tue, 08 Nov 2022 03:29:26 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1667906960; cv=pass; d=google.com; s=arc-20160816; b=sQN8l5fO11o8GRnXLWKUT05H6sg/qeKjU04BHz91k1ctySSryGvLu68DbF388r7jg2 vwpTS4o5H7Zl1o5EY1zlBFPqLXkaTPvx1rrIpCljAhon9ffd9gvWoqiiYTpoE7Tdz60m QraBKnfiDQu80lGMy3hHfABQ3b+PxYGWMExqpZcOmBiShhrXLN+fVSX4kp8I1IoGMAFn mWI/WSFmqoze6lHUkuX2q2o9hxBhj3ruMo0318v2seX1HAEz3QiRueOv2aaKRLuMjjAE QO73ln0RUBTpkkBvgw0e1tINBBpEN7HU+z8qbc9Heo73rb9YwKs2pW1GXuiNjJM+Cx4h gIUg== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Ug8WBzcVZmxknmy05Sg5UUYj0RE5P/qAup9F7Jz/XZA=; b=QT2d2A8x9tumIzxWueXWXhe1cgcaIc2Cb6IzCNzoNT492UC/glJca1P8/z1ngI+7A/ 3Nl1irFUh6kqK9b4/vDzYBdyWp7dbvy62d098IxMDBWqLANORXiNS5bA67awE5RC2B+0 ckuhSdLhykwbe8MVbpd8RFnZ+1PhrNORdU9JFDBGH6a4jIQJHMOMvtyYdnGSxWaAinCZ 2LgECVU9fcnN63z68OcFOD+OxHFjAMZoomu/0GhUcUBZ+qncqpxfuBX8fyQna7T/U1qp aQwWn403Dd8NBdiCvVofK4vlc/NbmyANnfKM1TD4kzjvHyTomQc9fELJRfzipUypIEkw uZbA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Ecqjgt2k; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.8.43 as permitted sender) smtp.mailfrom=tobias.schaffner@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Ug8WBzcVZmxknmy05Sg5UUYj0RE5P/qAup9F7Jz/XZA=; b=T3IPPqID9MiRLny7SxKPklZGxLwK2g86IrFc8dOcUkvOjBP4qtyghXoohqwIPQ7qrI BFl0LmqT59yewqk+MU2tu3tS/yKIU4gI1QZ69qygt0PHbPOHzaRfzyqqlx9jwd3n9+wi l7981dfQNFm6Hym+xU+IcPaw2hR4IlA3N1a5raoY3fnVqXYGIi4GjZNDgf/JZTwbgjQ4 PSJFEoTFigs/3Ga2PcJJ4nd4RNs7h9v9hvjBvXymXbB+ey1ZgqTFMZ4gNJ18Dhub90cj PgzdQJ3/vEpVmMithcrLbGIdVlOvpdbKG6MPDlqyxDxSE2hNjpCT2L0WJfTiRfyL6YXQ O35w== 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: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=Ug8WBzcVZmxknmy05Sg5UUYj0RE5P/qAup9F7Jz/XZA=; b=xUhTkASENLpIeF2b+UlRChaMalEt2+ZlpWE4cE0zuXgu7QAA52AWKYnfrpo79XRFM8 JOX1fGLNKd8fHfCHzf7bsuH7EkBJJEl98/2CTYcR6pIJDDDp6h0US/RCjGZ+PQ9DNMmI kLIk9GV+i6vxoVGE0IychFC+K9u06FZqME59qwMt3Z5nQ0W+6EDDKv+7rvY7q9VhoWMV YYNPDLX+B6zu7leazCLklV57vtjWMTISe2gbKj/lbyLXuvVlFairQ7i32PTzBMHkJupr aiHx5BskE+TXln5CTexNfr52o4TxqmpsvoIbFmvxpIMDu6wWb0AmGKNMVkqya9lkU9nO 14NA== Sender: isar-users@googlegroups.com X-Gm-Message-State: ACrzQf0Qy5HL6l5xFniJyuX9vAcb/i94GO6yK2noHh+gCynHZcm81dvg 3PySjtUH16R/6djJ+ZNiWe0= X-Google-Smtp-Source: AMsMyM4f3ZtlJkCVaUmmkoAtLoo4fTy53Yb6QxQEdon0KR6Emh0GPBfB1K33NGIJGAuplrsGgjcYaQ== X-Received: by 2002:a05:651c:1253:b0:26f:a402:51cc with SMTP id h19-20020a05651c125300b0026fa40251ccmr6966781ljh.208.1667906960484; Tue, 08 Nov 2022 03:29:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:58f3:0:b0:49a:b814:856d with SMTP id v19-20020ac258f3000000b0049ab814856dls1977285lfo.1.-pod-prod-gmail; Tue, 08 Nov 2022 03:29:19 -0800 (PST) X-Received: by 2002:a05:6512:932:b0:4b3:a51d:66 with SMTP id f18-20020a056512093200b004b3a51d0066mr4084007lft.635.1667906959369; Tue, 08 Nov 2022 03:29:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1667906959; cv=pass; d=google.com; s=arc-20160816; b=qW/6KKEN05WEqUM+4xYIy1pG/uX8nchKAOP5VEbjygCKsYeP/Gvfn+0IWb7Bfb8h0b SxhWQwaRnXDWxrR4UhACrnx+1WB8RljCx7rZZIcshRUBnHxBcMq23gvMYKIO2Zz4vk3u yhCpQQpQJyW4TwVLC3o+fN6ZG4bE9Ir1bsNkIHTdSz9axazljiIA7fFo/PjKkhPL+qz9 07g/3Jfy6hku+z7pnLzoYlUU58972RiXBs8zgV9m1yT9Xd+kouoSiHozi5twYB+WoceU HNgO4NPrwhXD+l6FRYoTokc0o25KmFB0XHBqBx1EDc/YCDKQKGNVkM+EecsmtEHSlS2i b5ZA== ARC-Message-Signature: i=2; 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:dkim-signature; bh=fFpZHS8ZnzzpErtslr7PzsqC2x8AshHGLCJccxU/qeQ=; b=XGWMj8qlHRqfVYpDoGsLByPjh/4XTF+1QdST/Cx5DA6OIBYPAOrFBDRmioIlyGFKIZ qOlfIyDaopflaUMBy5P0Oj1vogM/oefc2fsZ8YzsWw3jxzNAABm10jOKCrcvif6CB7MR e2Rz8mRxBuS18odGaY1O9ApnpDNN8hWE03KpHWcPEh+71Vgb4B/e92UQavqnO1pWt5lO +0qSXnIOk1hdY4XoA9eGbUTLc/G4pQdTUYEQRYU2jAXdlwlvTWuTMotBmQQGfej6t2PQ cs1PCFyHNsGJ1D9y30df9f9px6tFutDMbB4wBl2uDoRKmVjuXHkaE79OePP90g3v1igp e7Mg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Ecqjgt2k; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.8.43 as permitted sender) smtp.mailfrom=tobias.schaffner@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80043.outbound.protection.outlook.com. [40.107.8.43]) by gmr-mx.google.com with ESMTPS id q20-20020a2eb4b4000000b002772ff50da3si299026ljm.7.2022.11.08.03.29.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2022 03:29:18 -0800 (PST) Received-SPF: pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.8.43 as permitted sender) client-ip=40.107.8.43; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nbONtkpSpSS9GN8kzCU0hGH+hVNvFiGr2XHsUo/BVVauqRzuiPOi4n5m31X/OBGSSJH/6SU0MSbDaRaJ2yX7TRGi33TWdKt0GMrmtNUG+mxuUnxgpkf8KSRGhXjS3+lc0etozwgBH/Vco45qj3x6w/hUBVGteu/4KaXpNIgAQ/oo+uDBQ3MACaa3oNQ45YwVMzhJhCDdYJOBU05sNLUdSzVvL9jn0cATnQTseiRUQLmWSKyiSQuqiYk4SWgqYHxxjljpMneV0q6DDlMZc02J27GLKWzosNfj3OjrJaIMLd1pIazAztlbrJiOzmMnKbye4qqOufDkOmVgaDz6y5sKtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fFpZHS8ZnzzpErtslr7PzsqC2x8AshHGLCJccxU/qeQ=; b=OQdJ1q5nN7sfIJhaKxFmiH/s6xffI/an/9ub9GS0/dAYCAvNopKJuKkQ2Fi/aCc0jgqO5vU4n5S1pucj7k9y9tGr6gVSa+Wr7bxCFGa2RvzzfTUem+HCXCFjR5HzMVwylrsbR4LdSB29AsSaFHsAbqt7YWzb9vu397eHRC/k1PswHEMbOkf/4EceOowVBtVuJuuSGO4OyDwPb6c2WSMZV3Y9gaeJ41LuaJpBroSLkUa9FjHtdl2p7DqcMpSNTv/dja10CPHed3r06SlrxpPrwO9ARKFsJEqFxR7y29p78EbooaYB0mmpn+BbFo6r0jrabp+VVzSXpPCQ89Bn8nSVcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from ZR0P278CA0110.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::7) by AS2PR10MB6733.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:55d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27; Tue, 8 Nov 2022 11:29:17 +0000 Received: from VE1EUR01FT073.eop-EUR01.prod.protection.outlook.com (2603:10a6:910:20:cafe::96) by ZR0P278CA0110.outlook.office365.com (2603:10a6:910:20::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.27 via Frontend Transport; Tue, 8 Nov 2022 11:29:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.75) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by VE1EUR01FT073.mail.protection.outlook.com (10.152.3.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.20 via Frontend Transport; Tue, 8 Nov 2022 11:29:16 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Tue, 8 Nov 2022 12:29:11 +0100 Received: from L15-Gen2.ad001.siemens.net (139.25.69.126) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Tue, 8 Nov 2022 12:29:09 +0100 From: "T. Schaffner" To: CC: , Tobias Schaffner Subject: [PATCH 2/2] Always try resizing the fs in expand on first boot Date: Tue, 8 Nov 2022 12:28:37 +0100 Message-ID: <20221108112837.435213-3-tobias.schaffner@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221108112837.435213-1-tobias.schaffner@siemens.com> References: <20221108112837.435213-1-tobias.schaffner@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.69.126] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1EUR01FT073:EE_|AS2PR10MB6733:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c450ce4-a15a-4156-bf15-08dac17c7855 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JiatQUZWxG4zuZ5skkYxFadY8JYXJpL2bTn2hhJb7xESt1ZcR4QGVcq1oLDYZzXCfXzW9k4qIdPyqkjgFIS9ka6oI58Pv0u7iGhVRCP0W1Za1ttyb808gyRijhNOthAEI9rUkgzbBo3+QF7P15xd2RuCBZSxthkdT9LRx0aaHAklJAkjVdBRsoVjS0HWLjshGambZbUyezHUsIvKY94Ta0KThnkOI3uiU0lh8UIYRaSq3FUy7m3kNkmXwhHPZGNdn0XK7HjbCOnQbR9BjF81EmIxntcKVhS8we4y/CllUiEsjnuEjnIMW3HQr143z/hw//lp132cFfH7AmokY7DlItdxiu3FSMA4/+VTwd4Awa/fkw4voO7jN2LBdfEUU6f5ch35rD7zBdpiraGOWsI2YpOnQc00Y36qDRqwT+rO8fFMgqSCdfpjsgUcrgBzJp9iY6pBk9QUSWFwoBUvPzMUhjiEaZy0COt5veEQlnHhYyQa7hQs1xioSTFAzLGPBsI4kvIBxbKwCij+MqDx6Oz6TovUC3so638b1vJMuN6hmf/CVw/Z+PM+lHVoE20qOqDjJ22I9jHvdPHfAjf4fqpt07PuE8dz3PLbCcFW6DcVU3qLuzD04g7KCBoNI7Pyc4mu3Aqy6w5NR3WEZmAHdKBkyzvfizD0pDCom3uQBxUZoHar9UJsncAOMCJGXQMHdCEtAgj9z2rpYBY8bcSb3xjtUqQhEai93vLhXCGtTT024vDy9TNMutb/h+QWKrX6LD1fasdHLvRNDZnqAFyou2pboX5kcclx/CtQZa8kjbkvFEU= X-Forefront-Antispam-Report: CIP:194.138.21.75;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(346002)(396003)(136003)(376002)(451199015)(46966006)(40470700004)(36840700001)(36860700001)(36756003)(86362001)(82740400003)(81166007)(356005)(5660300002)(82960400001)(40460700003)(8936002)(6916009)(4326008)(316002)(54906003)(70206006)(8676002)(70586007)(2616005)(82310400005)(336012)(47076005)(186003)(16526019)(956004)(1076003)(2906002)(41300700001)(83380400001)(40480700001)(478600001)(26005)(107886003)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2022 11:29:16.4712 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c450ce4-a15a-4156-bf15-08dac17c7855 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.75];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT073.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6733 X-Original-Sender: tobias.schaffner@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Ecqjgt2k; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.8.43 as permitted sender) smtp.mailfrom=tobias.schaffner@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: Tobias Schaffner If the filesystem resize fails or gets interrupted we have no way to recover from this as the script always exits if the partition was already resized. Check if we have to resize the partition but alway run the chosen fs resize tool. Leave the decision if the filesystem has to be resized to resize2fs / systemd-growfs. If the filesystem was already expanded the resize2fs / systemd-growfs call is a noop. Signed-off-by: Tobias Schaffner --- .../files/expand-last-partition.sh | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 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 0d662cc..b21b958 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 @@ -35,26 +35,23 @@ LAST_PART_START="$(cat /sys/class/block/"${LAST_PART_NAME}"/start)" GPT_BACKUP_SIZE=33 if [ $((LAST_PART_START + LAST_PART_SIZE + GPT_BACKUP_SIZE)) -lt "${DISK_SIZE}" ]; then - echo "Disk is practically already full, doing nothing." >&2 - exit 0 -fi + # Transform the partition table as follows: + # + # - Remove any 'last-lba' header so sfdisk uses the entire available space. + # - If this partition table is MBR and an extended partition container (EBR) + # exists, we assume this needs to be expanded as well; remove its size + # field so sfdisk expands it. + # - For the previously fetched last partition, also remove the size field so + # sfdisk expands it. + sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ + grep -v last-lba | \ + sed 's|^\(.*, \)size=[^,]*, \(type=[f5]\)$|\1\2|' | \ + sed 's|^\('"${LAST_PART}"' .*, \)size=[^,]*, |\1|' | \ + sfdisk --force "${BOOT_DEV}" -# Transform the partition table as follows: -# -# - Remove any 'last-lba' header so sfdisk uses the entire available space. -# - If this partition table is MBR and an extended partition container (EBR) -# exists, we assume this needs to be expanded as well; remove its size -# field so sfdisk expands it. -# - For the previously fetched last partition, also remove the size field so -# sfdisk expands it. -sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ - grep -v last-lba | \ - sed 's|^\(.*, \)size=[^,]*, \(type=[f5]\)$|\1\2|' | \ - sed 's|^\('"${LAST_PART}"' .*, \)size=[^,]*, |\1|' | \ - sfdisk --force "${BOOT_DEV}" - -# Inform the kernel about the partitioning change -partx -u "${LAST_PART}" + # Inform the kernel about the partitioning change + partx -u "${LAST_PART}" +fi # this is for debian stretch or systemd < 236 if [ ! -x /lib/systemd/systemd-growfs ]; then