From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7374866765664223232 X-Received: by 2002:a17:902:d4ca:b0:1f3:4f58:2037 with SMTP id d9443c01a7336-1f61be7749bmr36304025ad.18.1717094975818; Thu, 30 May 2024 11:49:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:c411:b0:1f3:16fa:bc96 with SMTP id d9443c01a7336-1f616f8bdffls8589455ad.0.-pod-prod-00-us; Thu, 30 May 2024 11:49:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJv/ehg9WtIm0ZvzKo8CUOp+11QTR48K34pL5exF0/oLn2QDdsh3ybNI6K6b1/4jZxMIie X-Received: by 2002:a17:902:f542:b0:1f6:32ef:3e00 with SMTP id d9443c01a7336-1f632ef424amr2818405ad.0.1717094974317; Thu, 30 May 2024 11:49:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717094974; cv=pass; d=google.com; s=arc-20160816; b=fPHGgsOHvh2/J17vj6otjTSRsqM5or8z1WaMyhSYv//poTa6vqJFGlrRdFEhA9owr+ Dkm5HbhyYhrKAOt9yOseJkn/0tIPqWL8RN5sOF2fKklvlAw8+8Ytkp/8fn5e3E4KBIEn ziofdNQ3a5jpA+4/kV9b3iUzQ3gWoqD2rRDiAd5CU3pbKFjpnqPEbQgwjpznb+UHDl2r qqnK5yBEOTjfBv3hJRVjrQmqVqrzIQIr7KEqfqLtO9KOaeDm4Iz0I5YJMUmxcLJwPdDl x95m6cQ365FUaA/M26xhZ7eP4hDtmNG/hEzpI7gggp62LDPfdg4nUAB1EZskJV4q+J59 Ta+A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language:subject:to :from:user-agent:date:message-id:dkim-signature; bh=4uOW2VM5c5OY5RH75xNrB6e1mBUNlP3obPmlWqjkxNk=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=kWwQA0oY0NUx7jDWfnULGnEwIjzkbXkSdjBa7IPIQpSM9L8r9Fit8rSWXswtYFjubL jSTTEsnegrXm7Qi23kP22iVZ6o7wxCbzsR3IjSgJ0pV5YFogx55zgNVZxbH5Tlsycty/ yoTpbjaXeX/G+ZmGzNQpCxyZH6qKYQkeheIMkviZZHPYb1RWQXlP2v7wp+52C6ptgwyF mpxnPhubwh4k0olYt6s1u6Fv957uClbNof+/MgLl+R2ulHPblyEZgGgdH7EcBvWZWtKT 8cbq8ZsQblRKii4kJhcAUQrn7JsQ/oPh/3Ph/e4AmYOblWYr+pQW/zzrlRLQJde8lcjM NCoQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=TDqSTTPH; 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 jan.kiszka@siemens.com designates 2a01:111:f400:fe1e::62e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on062e.outbound.protection.outlook.com. [2a01:111:f400:fe1e::62e]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-1f6323e82f6si88895ad.11.2024.05.30.11.49.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 May 2024 11:49:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe1e::62e as permitted sender) client-ip=2a01:111:f400:fe1e::62e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=TDqSTTPH; 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 jan.kiszka@siemens.com designates 2a01:111:f400:fe1e::62e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z5VK+ey+ov0AuNIKijXo1/1FePNdL19xqHse+n97UPCGllkPQAze7MOv2m6WzFJg+3lLoWCcpt4dQQs113BkULFCuK+esec/zfMUXXISE59Lh+yRb5ciBpjSnYUl657jPN2EmfnWzmrpc7+fHCWOYAh+4xjClmbXQAWOm2FEFBIBX2cY294uIs8+Mk/kkdZm1FXkP1wesyvPUTyDjCZ1C6p8fRRyrJXW7QV/KyePcVRi0YDfOZhGL4IJsmQMBvKcW+Vp9jrEokIgiRDXHskXk08VG1cCtmsBPlUkMAoQm8ym6+6Lg/AGXxUmfK3v8sbHvITKMtg5M0jFCBSCzAX1Hg== 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=4uOW2VM5c5OY5RH75xNrB6e1mBUNlP3obPmlWqjkxNk=; b=fwb13iA/P6Da2ifoOLyAoBEzdY1Em9pbCXo7VeC7Y+e4JfQr6tr7l8qGEx7EcNK0gqD81IVJ/659DFZK/hbIKCVcpUqmwr9XcYUpBAfmN4EHuU8g5Ty8zAlfTGmeAJU7oYz+5j+tl789njuC8GIegheNw2+BQYH+dHkf9Wna+GgSVUb+3ktrzLrmgxilfvZRq2YRdLuuFHwcNSTIWvEEa/U/3DdfD3SNbE8tfViAgQ//pUaVVxW70OYlNJmv+TMhZB7BtMS/NOwMTV0Qjr1ZXq56e49woIyHeUVbWxZwu+a8JHZ/CYz9dO7vWweiixuyrXnVkZB/jtCxlOMmnTdHug== 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=4uOW2VM5c5OY5RH75xNrB6e1mBUNlP3obPmlWqjkxNk=; b=TDqSTTPHwFH7TxrMAMf+Fk1sC3IUvYY991tnwG61F7D+DFI6FNBHQgFpQNaw0JBjF7SoNP+IcvBOS6OTP2gV60nEpYum5a9Q4Gz+pyjIzqAsFLsHdD1Jh8cH/igL/WdA6RHji74Da63O1cpz6bRgWX+nalKUONxDy+Xb9PrVnbLnPtGyiHaMZP/yndNIuKuRiclfA61ojlgxbq62WsF86tf5kJBLUbffUaeEAcp+D9unzTzU9KHxOQlDuBj4VhEofmbAHQrBRV3ZoiO8WCOX5fLFoJEYmAbUQLqZpKwfxt6IqngXmcZCjoQwjMNPzUisZYdtIGAD3eQN1azk+z2j0Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by GV2PR10MB6116.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:ad::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.21; Thu, 30 May 2024 18:49:31 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8fe1:7e71:cf4a:7408%7]) with mapi id 15.20.7633.018; Thu, 30 May 2024 18:49:31 +0000 Message-ID: Date: Thu, 30 May 2024 20:49:30 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: isar-users Subject: [PATCH] expand-on-first-boot: Fix after failing on every error Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0199.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::16) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|GV2PR10MB6116:EE_ X-MS-Office365-Filtering-Correlation-Id: 4bc02878-6d68-4940-00ff-08dc80d93e04 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|366007|376005; X-Microsoft-Antispam-Message-Info: =?utf-8?B?TEpJZHpwajlGdEJIa0xJVWZtQ0J2ZG1iZ0xKVXc5bmpRdk4yZkpWcmNzUlJP?= =?utf-8?B?VzArRTZLZnNncWQwRHhYeVNPNUZjSGlSVTl6aUdsWFl6ejVxVE9oTUQyeVpI?= =?utf-8?B?emZkWXhCbm1WS1dGa3pGTjg1M1Zuc2x6bDJTTy9JVzh4OGprMGFqN1VHUmdJ?= =?utf-8?B?RE9BYWE0TCtjcFJPT2MzNXh0QnMvb0JRRHdjTU5YdUF0OGhQZnF0R1hqajBF?= =?utf-8?B?QjJ4WWZGQjdlSFZmZ1pyQUtnZzkzNkxWdUJrcHh3ZlhIaDdvQWRlQUN5T21O?= =?utf-8?B?dklQT3NBeFM3UWJ5cUNNQzBadHpvTHZZTmtZajdrVVljbmVlKzM4SkxQSnRC?= =?utf-8?B?SUZYL3Z3Z0xySWI1clo3a01zSm5Ta0dpOUxhU0R1Z0NDaWdER1N3aVRVNnV0?= =?utf-8?B?dkhYN3VnSDBXZ25rd3RFSk16eGJsajVTRHBaMERGR2tGejV0cyt0MTZ4eGhH?= =?utf-8?B?WnhmMmY3K3BmRlpQLy9GdElveG40VEg3elJST1hoUy9reWcrR1lUQXJmZ1g3?= =?utf-8?B?c2c0cjlpZ2g4aXNkY3BaNDUzaHBpOTBEVUhENzRBWTlNS2pnRlI2bng2YXdy?= =?utf-8?B?YjU1aGtxblVadUpGWVNZRW5KMG44ZDBIb1Z1Qk1sTUNlUTN6dWdEQmtkVWMz?= =?utf-8?B?V3J5V2d6U0pDb2FiTjNKNXZjbk9VMlJ2b0cvQ1lSRFpZNVY1T2dJbW4rZzRR?= =?utf-8?B?RVp6ek9ZcGVLT29kUnNMTGEvbENqVm84eDNFODNhSkdabjNjdnJNbUQrZEZN?= =?utf-8?B?a3BOZXM0ODZ3MkVYOTBmQjN4emkvbE5QM3gvM1B4VDd1eEZrSFlQMHNBMWpF?= =?utf-8?B?eGc0bnRTWklHQldyT05NcFVMRlRoUDFQbS95alNqV0NGS1FObElaVkhIVGxo?= =?utf-8?B?NjVlaEVkdGU4OUE1SGpRNEFBY2RhUDQ0NVg0TloyY0I2RVdkenB6ZEhCMXZ6?= =?utf-8?B?c243ZmdodHU2SXJHQ3pJU1VEWXdSQ0VCanhRb0daVFEwekdsVlZGVG5ONngx?= =?utf-8?B?Q2UvVGExNkJjNFQxZ1htRnpRQ0lZeEs0RlpFOElvSExYSlRuODh0ajJobFln?= =?utf-8?B?TzUzR1BORFlJS2pOSDdBZXpUbG56ZG1vek03bjhCWW9SWHRtWlltWVFXN3hS?= =?utf-8?B?ellWNGplZzBoRE5aVi8yNDV5L2xxa2FVR0tMRUYzemwreDJVWnEyZVhuSVBr?= =?utf-8?B?REMxMmROMW1OMFFyZktzNitabVhSYjNmdDZCT1R5VzFyWE9hM0ZXWnp2UE1L?= =?utf-8?B?T3ZydjMzTmZNTU1yNE1keVF4RlpwbUlyTncwYXNzM1VNazZYeDJRNU5heE10?= =?utf-8?B?WHFaeUxuUTFPbEJBVVBva2ZvcWRhY2liMFh0Lzd5eTZBV1p3bHVYRmp0RkV3?= =?utf-8?B?NDhNallPTFVrRmtlNkZmcFcxa3hpRUNCejc0YkhYd1ZuUHJZVThLdEd6V2dw?= =?utf-8?B?aFB3T211dVU1RjNuSW55dFpFeFNuK3hWRGV5SDJFVXRSQXFLZDV1YVVPUHQ3?= =?utf-8?B?ZC9VUTBUOUtkK2g2L2ZJZzJxcjJoUlBGSkJsSXR4Y0MxVCt6a3JrWWFIQmZS?= =?utf-8?B?RTk0UERjWkVidW9hTm9kWjg0eDhLVkJqNkRETTRKcE96TWhLM1RWV3FQb1pl?= =?utf-8?B?UXI4WkhXUkN0OGFZbVBzRklQRk5ZaWxxU092WWIyaENNcldXZ2dsbDkvQVk2?= =?utf-8?B?QWdXSjAzY2VqNkROTUdwWENTOWMrWGtMNEw0MzQrQWNLUTBoWVJ0SXJ3PT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(366007)(376005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UFllbGw5bmowVDFGNzNCV2JHRHc3eWhOZ1kySFBFNTJoeE84V0ZKV2hDMzRi?= =?utf-8?B?Zm9Kb09JRlpZY2hOYVpuaGJwOFZoVHYydGhRQTlnbGh6WHBzVDdBRTJ6YVJt?= =?utf-8?B?ODN0dGpHNGpza0Zremt6ZTc1L0Y5M0JKVUFRVlFxWnhsWkliY0hxS0k3YzNW?= =?utf-8?B?YWd3KzVUei9IMDVtV1JWNmlsSkdRTmRFdnoxSHgraytBKy9nc0d3TmowMEtP?= =?utf-8?B?MnRUbURSd3pjOVJmbm0xTkZKaEhpRVQ4Yll2TVdxU1hYbkpQbEwzdEM4alEv?= =?utf-8?B?SWVlNGdyY0xkU1pGNU5CZ2JxVktWVlNqM3E2b01laTZUaHBQZTRpbzNWTXdT?= =?utf-8?B?SGc5NStLR1dVUWZOdllhU0FHL2RZN2pjNThON3J5YnhIcmdSMXJCRXc0WlpK?= =?utf-8?B?R1VJTWdvZVdBRWt6aERDTXl2emxYWlFweHFWMkUvdjF6UjgwQXdGM2lqSTB5?= =?utf-8?B?SlZ2b3FJOXdHUkFjVWU3MzR4S0czZzNTSmVGdm5wbkdGYWZDZGhmZ29hc1ky?= =?utf-8?B?ZE5YRWtEOVVkZ1J0bFRrRGdBWVROVnVBeEIzZTZ6cTRNb01qZ2piaCtxZWZD?= =?utf-8?B?aCtMZmlLVFJvZXhXT21DSDF6RFlBRVR2UDB4alFMcWlKVndxYit6Z29WSUtO?= =?utf-8?B?OUppZFBjQU9oV3BqQk9lWHFrVEV0QWlqZ083WVlPQW44K3dXRERtUmsyVXFN?= =?utf-8?B?U1h3QTVLcWxGS1o1TStSYU9jZU1razRiMVRVU0EyOHZ2R1gzaFRxQjNUOG9j?= =?utf-8?B?cXZWeHFTc0tHc3YycW5HeWt0M2duTUxBZ1gzaVdSOGZ5dzYzQktRZ0p6WTN1?= =?utf-8?B?VFpJTWEyVkZTUWl4dlNzWFdoK1BGRlhMeW9jbGQ1SHlRbmdvbDltSjZ5TmhE?= =?utf-8?B?THJ3WXdQV1F6RDRQejJFWWtraFJIL2JZeHpnSmhqbGhuLzllVmFucjI2QW9p?= =?utf-8?B?VERRUnFkT2dsb29NVHU0akI4Zi90Qys3RzgwS0d3M0hQUkpXNCsrTU8ycFlk?= =?utf-8?B?ZDJRT0x2MHgrdVVHQklVZWZBOXBDSUNCRHhQaDV3N3M5TGtVTFFXazd6TVlv?= =?utf-8?B?OTYvV2IrT1pMU1pqRG13aFhxc3YrM0IyaXhHM3J6MEw1WFdpSzA3RVlvYzE4?= =?utf-8?B?SVloVE5kYnFJY0FvMTRTKzcvalYyQzF2cENvSmdnTmdHWE8rcURLWGNzQzdk?= =?utf-8?B?YWFPclRHZlJGek8xbDFES0x6aVBRQ1o4OE9JN2VnNmY0MjRWY1dJWTQ5eFVp?= =?utf-8?B?eDAwWWtZTVBHMUxmUFBPbjZWTDU5K1pGeE02eFZIWHg2SlB3UG1YVUQ3dzBI?= =?utf-8?B?WE40OGFaelFzblg2bFpQR2N3Z1FIOXA3ZjRUUVNsTW00cHZFa0Z1Z0JNeEFM?= =?utf-8?B?UTQzeEpEbU9EYk83ZGRMSUNyMjF2dG5DMXUvOWNLY1lrNkhTSEVTWUM4WjNs?= =?utf-8?B?dEY2b0JSeXhDczNPYUkrMTVLOGw2QXZkUTJmT2NvdFkybmtQUUJpbzc3UVlV?= =?utf-8?B?K1JxYkp0WUNuTVBHWU9iV0ZVRFNXNFpXb01WRjBubWFLWExhcFQyN3Uwd3Fi?= =?utf-8?B?eWVQcTFPU0M2RVJwRy9SQ0F0LzZuRTkwcFN1L3dwK1lUNTV5MmlqVkNCNFVl?= =?utf-8?B?TmltWElDbU1OZTlITWowMlhMUTR2cUZwNXZ2VFhYdnduS2ptd3FSbStQZkFt?= =?utf-8?B?UkhFclBCdVg4SU9CcldzL3RxM25EWnVtTHlUUVM1cnl6VHM1dC93NVBRNTRs?= =?utf-8?B?UEZrMm1DMjB3SUhVSUxHWVZOSDNudkZqeDNzNlRwM2podVczU3h3Z1ZHanJM?= =?utf-8?B?NVFRb1RSTHJ4dlNkeUo0M1pmbCtmTXI4cUN1Vm1FMmhEVW9jWG15cVkrVGEw?= =?utf-8?B?TGFVYUh6eFRER013VDJveFg3STd6bGFmM0FZYlhWcjBzdUkzcGpwSnVqWUFL?= =?utf-8?B?eUJuU0ZkZ05HaWczeW5SMkNPVHQ4dW1YYlM1VWhMZ2NHUnY2YVhWSVMvOHE1?= =?utf-8?B?dmFETXJibFp5L281ZVB5ZWwvem9qeUlWVHpRWmlMdFBYMndZMjZ4WXM2RjFp?= =?utf-8?B?dWhKMTE2c0pzZkNzRnYvQTBua0xpZWlxS3pCajJLa2M3Y1NzMkFGazVOTGVm?= =?utf-8?Q?TKSpYl7iUbZjfvMDa6tBUHhi+?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bc02878-6d68-4940-00ff-08dc80d93e04 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2024 18:49:31.7020 (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: 1/nZFF9JQ+TCogMKLHn7us/+xinQEt+1XRzAnXwof2BzAUo0aYIA2LUq8aMkgdv+t3sTdrIUYBJI1wPgaqraEw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB6116 X-TUID: OGu7wwE0YrKj From: Jan Kiszka As we bail out on every failing command, the test of GPT causes a premature script end if there is now GPT in the game. Fixes: 991d2e903930 ("expand-on-first-boot: Preserve MBR on expansion of GPT disks") Signed-off-by: Jan Kiszka --- .../expand-on-first-boot/files/expand-last-partition.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0cb2ee21..7660bf44 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 @@ -41,7 +41,7 @@ if [ "$DISK_SIZE" -lt "$MINIMAL_SIZE" ]; then exit 0 fi -IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" && echo 1)" +IS_GPT="$(sfdisk -d "${BOOT_DEV}" 2>/dev/null | grep -q "label: gpt" && echo 1 || true)" if [ "$IS_GPT" = "1" ]; then dd if="${BOOT_DEV}" of=/dev/shm/__mbr__.bak count=1 fi -- 2.43.0