From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7163605801230139392 X-Received: by 2002:a5d:64cd:0:b0:236:6d1c:c1a2 with SMTP id f13-20020a5d64cd000000b002366d1cc1a2mr39385062wri.360.1667983960481; Wed, 09 Nov 2022 00:52:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:238:b0:22c:d34e:768c with SMTP id l24-20020a056000023800b0022cd34e768cls14605168wrz.0.-pod-prod-gmail; Wed, 09 Nov 2022 00:52:39 -0800 (PST) X-Google-Smtp-Source: AMsMyM5UdkpSEMaC4QArHt6DneYywbOhYrzdanN56kuNhydH1VGDCxkBWujjBRsJs2DiNfCrwCgj X-Received: by 2002:a5d:6c6b:0:b0:225:dde:ab40 with SMTP id r11-20020a5d6c6b000000b002250ddeab40mr38417551wrz.690.1667983959402; Wed, 09 Nov 2022 00:52:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1667983959; cv=pass; d=google.com; s=arc-20160816; b=hZ9eo5YLA48PppTyzXWidW37FD3M63nBY7xtroTB/6fFVhVPVdC4DEh+nl4N9VXvQ2 wUUrFik/De+el+HSob9/sDz5hrwpzFgoC9FcfCkNJyIQWYb01tfjhgu4gWIaMcIBwZdB YeFFSWZ+4eNkPCJg+bZ3iwWCLA03gmoXbZtG/49+kl+1/1fbwVrWRxMShY2xSPzM6XQZ SGwrXhV+01FU5QolOM0jaEDrYbwHLu5/qJMYF62YeMJDwP+bUUrwtGpgfyWvimjnOavO FFrfFQve60nmI63C67sF13fPdD9NeH/v+15KREudbbgWcwVzADHCtXBE9PvgOFr5JFTI Lj7w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=mPNtKHojtUIu1QHKoxNF2qVY2MNqIZcGldBJT7QJBA0=; b=oK4a1uQUbetleoS38rkodwkZVPz+dXI9xwgnrWqa3B6DpIKbJQu/CojARfen4CCmZJ rdwIuf8JdtvfzqKf9eTKwkrtXcrTlkXcllVyMm6GNi/4MrhC+92stgBLEK9PoPuD11+K gGM0JRz6n70E+LuA2cMscRpKMnvmdcgJejvdTA5GUlmicNXvYx6xsrFlkUbiaZSKiCv7 w+lIJGqIrzrjy3qtWA82zwKccC3si4bOmv2O9mT9PAIFHC7w5ywZ9mQONyRVsdIDdJw4 cRdTZujyiT6VX/WwK+MXM4Wl7yfrA5bkOuWTXhRxpG6wElORVcaB7hY8yMrMJda6AWa+ ONcg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=J4drO2MY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.45 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2045.outbound.protection.outlook.com. [40.107.22.45]) by gmr-mx.google.com with ESMTPS id l3-20020a1ced03000000b003c4ecff4e2bsi24303wmh.1.2022.11.09.00.52.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Nov 2022 00:52:39 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.45 as permitted sender) client-ip=40.107.22.45; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=J4drO2MY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.22.45 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JZc12J43/l7ruTERAkz2PHizPCAlYTDmvApQwDZo0Hrtk0PgHGdg7Gy8Ru/rltbQCvjMJydivEwNuBJOUsBD3cYLn9nOExvFRjrlLnHut7rJ4wiUNkiA1wZhP7AVd04PUQVxm0H/GLZ60QRzfVvX4onOCPoC+V0kK8iPBIUBu/c/ETuP0GTt42+qHDNobiwiLD5J5/3rEIBlioRzOXfE072HIQTE6QuZorY1YBRyId1cCmh9TaLP689+eg7t+QgbXY8xQCNejBhq5ptHHkuicINBVoWkV7BtcoII+oAe5jYxI+TC/uhQJnbktsk6gjipKGSVtJ/UARXWmy3qpfeozA== 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=mPNtKHojtUIu1QHKoxNF2qVY2MNqIZcGldBJT7QJBA0=; b=Izkgi58eqf7scNVVA6/T0oCAa91/mnGYHE9taDoDLxM4GrRb+SiwgTA4TdQoyr95UznPSXl42OZg1LuIj99EFABU7ZiPuBJKxrIJcMjWeRFYHbwx9WU8JC1zQID6IG8gmSl736RrpuhhkuIyzh5lNE1uOf2cDHlpMRf7GNqCAuBpkBO88U5aApIgjFKOTOxhBiSL8b9900aQDV3jRIjA7XAyXPQeePDGVBpdWpQc8y39kanozmgQrPyivK6zjviIYqiyUe1wXnqK6ModHdPe9mupGl/1Ei2WEYik2SQMpqbxAKChJxNqM5bDUm14gsa3siXaaH1ALNfxZLjf9B0sqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mPNtKHojtUIu1QHKoxNF2qVY2MNqIZcGldBJT7QJBA0=; b=J4drO2MYXe50M30Rq0N8vwzKiB81mhcoFdwUuwdWUmGVZj5PUCEZDREaOCt6FyTwyZuLJisGUyohP8+QYxJTNG9d5s3tXne+vA6fPm/XT30r4zqrJ32SrM0NRooZt/cba3XEqEdd1nUxEFSdOFC1L4B9gF7WtgCZ5gnRooGJE8yVJh34zNo/81yslV8K2m5/1fFObOh/UM73ZP29odAbxPgNmU9DRAwysp6nF5jVzBLjzKWKJTUilpNIKHa6GFkNYNrHLFdcqcFCD0wyQ+Rtl4CXvOa5Bl94300iBdKuEIjHcDVSk0vPBQVrGAfUMfCtkx1WPgPdWkFCTb2a3LMQWw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by DBAPR10MB4042.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1cf::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.25; Wed, 9 Nov 2022 08:52:38 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e9f4:4305:f82d:1abb]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e9f4:4305:f82d:1abb%3]) with mapi id 15.20.5791.027; Wed, 9 Nov 2022 08:52:38 +0000 Date: Wed, 9 Nov 2022 10:52:27 +0200 From: Henning Schild To: "T. Schaffner" Cc: Subject: Re: [PATCH 2/2] Always try resizing the fs in expand on first boot Message-ID: <20221109105227.1ebe06b1@md1za8fc.ad001.siemens.net> In-Reply-To: <20221108112837.435213-3-tobias.schaffner@siemens.com> References: <20221108112837.435213-1-tobias.schaffner@siemens.com> <20221108112837.435213-3-tobias.schaffner@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR04CA0016.namprd04.prod.outlook.com (2603:10b6:610:76::21) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|DBAPR10MB4042:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e948779-4854-40b7-b315-08dac22fc0b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8149f3SqOa9PknW59KLqA+kRbtVF4W0g/yRzLuj5xN8nz/8uDOk3QmFUQxRvNZ64IAcfetwUW6uivcov+6dHsG7ZSkpJ4uWhCvxNmP03fUENroL7RrXKVgtLAu5FQ4pXQMPLOmSZeTzmc+h9ej9oqzYnnbpJ4rBFt4sEnZ4ftyrHlB3ZO7gJASoPvOSKfVEO9tzuR/WBV0VXIRdAMOX2Ca7++XiLVdidMEaToJgHLFqJn0JTLF7OxXLGOUYX4e1ACIK4F8mPn0f5/T9NKd8eU6yb9M7MgIsqyQTnWLw9mosaUleO27KapcvL5L4b7WXA9krC0k7HDFqVz1WTCDuIDiJt+rMXrkjZbCPcQbcM1y06dHsaFoq4t453ogElQ6qf01KsVyPS/sYBBwE9VxUgNVSKe5d2N94j/QOHc1UTV7JjL33klVwPjQv5BfvvbvdOvovNNstFfaj4m9g723WwbisPeYw6zNFBWh5Fl/bb4QERvCoYtpBlWodwsgOjouupRNHvJOgRhGailBObE7Pb9XRiMBOECF9njrN5vha3/+fbEwbN9w+J6/39mlij3FqbzmAP1Z+hjtCZjEAD9hyF4n6TlfQSoOWxM+pYgB/c4OZQyq0ailnjBTcbqNGEP8HQJ8IJtf7dL2AgagQRbnnnGyYK3YZhqgO3TX0vUF6Qy6UIhrw76eT32hp0WPmZWv3sqBczelKQM/EbO4ALGIXmpA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(376002)(39860400002)(346002)(136003)(396003)(366004)(451199015)(41300700001)(44832011)(5660300002)(6862004)(8936002)(6486002)(82960400001)(86362001)(26005)(316002)(6636002)(478600001)(66476007)(66946007)(4326008)(66556008)(8676002)(2906002)(6512007)(186003)(9686003)(1076003)(6506007)(83380400001)(6666004)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mdV17DviW8Qjq35ALXr6l1VECamH3QwOQFkD446COyqL1PRvbunqMzVkcRex?= =?us-ascii?Q?sWlgp/E9d6ffTgYcx/JKvJDB8I06/yF/QEbTY8L+e5GwJcvr2RHskcQ6Nw/Q?= =?us-ascii?Q?itoP+ZDlkb2r5CfBGotTzoGSyaziUGxI8Z2C3ButLIyjoeGNKdG9iyz6l/+h?= =?us-ascii?Q?eUzEd+GRyojQIy/cjCL3pmpw6BzGXhqEVhQt3lJf4cpb++5lfJLoeAjcrZKc?= =?us-ascii?Q?/pdqMmEVlFMG/T5Rgq8GKHKJnBiWjHxmabHJcclTOsPzdx9tBLn8FGft1tXI?= =?us-ascii?Q?6FszchATGuuIJ1k30VK8GH0AIuxpt7q3Vw1thd4bJbwfVat5AQTur/HeHMoh?= =?us-ascii?Q?2EnC3QEQbk0okpsY8OKEK2Ej8e6wGn606A0yl1WXg9U6o20yktu1AQ60Zr2H?= =?us-ascii?Q?HzNYKXgqcjlGSl6/0iF8NpvObY8FMJJkOhbXYLY7bk9EmlCRKXKRKAiXjPNW?= =?us-ascii?Q?XJTsjRTZwySCEF4RjXGl3+3H/8+6bNdKSrc83+04bxXMKORuBIA+x2Qscibm?= =?us-ascii?Q?IW91+JD4rLPG5QmeAuDAigXSfgGzypMa80x0yyKSofgeOuer7r1NaqF3LGWi?= =?us-ascii?Q?kE4UgCzn4hWCBiCi/m9Y6f7Fn4244zhvEbjEEVD1Ag3qkk4VGL+/U+6hzdLF?= =?us-ascii?Q?cPHvQVwxPvQk05icqOcMAWW6RpmXjrjk16AuwZ7u1gJLkRgEZujyy6qEeFWg?= =?us-ascii?Q?7gJ44bablSiEaITI86GoWEUtiKW2C0l/VOz31eCnWfcJfLzooeNTg0f7wDDB?= =?us-ascii?Q?HX+ytM1E0oPV169zEa458QPM3eA/zY1oKBtvXxc5X/WKO4vK/E/aIeoTsfAe?= =?us-ascii?Q?mCf8uOL+QNx44eEOcgn1X/UiQao+K8ZTmV/157BRBSD5LFsI56P+TmAO2nYj?= =?us-ascii?Q?nZW53uAGULJxKxU7NX+TO/q+DKhtmU+Uts8/xXDP9i/+p8FqITaNpc+E90CL?= =?us-ascii?Q?3Cod3rwvFXwnn1yQ5yQ1XTI3g2BolqKD+KDkiTQSu++CkQrrdO4KQPGf6zuT?= =?us-ascii?Q?Mnd5XWH8OXDsrjzzLrUatVXhusLdZkdpM6Br3kyDCyhXWBlTq9lnx/vTwAlI?= =?us-ascii?Q?p8M08KkvVEyawqdKegOEvsVy85BzNZAXFsVjlyAfk1HC11Ip9kWZNUvwVg+K?= =?us-ascii?Q?9YJJ0ZoxhDyaL1oI3Wamn7XdKI1IB6t76zw2rjr2FP1IWpfpQo0UUwAeZeBC?= =?us-ascii?Q?3MHIOECf5uU/VmMVIvnGM924fzUND4AYCqrHlP75wo1hZbMdEvo2IXOkCGas?= =?us-ascii?Q?LmWt6oErAEGNpcA/RTa5CfIw2uJJLylY8hwa2pcTI+Xegs7lW4n93TS8uhRx?= =?us-ascii?Q?ngYtQqK9rxom0JrhOjT5NWEm7X/WjJ+2J8nTBzwEWgn0F727OQqsk4rWCNBd?= =?us-ascii?Q?I7sIXym1AbSEDuwmfRmScD5PSmk5AtREKTrvy1SfprrKQlj9HfmudP0o694q?= =?us-ascii?Q?uHCvNFmvFuSrl5/6tO7k9tl0zpkRwd5IVte3C7W1r0ZVXc/rv41RwRHQmDDU?= =?us-ascii?Q?F511SjLgY10uBCPnd6Io7hQK5pS1kYuFQ9Lx9BUdhIvIue7wuYCXhllBzCMx?= =?us-ascii?Q?8+5Nv9Q6dOpcBZOnE84SnBCUaw13vGRLjuwiusy+mE96QXsmV1vgiCT4jcfa?= =?us-ascii?Q?0A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e948779-4854-40b7-b315-08dac22fc0b3 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2022 08:52:37.9693 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ufK1jkhuFlBaPKliDu0jNW1ceLhTRL1AynFsO8U0xZdEK+5OaNJpSn3zjoqKIVfBgspx8b0TteRVH2YGtFz4v97PVbH5Q7OYT7faBzlm1EY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR10MB4042 X-TUID: /vPe7gqK53N/ Hi, if the scripts runs into a problem that is likely severe and should not have happened in the first place. Making it more robust and so that it can be run multiple times still does not hurt. But really what one would need to do is make a copy of the original partition table and restore that when the fs resize fails, in some exit hook. What you are doing here would only skip the partition resize on a second call and maybe run into the same error again later on. Whatever that error might have been. So we better understand the nature of such errors instead of making that script so that we try over and over ... and maybe always fail. In fact the longer term plan was to move this to use systemds first-boot semantics instead of that self-disabling trick. Henning Am Tue, 8 Nov 2022 12:28:37 +0100 schrieb "T. Schaffner" : > 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