From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7175185077837496320 X-Received: by 2002:a05:651c:198f:b0:277:6a5:109b with SMTP id bx15-20020a05651c198f00b0027706a5109bmr27545410ljb.42.1671016731983; Wed, 14 Dec 2022 03:18:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3456:b0:4b5:3cdf:5a65 with SMTP id j22-20020a056512345600b004b53cdf5a65ls1589145lfr.2.-pod-prod-gmail; Wed, 14 Dec 2022 03:18:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf5assWovKoP3lZSNXk/uaq5hhHlebhgsjgYgaRnbvNc80ZwPFr2UySG45YWJc954Ylf16U9 X-Received: by 2002:a05:6512:3d2:b0:4b3:9fdc:1697 with SMTP id w18-20020a05651203d200b004b39fdc1697mr5974777lfp.47.1671016730635; Wed, 14 Dec 2022 03:18:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671016730; cv=pass; d=google.com; s=arc-20160816; b=kNZqzBeu0ZzqVivHY2Zir69WrDmrqe9awD3VRpZfxbV94OsDaw0epag34L7ngHMd0K 80sgtT+YnXv1Optc9FDSlZbbROnZZ4o8VI0S89R3PDwja2AhO/WFd+NnOTSc9S/O2X5s CnvlnDNJXBMO4etzhrVFPqCtJ2UZy9xwoSm97By3vlx87lkxE933Yp3bk3a7SgRRdG+z X9s245ekzzGtVhryd/e0sDSHq6zLuN0aNkbMqsHQJm/7Wb+hsEkwwqE9S+LgkU3p1y1N DSSIKGbmYCKfHfLWzk2ySu/OrZSBu2SxJY/O2viLa6+FbJsYmT+f4VbqBuHVSmz+/0LY 9Awg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:organization :from:references:cc:to:content-language:subject:user-agent:date :message-id:dkim-signature; bh=Bb4Pzu3wljBB6rtDZRz9v2WhXmp+H+R07tBN5SwdEJg=; b=ObMcZGL6MjreINSGmen5KtrlEVkFGd1SxYLz2ahP6BHOHJrWwAfXycRvHRjxOWtS84 X2fcfAmo862stB4gTnazrtFW/pMKL6Rtwcp2rv6U+n6MuIUZl/uuxgHNqc6NZAtLvOZJ 2QUCidgMPQE/ZThNmLuBxJHYk5hznB5J3sli5mwSfyqnrhk2tKlGZvzrS6vJ6GVx7YbV oaWHjTuylUNrBmmqzfXvcoEjYUNCQD4TZ4PmB1Zog+O3ABa1Cpx+GWejFfPTIQStqKTX nfG5uhzNg/UXzcRGK8ne0WP58IeNW+vsCuZQLAV/kSedVUXS2KY8BOOV+EsuWKwmudDT stag== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dyfivi4K; 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 quirin.gylstorff@siemens.com designates 40.107.6.59 as permitted sender) smtp.mailfrom=quirin.gylstorff@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on2059.outbound.protection.outlook.com. [40.107.6.59]) by gmr-mx.google.com with ESMTPS id p11-20020ac24ecb000000b004abdb5d1128si272588lfr.2.2022.12.14.03.18.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Dec 2022 03:18:50 -0800 (PST) Received-SPF: pass (google.com: domain of quirin.gylstorff@siemens.com designates 40.107.6.59 as permitted sender) client-ip=40.107.6.59; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dyfivi4K; 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 quirin.gylstorff@siemens.com designates 40.107.6.59 as permitted sender) smtp.mailfrom=quirin.gylstorff@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=kTLr5vW4RWyshUNE7Rk7p7Fu4sCGzdk+81FTdGIp9a+OKjc5jLIuSoNz20YjjsvdckWRfvYxV9WWKJU1h45a0905a1dE4WdzZ3e9CYV7pA8ZyhMojSELLPijxtIpmMNsdi14mi1ffRE+AD8Jz/QTBBKioNtm9PceA07Ve4R2WsvrWpS7m8vsBqil2VFBGgNAIAf9tFqb4Xewt5ymveZLUDHk4zdDggiesinTk60iX7QvBdytQhhdPNUyxcUkJnbd74GFlmUL8tX3dvwYwmKXVux43pZOqhC5dDIO31tIEstGwYeXh1pV7c1MYKqAjAqT5Wzp5r65hfcfIkYuCZeghw== 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=Bb4Pzu3wljBB6rtDZRz9v2WhXmp+H+R07tBN5SwdEJg=; b=PhiK1/PQea8Ml6naPNBws5cVVBbtQkSck2Pw+rftQg2tQhb5mXsoW4hJKNZkmhMMrDvV0+yNMzPXQtFaa8v+P08G+0i2T383XNCjRLqvZ3oHOlLxqa4a64R43uaPmUQOz4Fs56hesh6dccgUlubAb9AcrRVR1nmD/zQQ0tYJkewVdkoRS/mmECazZNj0aFAm7DQ+l/wbA5+O7C0SqY66+QefLVLBSBi37O5uGouWys3uvaqGAusSCPtLkwjNFW8smjiWuRnPNrHiCyEqn5r/iwGd2IKokNjVo7FXXmF4AmwBXPQFhWTaNVb65TgOow83ZsJUiurgImQdaazfKFqmhg== 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=Bb4Pzu3wljBB6rtDZRz9v2WhXmp+H+R07tBN5SwdEJg=; b=dyfivi4KXbiqMRAUD9OvkEE9SpNGP04f/skC7MzPauncKZ+66wKMtfPSCrlDwSzBhj/gk9EA8FQIyFtyGX1m76OuFNqtJynkwIu6Zi8HPD2LPdB9LequO1IwRO4thNNmj9XJ0TLraOgMS32WRUTDMI2jIQ7e+NAZ7HydkhkxOuY3d8TPfSN3Hoyz3d4nqw4SeFV5vadb6p8vTP3TlEnWP5nHHYICOtD99Fu02JZNH/FKhsR6l5WSc8iM8wOTo8HeKBc437M9RqczVOMBPJY9J9EN08a3hJYGMSLfAs8LpTmM2i7wZJMzZiOESBSZrbYke/I1o2Kv65m3rfiiooEC8A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AM9PR10MB4085.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1f9::22) by PAXPR10MB5325.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:28c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 11:18:48 +0000 Received: from AM9PR10MB4085.EURPRD10.PROD.OUTLOOK.COM ([fe80::793f:57e:21e9:3741]) by AM9PR10MB4085.EURPRD10.PROD.OUTLOOK.COM ([fe80::793f:57e:21e9:3741%8]) with mapi id 15.20.5880.019; Wed, 14 Dec 2022 11:18:48 +0000 Message-ID: <9adcbf0e-33c7-8b36-1095-eae5b6a3f485@siemens.com> Date: Wed, 14 Dec 2022 12:18:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH] expand-on-first-boot: switch back away from systemd-growfs Content-Language: en-US, de-DE To: henning.schild@siemens.com, isar-users@googlegroups.com Cc: Tobias Schaffner , felix.moessbauer@siemens.com, jan.kiszka@siemens.com References: <20221209162237.13420-1-henning.schild@siemens.com> From: Gylstorff Quirin Organization: Siemens In-Reply-To: <20221209162237.13420-1-henning.schild@siemens.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR14CA0055.namprd14.prod.outlook.com (2603:10b6:610:56::35) To AM9PR10MB4085.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1f9::22) Return-Path: quirin.gylstorff@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR10MB4085:EE_|PAXPR10MB5325:EE_ X-MS-Office365-Filtering-Correlation-Id: ba8a9233-f4f9-4404-b76b-08daddc4f889 X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ip8jsPByJsWUHBFEedmdBWOEQIT4hB4rvg21CwzNhUkHJOE/kTdVh+nHncqhACDrkm6n53WuQzS+batUfrmVkEbVuFu5vvVZM0yTnkDJBicCEg8YCb4B6jBOd8ayvJ0i9qTF/1lr+FfmgpbBHPLTXO1f6bsXpYf2HV7sSyEdG/pRg+mG84zeNmQU9rlU1YnG+25a+MPXPYEgLY5G3eDsTdV61WReAVZYVKqp+EZQMI+UMYSM3ujGJEsRERik7I/Nm4FeGN8SXu7fvRos7Vr2j9arG1wFnqJ9etv3h32jSlljLZWd8TC2YpztGgVfnk8sfwHNO7nMnXBfD0qRd8n6u0ZzIPiUiZ6+Yy/Zt+1nliBlRg8lkSiKvEb5fkheNX4nKL1XqIJT+/eRh3J/vdj/Gc8O/T4DCfB4aGz+EDNkrx+LVbgmBn+Bx7o+qzUpjJRwwy8CWlQkfuOMYa/ebJ0r70LKNiIYeRbLHBCWr+0TuBoeNB5V3spmdvmKSWwrPJmKC7K6KWPAva2bDUJ+Ru8zsX0lURoifWgrtTlx+Cg3XHXAwMgXx74LoHdJvV+4LCPQwnNTY4/NcxGDSNMne+zkuyOmlCVhJCjShmqD3l8fssdNiDyV5d6j2q4FSh9uQ1ePQbFBBS3SsrFBe1KZEwCnN1edbNrxZhWYuSu/kAfQC4ucEjZblM/XSEfiKib18BVpWgUpg5Bn0bUz3yYZIv3LmSILrKx++NZZ5SeeXo6c/Gs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR10MB4085.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(366004)(396003)(136003)(346002)(39860400002)(376002)(451199015)(316002)(5660300002)(41300700001)(66946007)(83380400001)(36756003)(186003)(66556008)(8676002)(4326008)(66476007)(8936002)(26005)(36916002)(478600001)(6486002)(107886003)(6506007)(31696002)(6666004)(6512007)(86362001)(53546011)(2616005)(2906002)(38100700002)(66899015)(82960400001)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dzBPRnJOSUNHT1JocjRic3dGc3VVYnRPczBsRTJMMEFCcGF0YU10SjVUY01j?= =?utf-8?B?NlYybFlSYVNFY2VOWjM3RVNOWkw2MjE0bWFPdWthbVAzbFF5dWdTdEc4clJo?= =?utf-8?B?MDR1N2Nad0puZ1M3T3BOMlFWUldJQ1A3RDJ2VEtmSVRSSFlZQXkzVFVvOEZV?= =?utf-8?B?cUlLbTBrcmVaNEVFVElYTHFSRExCNjRBazZqL0M1MzlqRm5LcWpiZlVIanBO?= =?utf-8?B?SS9CRlJ3d1NaN2RsZU5RQXpZM3Z4Qk9DTGtxOEd4MEppVEJML1hkdU5zajYy?= =?utf-8?B?dU4wK0QxR29oa3V1NVIrS09nZEwwd25KT0x1SU5mcGRrK0ZQMS8vZENNUVFr?= =?utf-8?B?ZUhVNHpab1JKMWl0K2h6ekl2aU1ZMU9rMDZtQk1uTEk5eGtKSnA5RzUydWxX?= =?utf-8?B?ZExMc1lFTmhnYktPb2ozMUM5Y1ZjUjE2czFDQ1hLayt4a2oyNWRpa3h5SXdm?= =?utf-8?B?VUptTXZHczJseDQ1SU5Ya3M0aDJwdERnRUpTc2pERjEvNUVCc3FDU3ZBZ2x1?= =?utf-8?B?bTZMQ0hLMjNiVGk1dkczOERWZFZSRE9lTEZJRnFuS1VsMWlPa25wSDJ5RjZV?= =?utf-8?B?cEk5dkljcUtKTFVIQzJoUWZWeGNkRVBSRU5FcWt0V3Jyd2hxL2U5SUUrZ1Av?= =?utf-8?B?N1VNcEprR1NWbkxwRm5PVE9DVzg4czJCd3FmTTc4SEJxR2FrRTB1OHcvVm1L?= =?utf-8?B?WGlReEQ0cXVjejZma3NSZTI2UWgwRXdVL3BsWmUybG4zN1hnWnNlb1R0S1Yy?= =?utf-8?B?TWxMeFU2c2xBTlFlRnFncTRPWHlpRkxNbnVFeFhPbllTa1h5ZVlodE4zM0po?= =?utf-8?B?WTkwSXJCMEcyU2xUWnJnNzZJTVphTncrcW1ybncvVUh6bHZYbkZ4U1RtRDJL?= =?utf-8?B?MXFOV1ZwTno0ZTlHYXhWYXI0MUlWY2lEekJUMHJWOXBicUJ4Rjg1Y0xjcFFW?= =?utf-8?B?c3dtUWU3TkhYMmdvS0RZOWpsbW02dUtoK2IyekhSS3BPZnM5aWM5UkNsUDh4?= =?utf-8?B?YzZxRWhOMzVKY1RvL1BPbkRISk4xbmlxTjRwbEptUnhFcTlkYzZHeVlBUWtv?= =?utf-8?B?ZjZnbTRDL1ZTY29YQUxuSXJ0SEsvWU1DeTRsTUpUM1Z4TmlGT2VHNnY1dnFD?= =?utf-8?B?cXBQSlFmcGJ0c3J3eS9HQjhNM1hOMGdHOUxnNStFL29VSEUvWlNFRVdTMUZI?= =?utf-8?B?eGc4SExsMTRxazJKUStNV3lkK1hEUmw2cnlFR2hRaWdld21sZk5JQTQ0aXQz?= =?utf-8?B?NzdEbms5bnNIWVNBbDhBcWd1cFhKejExMEFJOU1mYysyN1JvakNkWlFySTcv?= =?utf-8?B?TGNoN1JuMjM3dnRqY0ozcDJOendiQ1I1c2ZqTzdhampZb2hQOUFxWnVaQkg3?= =?utf-8?B?azlwZkZTaGgvUjVWak9Ed0F2djV1ZUMwc1hMVWJoN3NnNkF5N1VBcTd5VGFL?= =?utf-8?B?T3hrNFVQWkNlSG9kTGtxNitYUGVqS2htUWVCQ3dRcS9EVFpQNUpTeTFEQnMv?= =?utf-8?B?QkMyUGFvRG1zRUhTV3BnVnhYWkxTL1djSU41UDFMZDV3K0tLZ3dxUmtMWGRv?= =?utf-8?B?NkdOYVM3V2RUT0VIZnUwbDNYbEExMjBzcDFOUFdkVUhDYnZhT3ZvcGFqWG9u?= =?utf-8?B?TEYzSDdlQlRIM1ZlcUxjMEcvcjBPNnFydlhkd2VrWDBZTUhhaU1lUTJick01?= =?utf-8?B?SUIramxjQUN6bEdlbnovV2h4dmJtRzZKYVpUUjJheSt3Z3J2VVRLU3dxamJO?= =?utf-8?B?dTZJRmNYeDJRRnFqQ1BuRDQ1T0ZKbDNPcE1Pcm9hYnF1UjIxTnJWL2JDNG5z?= =?utf-8?B?dVF5bHhwZ0o4NDlUU3UzckxHUFZpTGZKbFhmT0tLSndqRFVOSHE5MklidnZT?= =?utf-8?B?bGZZNWNtZ0NZTUMyaEw4ZmRhNnJkdXlMUjBtTldTL0VwL0JyMm9DaG5kb1Bh?= =?utf-8?B?ckVoMnhnbHpSN3lEVFBJL0FaYll0Sk9abVoySUNDbmlMRVNkaGQ0MXptdGVw?= =?utf-8?B?YXpDVWVhbnF3N3E5Z1VncWVkN1NBa3ZjYVhBbVJ1YTY0czRvUFM1dTBOMUlM?= =?utf-8?B?SWI0dU1wZzQ1UXE1dGpzV3N3MG9WMWpWdXp2cHVKUURMd2NTaktBNzVsSXJk?= =?utf-8?B?c3F4NzdrRUd6RU0rR2JRa08rOWNzcXNPNjZ4S3VsYVJ5Z2lRendJSFVxeTI4?= =?utf-8?B?R0E9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba8a9233-f4f9-4404-b76b-08daddc4f889 X-MS-Exchange-CrossTenant-AuthSource: AM9PR10MB4085.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 11:18:48.3823 (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: z9Om0c8O7NAG9yr7X1Led81gN0N1G8sY+t3rqn6Z3RtW1clLgfAz8TLJH2IOhFbgMHPWk0ELwqpLhg8Q0h37PUFrEBG3+/6Zx/Ii/CY71u8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB5325 X-TUID: bcdKGZBiFkHo On 12/9/22 17:22, henning.schild@siemens.com wrote: > From: Henning Schild > > systemd-growfs in some versions has runtime deps on symlinks created > by udev and we have a race there that shows especially on smaller/slower > devices. > We had patches dealing with that but they ended up looking rather > complex. > The gain of systemd-growfs is potentially a bunch more filesystems. But > we can add them as well in sort of a switch-case. We never used it the > way it is intended because it did not really fit, so better not use it. > > Signed-off-by: Henning Schild > --- > ...oot_1.2.bb => expand-on-first-boot_1.3.bb} | 0 > .../files/expand-last-partition.sh | 26 ++++--------------- > 2 files changed, 5 insertions(+), 21 deletions(-) > rename meta/recipes-support/expand-on-first-boot/{expand-on-first-boot_1.2.bb => expand-on-first-boot_1.3.bb} (100%) > > diff --git a/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb b/meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.bb > similarity index 100% > rename from meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.2.bb > rename to meta/recipes-support/expand-on-first-boot/expand-on-first-boot_1.3.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 57055ccdcbd8..93eddda2a3b7 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 > @@ -57,29 +57,13 @@ sfdisk -d "${BOOT_DEV}" 2>/dev/null | \ > # Inform the kernel about the partitioning change > partx -u "${LAST_PART}" > > -# this is for debian stretch or systemd < 236 > -if [ ! -x /lib/systemd/systemd-growfs ]; then > - # 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}" > - exit 0 > -fi > - > if grep -q x-systemd.growfs /etc/fstab; then > - echo "Found x-systemd.growfs option in /etc/fstab, won't call it explicitly." >&2 > + echo "Found x-systemd.growfs option in /etc/fstab, won't grow." >&2 > exit 0 > fi > > -# mount $LAST_PART out of tree, so we won't conflict with other mounts > -MOUNT_POINT=$(mktemp -d -p /mnt "$(basename "$0").XXXXXXXXXX") > -if [ ! -d "${MOUNT_POINT}" ]; then > - echo "Cannot create temporary mount point ${MOUNT_POINT}." >&2 > - exit 1 > -fi > +# Do not fail resize2fs if no mtab entry is found, e.g., > +# when using systemd mount units. > +export EXT2FS_NO_MTAB_OK=1 > > -mount "${LAST_PART}" "${MOUNT_POINT}" > -/lib/systemd/systemd-growfs "${MOUNT_POINT}" > -umount "${MOUNT_POINT}" > -rmdir "${MOUNT_POINT}" > +resize2fs "${LAST_PART}" Tested with read-only rootfs. Looks good. Quirin