From patchwork Fri Nov 5 08:38:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1551266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=s6qmqsDr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13d; helo=mail-lf1-x13d.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbf63sogamgqelvubspi@googlegroups.com; receiver=) Received: from mail-lf1-x13d.google.com (mail-lf1-x13d.google.com [IPv6:2a00:1450:4864:20::13d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hlv715XDwz9sXS for ; Fri, 5 Nov 2021 19:38:53 +1100 (AEDT) Received: by mail-lf1-x13d.google.com with SMTP id y40-20020a0565123f2800b003fded085638sf3292215lfa.0 for ; Fri, 05 Nov 2021 01:38:53 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1636101528; cv=pass; d=google.com; s=arc-20160816; b=VSaYEtZJ992zhk9AL84bJMWmDXhGsW4uefAcRJy9HDXosFGJsJCeScHDTtKxMHH3Ss lMMMd5BvM6LQ7N/HeDGMslkuNhJDjHVmNAECPozfzbViGVr+5xsQSFS2n8nHqwUFSsKJ EbA3vV1GyWvBo0VotWAv19fzyXvOpghgh9eD5dIpdmFXuJ4nhlhgyNsCOHNL8m6wHYP5 qv193ArTZyRbT0sxb8ZAvXuTqpA1TCvokcmYXSdTYGUm5USj5NJ3ehp8PnkmStx7vfBk gu2IBTmv2oxN4sSSBwFtrUjFfu3DuzgiSABFnLQ6g94X7SSuL2isB+Y9VFA0+IsIZop8 VWyw== 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:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=wlf3IYJvKENpJiqzODY/KlOifObK6nhHTII/Hlgbiqw=; b=ywduBxGdfKHjOMnT7M78Avj+0OkNs/RosqY+3fJCCKQVOnJRH5Or3utuPVV+J/V+mU XkzhCOxqJWjdeI7FnT7qjaLNcAhoJmK63INXXKwtXBt21SvHYX2s+7M0j2dqs3Vgj7Uq KaJXM9dBOR0Kb2JIwUtMW4tAEdymCluGdzCPXyO7LlCEtZpaYvgo4Vm3FQ4haYfANXzC Q4JwmLe2eFMnm/nzBqZDnWzBwQUGNNtkz3+E76b1gQKkQhC+pjb6gy2kJRLgoV5M4HCN bRBhYTnUTm3OipcbqxKRSyJMaNT9qBIBsQqqz9Rr4SEPnTvPOGwQFSbKAeCur2C2AMRn 2L8A== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IvGsd4dD; 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 michael.adler@siemens.com designates 40.107.21.73 as permitted sender) smtp.mailfrom=michael.adler@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=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=wlf3IYJvKENpJiqzODY/KlOifObK6nhHTII/Hlgbiqw=; b=s6qmqsDrZzPV5daZ9PCoTvpfpa94dNpNu9WTmMRoEjBg+S8LjfJqk2Qz8D/c0oHLob AETkx8tj+g3isZ25VpZ30gfJE4Uwe2J7kk0sh7R2i58xwzGtdqX4xf30xYb2ndJBIFzM E0LslxxnQjSM3k9QgeTT4EO+9PDyKNtaBRGpTWyDCvkOuapFg+h6+IxddaSdD9n9Ow8o sYhEBGFU5PJLVOptdD4xvDOvvIf2qnvJut2Cbq4Misa9Wa+IB1Lw/u0uU47q5oqZlou3 uWpXKgeql6TJz8wmtqlxXuDewGkLLpcOT5BTqhoxEPuGGlCFiEUgS7HtEmINUMDDuZcc SO6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=wlf3IYJvKENpJiqzODY/KlOifObK6nhHTII/Hlgbiqw=; b=ZRl2/lux45D87oUAhbJ2jcTEL2htoX16h3dLlAsKl6rxSfkD495g78bPXAkZ2BIf/T QzW3IsQnlGmzDFHELgQPk1D7gxv4wH17FL5uCEDWn6nseYfVWaaBpBknHi6CQKmvBAMW b8rv9ohQoxlVHbKTdcvAXYMnILVfHeYsws/mNU76QSmcyRuNw60l19NvmyVERnRPu+4J aH2HDJdasFqqHhb4S2zyKqkWStD2WtjvdpM0z5ZB72NZVbA4Mpn17Ev2OaU9onSalhD+ vu+e6LVyB4l3by3Gp7jo2NaS8pGir8AkoqkE7exybZl++5Y4lXyhB8diinhZDg7XIiC1 GHIQ== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530GHCh/TDfbKeyotgBsatU+Zj+41uk7k9aLG820/AjGGBXPXKOq stKUVyqYpMTYsCatVvuVVck= X-Google-Smtp-Source: ABdhPJxjQuisu72bYKcnbF/1SAXI48qO15nbxr0MUpizY3rfFQiN+sfTjIQ+CBb/ztonOqdoemYW3A== X-Received: by 2002:a05:6512:68a:: with SMTP id t10mr52735077lfe.148.1636101527653; Fri, 05 Nov 2021 01:38:47 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:bf27:: with SMTP id c39ls1434647ljr.1.gmail; Fri, 05 Nov 2021 01:38:46 -0700 (PDT) X-Received: by 2002:a2e:97c5:: with SMTP id m5mr1941014ljj.522.1636101526074; Fri, 05 Nov 2021 01:38:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1636101525; cv=pass; d=google.com; s=arc-20160816; b=D20jVdXStgvMunvlj5k9urWP6vdHfNAu81M8J0rTcFm1kMq7nHKQmWXSbT/zZnbQhu 4QrF+1/W1F5oclq5xqoUoeeYl33xKqlbF5B4LGPu7N38Vi+3wt0zM2VBj/AenYZ8Y0up vbghQpxSk1Lkld0wR5BICM1nn4MMDiGUgG4ohUKeemM2Lx4eAS/LqqPzLf0WPWMKlRGO npjPNJ1aCVtGe7/KdaSz2rjU98ovvJiYMdcpDR9fQGc9pS5C+54G0cRlAhOPM9izTvx5 X3jKHUTbOAcuhg3VmkNtPGx5i5s3JM2jbTK6jlugaRUYG1e+BZscakhtzEKivcY+L9Vu hWcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:message-id:date:subject:cc :to:from:dkim-signature; bh=G2EUadqX3CjnjqOCyzs4RAQ3pDL0OcdDkghOPHYcn3Q=; b=cQt4M40DPPEK+JYf+eyWx0pZG7B/PD5oz00wvxYmOlByoeCJ2giR9g9Y1oBdSWJr9r nHHWJKruaVVdeNCwxgKX45tMkJgbWEkpsELpzmolH/Lr2E8fozaet0aQgIcInaS+4q/P XDhVrGyYC/wVvLujpiT8u93OULLKNW+ZjSdqY8uvifkfQOEe4pBJoI/9GZdhTInM2bk7 uHrhnj9Ei1L42Y/pxCZsJv5st8VDkeR8sQaM1JZfnNzBApQvQB5kThO3M/t9OsyS9Gaa QW3QT9U1y60sC3mdo+suLlr9MdLo3Zr6Q8Nlp+ojTA47m0nPKZ6FFZU/1mBU9pGPwNG5 bRUA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IvGsd4dD; 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 michael.adler@siemens.com designates 40.107.21.73 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2073.outbound.protection.outlook.com. [40.107.21.73]) by gmr-mx.google.com with ESMTPS id t71si280018lff.6.2021.11.05.01.38.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Nov 2021 01:38:45 -0700 (PDT) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.73 as permitted sender) client-ip=40.107.21.73; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WNH2LrBYo9iiCw/eBQppBbhP+muwXF0JpR7+LkkRWxA7bBQXKwIllR1QXELb+bRgvOB8W/6zp2XL9jWty3FhNPEdoswJZ5PD5S+nQTXo5hKRAXtP2qGL7K0wJY6hmIrfCrPA+5TQg9VVaIRKjusRC7kSPJpRuUM3rKoD+xPtdFM4L2F4d5CqSPHTlqTeNmojepP5vBdbrJV2KHBo9rrSquvHqInCFk+p9K2/227sVvHJM2WDR9oTcsKloZw+m5uhbcC7QmPoZ3Y4zNzwWYJzUUJcjG1UIFZa5zlDWZRQFF4qEUFiKlUQf1A4VFM//pmsbZIKcoc4ZJVbbzr4lXd4Ig== 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=G2EUadqX3CjnjqOCyzs4RAQ3pDL0OcdDkghOPHYcn3Q=; b=PgpNkR42qCV90Vkoq99zS+RsZX/i/6sW2SBb/LzuJakbI66srr8+X8Lo/tDpGM3HnE4MiimgptUOaSb7kGahypfXC2mzq8aKim4wfWYOFSSk8Q+MO2nW1dJgs5kNVhsh0OHr/TMC7aXwlmTUc8a4xeotBCjFviAbpEKH/yE787JOD+1efr/Q091HLrvwwFTM9BvgysOwSZ4YuFENOfIjjTj0KBSZ1KG4efHprSCwIYSOIERRmzLIdnJX6VkVz61IuAoO/yIuP7JEln7gtDjAjw0ClQG3NS0KaI6n38K73rW/HhklNFMbZVV8ZoB6+X4x32HtsQToD3mbeujyso1EmA== 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 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3299.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:188::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Fri, 5 Nov 2021 08:38:44 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::750a:ba3d:689b:a7cb]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::750a:ba3d:689b:a7cb%7]) with mapi id 15.20.4669.013; Fri, 5 Nov 2021 08:38:44 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 1/2] diskpart_handler: support for GPT PARTUUIDs Date: Fri, 5 Nov 2021 09:38:02 +0100 Message-Id: <20211105083803.332678-1-michael.adler@siemens.com> X-Mailer: git-send-email 2.33.1 X-ClientProxiedBy: AM6PR10CA0100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::41) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 Received: from localhost (2001:a61:2416:dc01:36e1:2dff:fe96:7bc0) by AM6PR10CA0100.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 08:38:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 552cc65f-8337-418d-7c2d-08d9a037ad70 X-MS-TrafficTypeDiagnostic: AM0PR10MB3299: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:216; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4dopDgdXjPHstPGJc/WHxbmS1N/frojC8t2puQmLrT4w2Ql3ySq40v0txPwxQAy9GBQlzGzhcSh67dddrvB56i6C9jhgJdyMHtTiv4uGXSNTBafFUIRa7eiHjcUbTif8sOXE9gBMEyWHLPUma3p+wEzEf9Zs5reHZrKXMDvamC3+CmfHtfu06OM/rX2qP+gKBiGFiWW+TnY8WKiYAAT1SBnZxogNFglnxYp3iWSXLETv5rVLivu3/j+G6Sk4m+yVk9W0xrtju+5D3feGcGPeMPoi4jeQkRSUu5o3v67X1KrfpJUBKky4Gdu4aRW/57wxcbb10Pc6ymBv60wWL9Vu0bOmsSQ7croDdeBMS5uhfDvtI58O8YD7Z838ISX5CFOX9W7aH6/hNYJoj7xMDKyrCMPtnxtsqWWnqEblzm7Jw+MlFYHrjwQfBESgqFGibz0Y72ukNRI2eSXkX8Jr5xt11dgXH9YTdM9o3Us5VlF+uHgiroZMqORC5JoWBWcmTE5aufVNX7++swrwcjbXCCmBxWKYLpNqu8EjmQjakgHuR0sgGaBZbg5mNfw8zxZVhbezXprIoo33wTbsvvKX0KL5w1Ql0ETrFIsBdPR7VWccO6kfsVY8MvjCjttJVTZp6nyeVtxYix3BENMShCGJnCJbRQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(1076003)(8936002)(44832011)(82960400001)(2906002)(66946007)(2616005)(83380400001)(8676002)(6666004)(54906003)(6486002)(38100700002)(5660300002)(186003)(508600001)(66556008)(4326008)(86362001)(66476007)(36756003)(316002)(6916009)(107886003)(6496006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: enl6H+YpZN33UacJpHP9TayiBpVdq77DBOcqOIRM0Cps7xhr2TXpFyRvic4K8Mp28vqQyX5tnkwDQAxnDP7cX0+t/ix8eI9NefKTfW3EW+rej6vbC0uGHyYhgG+cvxZVWuS+gUWw3M8iGlj9blCFZM4qMHa1wuOOmwiEl4WRtdGjERSEMoepu78B7w3du7/1A3tmEceh/72lxwUmvFJra+V60q9GmcfrAF0osDKgD1y/COm4yuj48cno4pM4y9680w46wmUodLUKXpC3Lyf+b+BeXd7Bob07smS4r+7htFEW6MT7mEidupOCWVFAY80KeJD3wgHHPMPSKtmdjhFM9ali21y8+lkEXxLIoPiIc68WZ6H6+ml/5vd5cxWApQEQWLyWEEe/77tEddFThN1vHpAO4Gmz1stVp1MklOgiQOtNPG4ygqnkk1AiyQvfefSpsM+LC9gEgc3+PKbSPP1nuw+U5AFWo8Rep7awiZ3T8LTcz4zcT85pKFEv+Pc1qx6rqxqAlLZ5Jswcc3lF46AHObq4HnOmIpHD7sYorcY8iEBcmy2XxHrImkfKFS5qMIn9WoJVs9YRZlbur4bBA2NXWeVhyauvCXSwEc9tm1VVKCA3qve1ZieZRz8Y52TliKDo5fUEtBTHuR3+4/g44usIw7pqDIJC0vvk1YqPNu9tBESD+Va0QLH5Z8lViiHT992EVKdZa79VzP78BBrAjozBzeHZdD1pg2959ReSosNxI4IXGWm6i+M7VwKHEra6GcsqZWv3OU0GYdoJrmPSeTMzv/teDYgAgQS1eWXY5z4FZaxczY5cj+TsF3VZKYFgbt/OR9x1d4MPerMQDrxUnm14J9jR/xwQT1LjLgYA8WPWZE5ghts7BD6lhcpCA3E8dUndpstv3NsJJ8m/gEPQAAMS+W4YmrQokO1pCbaskb3oiIpxNgUiXNCDOm4ejpaiThw5bbOn+26SrDcvhBViTEqbySQ+SavZSg7aNNZQUUWwmiZcyi6WE0725Nh+hjdkoJOosC5Axr0PiaKhogiMLkIK0lL3u5V98S1puEr4dyWc60YupzBcVp0kX0D7154lPr2vYfOJIjnl2Rbutz/JwwxeR3detLauRhYJuslLGWbWrhGlJCMWPHmvs38SqP+rJs4uPOG3OvMY36xqilGCed5j8A8rGyB+37DEK5sqrva1mg/pIQZxktDhF9NTKBiLR/gu+7bWI9DnYU89K5+PV2/Xbeuj35/gc8wW/OCBRzxs91pNF9z9ahC1iucmFVPb1FK9pCyxpERy6ZQMSSfaQLla5tmzMEznYmjI+28QV3iqsm0Ra+C+dqFGm0mwVb4z+1M+6H8OEgU1TOUU6eFqqI7pKDORSXDRoLnxUusrsj42WBSgPZvXZeVK78D67hZrG9LDXGWOn/wqZA/MbXzjTzSDdy+Ju4xygNi0KyYXn+mYt/ld1Fh5IzlFOBflL5hB+I4kA2akP7/9oSpT3cYnRVr47qOCStchrfPb0PAE9aQ9ggaiHKk7V+4hmzz3BNnxQL8VYUdKz0E01DWz66l+qKmIraqfRVgpd1f8Tk7d+9odBtP1SHrqJKWPtQvDfnL6N5LA/XyBkpBohTHm7eE8LdbhWSuvoPB+dMChNEX3oZnVUWnCqjs9uDq38OXbch96YWlzHXw+4Z8xw2EznIbcxLiSqtb8ktSTerGiem3gSBuEKbWr5lgzQ7za2jrwerBC6wBJvKDrb3m+FVZe+PrpYZiMLYl0luQVdV8CHIybiiLSHd8= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 552cc65f-8337-418d-7c2d-08d9a037ad70 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 08:38:44.5280 (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: kSL3vsYb1q7Fl+pol3fKLVkBjGd9FtSL1PHJQuxeZBmUDAcxL9XmaPJrv+DgIzcT1QeCRQpJ4o74i1BHn1UfU5ifuNoaeK9vOL+uFHUTZhg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3299 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=IvGsd4dD; 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 michael.adler@siemens.com designates 40.107.21.73 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , It is already possible to specify PARTLABELS (using `name=`) in SWUpdate's diskpart_handler. This commit makes it possible to explicitly provide the PARTUUID by setting `partuuid=` in the respective partition's property section. If omitted, the current behavior of generating an automatic PARTUUID is preserved, i.e. this is a backwards compatible extension. An example use-case is to mount a partition by its PARTUUID, i.e. by mounting /dev/disk/by-partuuid/ (which is typically a symlink created by udev). On real hardware, the symlink might point to /dev/nvme0n1p1, whereas inside a VM, it could refer to /dev/vda1. Thus, by using PARTUUID, the same mount command can be used in both settings. This is useful because - unlike the disk UUID - the PARTUUID can be explicitly set. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- doc/source/handlers.rst | 3 ++ handlers/diskpart_handler.c | 81 ++++++++++++++++++++++--------------- 2 files changed, 52 insertions(+), 32 deletions(-) diff --git a/doc/source/handlers.rst b/doc/source/handlers.rst index ed811e3..f9c771b 100644 --- a/doc/source/handlers.rst +++ b/doc/source/handlers.rst @@ -844,6 +844,9 @@ supported: | | | will be created on the corresponding partition. | | | | vfat / ext2 / ext3 /ext4 file system is supported | +-------------+----------+----------------------------------------------------+ + | partuuid | string | The partition UUID (GPT only). If omitted, a UUID | + | | | will be generated automatically. | + +-------------+----------+----------------------------------------------------+ diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index e08c10e..21efc8f 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "swupdate.h" #include "handler.h" #include "util.h" @@ -50,7 +51,8 @@ enum partfield { PART_TYPE, PART_NAME, PART_FSTYPE, - PART_DOSTYPE + PART_DOSTYPE, + PART_UUID, }; const char *fields[] = { @@ -59,7 +61,8 @@ const char *fields[] = { [PART_TYPE] = "type", [PART_NAME] = "name", [PART_FSTYPE] = "fstype", - [PART_DOSTYPE] = "dostype" + [PART_DOSTYPE] = "dostype", + [PART_UUID] = "partuuid", }; struct partition_data { @@ -70,6 +73,7 @@ struct partition_data { char name[SWUPDATE_GENERAL_STRING_SIZE]; char fstype[SWUPDATE_GENERAL_STRING_SIZE]; char dostype[SWUPDATE_GENERAL_STRING_SIZE]; + char partuuid[UUID_STR_LEN]; LIST_ENTRY(partition_data) next; }; LIST_HEAD(listparts, partition_data); @@ -308,6 +312,9 @@ static int diskpart_set_partition(struct fdisk_partition *pa, if (parttype) ret |= fdisk_partition_set_type(pa, parttype); + if (strlen(part->partuuid)) + ret |= fdisk_partition_set_uuid(pa, part->partuuid); + return ret; } @@ -424,41 +431,44 @@ static void diskpart_partition_info(struct fdisk_context *cxt, const char *name, /* * Return true if partition differs */ -static bool diskpart_partition_cmp(struct fdisk_context *cxt, struct fdisk_partition *firstpa, - struct fdisk_partition *secondpa) +static bool diskpart_partition_cmp(struct fdisk_partition *firstpa, struct fdisk_partition *secondpa) { - struct fdisk_parttype *type; - const char *lbtype; - if (!firstpa || !secondpa) return true; - type = fdisk_partition_get_type(firstpa); - if (!type) + if (fdisk_partition_cmp_partno(firstpa, secondpa) || + (!fdisk_partition_start_is_default(firstpa) && !fdisk_partition_start_is_default(secondpa) && + fdisk_partition_cmp_start(firstpa, secondpa)) || + fdisk_partition_get_size(firstpa) != fdisk_partition_get_size(secondpa)) { return true; + } - if (fdisk_parttype_get_string(type)) - lbtype = "gpt"; - else - lbtype = "dos"; - - if (firstpa && secondpa && (fdisk_partition_cmp_partno(firstpa, secondpa) || - (!fdisk_partition_start_is_default(firstpa) && !fdisk_partition_start_is_default(secondpa) && - fdisk_partition_cmp_start(firstpa, secondpa)) || - (!strcmp(lbtype, "gpt") && - (strcmp(fdisk_parttype_get_string(fdisk_partition_get_type(firstpa)), - fdisk_parttype_get_string(fdisk_partition_get_type(secondpa))) || - strcmp(fdisk_partition_get_name(firstpa) ? fdisk_partition_get_name(firstpa) : "", - fdisk_partition_get_name(secondpa) ? fdisk_partition_get_name(secondpa) : ""))) || - (!strcmp(lbtype, "dos") && - fdisk_parttype_get_code(fdisk_partition_get_type(firstpa)) != - fdisk_parttype_get_code(fdisk_partition_get_type(secondpa))) || - fdisk_partition_get_size(firstpa) != fdisk_partition_get_size(secondpa))) { - TRACE("Partition differ:"); - diskpart_partition_info(cxt, "Original", firstpa); - diskpart_partition_info(cxt, "New", secondpa); + struct fdisk_parttype *firstpa_type = fdisk_partition_get_type(firstpa); + if (!firstpa_type) return true; + struct fdisk_parttype *secondpa_type = fdisk_partition_get_type(secondpa); + + if (fdisk_parttype_get_string(firstpa_type)) { + /* gpt */ + const char *firstpa_name = fdisk_partition_get_name(firstpa); + const char *secondpa_name = fdisk_partition_get_name(secondpa); + if ((secondpa_type && strcmp(fdisk_parttype_get_string(firstpa_type), fdisk_parttype_get_string(secondpa_type))) || + strcmp(firstpa_name ? firstpa_name : "", secondpa_name ? secondpa_name : "")) { + return true; + } + + const char *firstpa_uuid = fdisk_partition_get_uuid(firstpa); + const char *secondpa_uuid = fdisk_partition_get_uuid(secondpa); + if (firstpa_uuid && secondpa_uuid && strcmp(firstpa_uuid, secondpa_uuid)) { + return true; + } + } else { + /* dos */ + if (fdisk_parttype_get_code(firstpa_type) != fdisk_parttype_get_code(secondpa_type)) { + return true; + } } + return false; } @@ -610,7 +620,10 @@ static int diskpart_table_cmp(struct fdisk_context *cxt, struct fdisk_table *tb, fdisk_table_next_partition (oldtb, olditr, &pa)) { TRACE("Partition not found, something went wrong %lu !", i); ret = -EFAULT; - } else if (diskpart_partition_cmp(cxt, pa, newpa)) { + } else if (diskpart_partition_cmp(pa, newpa)) { + TRACE("Partition differ:"); + diskpart_partition_info(cxt, "Original", pa); + diskpart_partition_info(cxt, "New", newpa); ret = 1; } @@ -845,6 +858,9 @@ static int diskpart(struct img_type *img, strncpy(part->dostype, equal, sizeof(part->dostype)); hybrid++; break; + case PART_UUID: + strncpy(part->partuuid, equal, sizeof(part->partuuid)); + break; } } } @@ -864,12 +880,13 @@ static int diskpart(struct img_type *img, goto handler_exit; } - TRACE("partition-%zu:%s size %" PRIu64 " start %zu type %s", + TRACE("partition-%zu:%s size %" PRIu64 " start %zu type %s partuuid %s", part->partno != LIBFDISK_INIT_UNDEF(part->partno) ? part->partno : 0, strlen(part->name) ? part->name : "UNDEF NAME", part->size != LIBFDISK_INIT_UNDEF(part->size) ? part->size : 0, part->start!= LIBFDISK_INIT_UNDEF(part->start) ? part->start : 0, - part->type); + part->type, + strlen(part->partuuid) ? part->partuuid : "automatic"); /* * Partitions in sw-description start from 1, From patchwork Fri Nov 5 08:38:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1551265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20210112 header.b=tloBh4Hq; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::138; helo=mail-lf1-x138.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbf63sogamgqelvubspi@googlegroups.com; receiver=) Received: from mail-lf1-x138.google.com (mail-lf1-x138.google.com [IPv6:2a00:1450:4864:20::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hlv705gLdz9sRK for ; Fri, 5 Nov 2021 19:38:50 +1100 (AEDT) Received: by mail-lf1-x138.google.com with SMTP id j16-20020a05651231d000b00402bef31189sf1467282lfe.18 for ; Fri, 05 Nov 2021 01:38:50 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1636101528; cv=pass; d=google.com; s=arc-20160816; b=gaU+mEdD6Eqtm3Zg7NmM212Wolk7KMKl8+d+Ww1QCMxoPs5h25L5MPdVsmg8oN1h6F vakPJfJ4Ui9yctVetjXEnGyBBD1bH95mltyNSv1PAXvidZSAkUiOj59FIPg3p4uMv/kp k7sAyfql/VqxfWBS7fxf9/ZJLe9kya3jMt2faFwW8rX49vCVzZYH4XF10p4Cd2UtVhCZ Go2xG+0CNjPBeS/qAcDt/AYmFSX7B7vQ7iFJCFzTHJe1pVA9f4LowcoecnEqM7Vh1n1w 761AV1MfRVW2bh5X5jV5sk5roB1dhrDJwcI6t6RK517fVNIMO8RAnxxMtXJVLhiNGmNf evuA== 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=1/7Bs5DFUF9AyyJMwFW9zxQdJOkHrJ/sYpyaDCOs59M=; b=uoPnQRDkMcItpw217Fs5STP0zXHcTKQLEaAFq4F/iFu1FqIFZ+0+OnMdhxf/Qculg+ XMVayuCwMB2L2gZuQMynCfRK4SeEtcC8t4rG1WL8Q2UOUcNif3cTtr+S3r3CeCxUGFGm 0Q+AD1GiJIdbPyAAsOQnxPGWOrWt06mFVHtBNbmDWVzZjEpQEMk6zhBjP7yRqLSt9X6J 7MvUKSiRt8onkMnowxiE2+5KIDIIDrMLQOgBsCxCkI/np1xQgAgXGq2z7x8MzdO+7y+v EsRNu4lHH5HBd1NSC8I2Nxk+lpU0OK9lA93Ub8ZYbv0Sl5BZruqsttHRVErLFXDIJ5HP 4hsA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="NzGS/w7F"; 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 michael.adler@siemens.com designates 40.107.21.73 as permitted sender) smtp.mailfrom=michael.adler@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=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=1/7Bs5DFUF9AyyJMwFW9zxQdJOkHrJ/sYpyaDCOs59M=; b=tloBh4HqD2/P3FyuaGm9PXyJZkNUUHqx+zJgQoQaaSlqekCyYv3P64ZWDXr2BbkxCo xat5LT0x7qL/3UCfthKUxch5V2uiUgR6DPjUgtYso9rSkMcDrjjdwdqgnHoSgA3rgCzj 8sKZ5dyaZk9dAsUDinStdPU4MzZBnTacLq7XEt2XRaKbV8bLKDk/qyPGu57VlpeLyr0J xOLmUqhp0pwU2SE8HMqiGziWfl1uJpBpVziVEpwcZ0v9BRSDS9FrijTLtoX+0w7pl20x EVbTrahQTW+LRg727zQcnlJ6juRSFDsHVmmaU2eje1/8m7/wfnKgv5vpCBdBIUcAo0xq H+Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=1/7Bs5DFUF9AyyJMwFW9zxQdJOkHrJ/sYpyaDCOs59M=; b=ZYYRLylwotlTPNp+MngyjFrcDgtSZLXdi1WsnVKJ+NERZ8HqY40DFlR6CeSqt12Ras GHtM98B4Qz2R8YvkBJj7c35KCYkytOpY3WTH2/9ktA4Ntz8sPCufimlzuyYzaqPyPIT+ lFkc2JnU4AzsZg+mJ/EOCzyCG3WaCI9pmnyTbmRgfcVPOU9/DfmE9kvz0UeTWZIpba+7 7ZqjCrOVXSShVQseHSzQ/0DwhE6qrqC4ssSfb8P9W6tWbC0kzNmoCeeN6InO+G//rCLY BOEG7wJv0MBJAZLplSvAmED4hb1g9xAo7AWGi6fo2GVF8i8wH7gOxtYWj/6ZUOg4KDaC NJUg== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531D8XdAyA2H74WyPe/uQX+ytWe3w8P7wF1QJhgBx45dMvzg0rAL o9aCCZcPPKI0uiykpszGFN0= X-Google-Smtp-Source: ABdhPJy4ebGEbBoET9KrsSxlle4IAA2fWB8p1XCR5Ps8p3Iw1ZUyGjPy6LivTX1EpwHn0DcpQ6EXXg== X-Received: by 2002:a05:6512:3f6:: with SMTP id n22mr38705840lfq.94.1636101527962; Fri, 05 Nov 2021 01:38:47 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:b8cb:: with SMTP id s11ls1431127ljp.8.gmail; Fri, 05 Nov 2021 01:38:47 -0700 (PDT) X-Received: by 2002:a2e:9d09:: with SMTP id t9mr59237753lji.400.1636101527024; Fri, 05 Nov 2021 01:38:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1636101527; cv=pass; d=google.com; s=arc-20160816; b=1AgvJc5aytsG5LQQq0Afy5mih7uVyK6HNBylHlg9Yxydudy9oTQ+Yw5lydKJpo7zfn g10IIMON6bkvvjNwRitwG2FblO6jgYPZT/d5qFSgHzAdL4GpNYPHHrlRyiD6zIRUMBw8 Wurru90CppSK9OsLsp2URAJrhqSfZrutDKtlLEZmB9GNO2gpT33omk9OZKuO73mkAXVX yCXAgNUDk6zrM7AT1uUh5T+IJCXa0qylZgrGVxJ6AP9IElMaekOfAJlCeYS4Al4RXMV5 NjjAZFFJXe+5SBSdlfnCZfy2QQ/9CvuzYSOhUl5X01Hzrzwr04W9/DuaTQInStPrgbTE BVxw== 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:date:subject:cc:to:from:dkim-signature; bh=We1Kq2GB0MyeE5YpjOmXO4vOCNtGfSRCys6ZcqCFScU=; b=N5thh7nmCa1DT/HuVKls44wcew7pdCe75WPv/GYwdNd1dBNqZENMVZP6zAASLuBh26 YUQTL7+t3M5DOXTx+MZSLxBfDlmBj3tYhNEJrT3cp26UFcfnJ2wum0PDGvzWp4eJ4Z+p yHYrD8z574LqiQIFvK6hxwSd0CihwhNHsZSq9yghal9JH4XtBACxQWu+EWM6YbmLiHJs c6HpQI+M14oPwawttWyQo2x5FbE736wG6QJSY1hZhW/uQcDct4fSl9clp7upFtG3WBRH MeaNC75X+lgn0tEO2Gi4PPGvQHjAA41XIVkh6su5Xa7DQ0f+QcLUMFlCGu/BBruFPTDw JaDA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="NzGS/w7F"; 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 michael.adler@siemens.com designates 40.107.21.73 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2073.outbound.protection.outlook.com. [40.107.21.73]) by gmr-mx.google.com with ESMTPS id t71si280018lff.6.2021.11.05.01.38.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Nov 2021 01:38:47 -0700 (PDT) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 40.107.21.73 as permitted sender) client-ip=40.107.21.73; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AuxtXGuQoKQd76+fByYDImFszIr6Y1YmCqC7cXUFxYEjS6rKKgwMGS4XaXO8yIXoUN29T2DLeWS5hwxihV5aappnNZidVtzZ9Rolzv3mWhdxFEJasMuzu5uENv95zyBWoz7Ua46Kpf4bSWZ3pGfyutBzORAt+LZ+nY0wPZNQpTfHExJ5us+a0Gcf8t7vM51jE3J4tGQqqelYBGyuo5c3u8T7eKpSK2egQ1D3NgvsUCIn4eq10PYuDc863EsowVMJ46vW87y0jz2FBLCjWiBT42ke+t+RfgHz5Jtz7gWkWBO9EgtMvlPj163e1JYvABT3/1BXz4XmKEfkWim4Gc4zrg== 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=We1Kq2GB0MyeE5YpjOmXO4vOCNtGfSRCys6ZcqCFScU=; b=OJ0E8I9plPFJyWLtxgQSUSpAxjZM8xCr7QZLwzufvn8Ohphtrh2BPK1JhiOyfANMOlXIvJINL0lVRDnOvw0aF6Ucqq6uCcsm/CcoU2LjNnpvwtuxyTyKOGJhrer9ax/4EyWCu8/GkdvsT0cnyqX8QLcKC4qUJJUf4B9w32qDXmtQ8/Ew4VbDcxj17Oo0sQXaMEkf/EGffL5CbbcvOZN5+ooA2zW/nIk/n2uB4xhFiX/Tq7wmeiAB5HkNi0LTzlBGjsoaw64AGoog6+hNFjFUNxWn6NQPrbvT8asMMg9Yuegbmllm0EDEo+iTBeGHtV+NaXCzOIQ90Qe7fbmbaqjVQw== 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 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) by AM0PR10MB3299.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:188::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Fri, 5 Nov 2021 08:38:45 +0000 Received: from AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::750a:ba3d:689b:a7cb]) by AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM ([fe80::750a:ba3d:689b:a7cb%7]) with mapi id 15.20.4669.013; Fri, 5 Nov 2021 08:38:45 +0000 From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 2/2] diskpart_handler: rename diskpart_partition_cmp -> is_diskpart_different Date: Fri, 5 Nov 2021 09:38:03 +0100 Message-Id: <20211105083803.332678-2-michael.adler@siemens.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211105083803.332678-1-michael.adler@siemens.com> References: <20211105083803.332678-1-michael.adler@siemens.com> X-ClientProxiedBy: AM6PR10CA0088.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::29) To AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:d7::22) MIME-Version: 1.0 Received: from localhost (2001:a61:2416:dc01:36e1:2dff:fe96:7bc0) by AM6PR10CA0088.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Fri, 5 Nov 2021 08:38:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2473511f-9ecf-4f52-b8fa-08d9a037ae26 X-MS-TrafficTypeDiagnostic: AM0PR10MB3299: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1332; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wQ9K4/UJK94EG6gm7dl0g7qYNZwzdnkRNbk9lekgpegT6NvJpFvWwJD6lAlnXsHFcXqHf/aIRH7jKnPvlNtmGOnnGJ4rYoxwGDfx7fUxIVkBMRM6lgO3CMCwuO5+ZZcOY/mx+WFeVMPWnuElAYzj9kbu+tyzsUs3gv54RsNMepisn0yd1CSd3mwqTeYw++0wW2IuVD8SEkppz7RlhFrskr7AI5JMB9SoYPDWWvn1xjR2hFll9BOeESDtQNJgVr/+2JenLVRdRl4Z2yFyS4qHcTmSYMpNXHakupNaq9IV+txqWUJPPh/OUrKPzPAKbJi99zq3/0iGjYpJovbiFMejpfdfTISNQ7aA0oihzibSrpSm9on57StoY1kIaL5r1OAk471TcSrg6rW+FTfI9QbD355mZ10i1yGXhSoTlR2J35cjJsII/7Ka5r04CLs+NaKaFciY2RrD1SnrW2GHU1M8gOD+wGPfV8i22lYQn7RoQNC27mBfB2kiNo6tKwVTZJ2brfFT177/6RU3TMPKlCZUqjOK2x4+KYemuQ6nFOyNOcpkybj6Zv8vJcKVCgL0rJSaS6vIpcdwLIdAjK+9jHvAE8Nl5tEsYMAcmv+JZwN/xVTbSyUjfgU5+euDJbjcuSR5pkdp0VJHJ5MFm2EQcPajiw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(366004)(1076003)(8936002)(44832011)(82960400001)(2906002)(66946007)(2616005)(83380400001)(8676002)(6666004)(54906003)(6486002)(38100700002)(5660300002)(186003)(508600001)(66556008)(4326008)(86362001)(66476007)(36756003)(316002)(6916009)(107886003)(6496006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4kh1nh5QZxY1uAQafBR8sJLHEYif9jOZkh/Eyuu6e6+fB1D1PGJRMD5vdWd8cfkZi70VkQ4qaCdjs3BvqpGO/PT5S71mppG4/nAUt8j5vzFtbEzOAFLiZjFxfJjbYjxBP1QSddNw5XDzHsS/keWmB3Bmc0e6fLGXo8Ys2r+mSHqJm/cQoGmBtwCyi3Wtk6GPcMD2osp2c+AU2YjrW3+Ham6e/XgEMZM+h8vRkGdW2fly5DoIu03e59DS532Tbwo+dXFkFGaoqwS2RTXBRuh2b0uhbj9/3gVB7Izrf9ZONSmKODsnWo4PUGz421WKUz65W/Bpk0Nf8QzOxi0TqK+2SgDeyfnv7oclrh2+b9jQh1KqPc72JlTJtbBjXXSuHtp477vTfwjCcEBg89FedYvZ47t0TQr9W5KF2oUijaL/EEbGCon1YNxS0zyQPN+eu5UJ4RVxmOpWfSG0FnZG0g5WjupnZygZ4rMQdMG+C84LRJO5PpxOKtIrh216y90KQ2+mXHZoum7edMdQcjAPHzO584UcmT5mDhaX4Hrf38JYlRNpM4tuP4H6t7z0n0SOLWej4/rHIhsuGH0C6QfHZPDyIWMW8Wg/yiQAKNvuo4L8/dwEkr3kwCt9FjgQnFbDgaZ5E6CvWUm/81fAgp/g4n5vnmvpxcQ4uxVzhIdyLtYiGii3gYJVKsUMRmvGOC+fPrNryX90PvC3dCW08SLUFpzE2WCgcdNio4nMAeFMfajsMgN0GoqkDV56mmOOD/KhiVeHejiL33Hk0gcsLgZmsgDZ7B+HohAnnCv2AIQq3vJDiRcxCcuRJVjQSfVOYVlEux6T72LILzQplIz6BMvELtH6kYpvEj8CK/XEX6hxFwWVpU38uSKCD9HWaHfSLB/1YjQcalblXUcbXIPA/SEFcEI6Xqgje5m7G3+c0+07PdF5SNrvR2oMQyohFnj4Iees+7EFlV0jvGYmqAVKHBEh2W9+40rNJDMF/6LuQS9URTq+a4rQ+QlFE0YWF+ww0F9TLCGc25VtZW2BLH5HujmQCF+ZodSE+6gSn3ckh8e9/9OnhVbs7k4ZEQrYU5Z14ODTk4DXwRDvoxp0XQEtifRCXUb/KV+FBfsntx151l5SDjKAQ4HDN8m3aaMPq8k0u40p+lYEbuhIHPXxP60B3Q5FDwlKf8yj+WHN9WBsuz06BhIqbFDxox6Wf4dmXm/Zv1si3gAyHAscdr/IuoCIHj1hqBK+f9uGzlb1RLDXTHbnIieVGTElzhzW1OY2p8wBOy46YvdXvGA9iHdzh/DS/NFfspnP7wmBC/YoroUN0Yfy3bwnHkptvGgb2t+7lSuxqtZs0/2Gcbpqr+bRzP5vWxn6GKHidg1ieR1huPZWWFIRWGtBdpmgdPnUiQ53/mpGnoSuQAosIxIfKwFy0qJFtfSxfRYcnh3vctYn86MvIChdSLV4OXH6/QDY1/aMmcNNkRuGlby8Mo4zo+aO6tkG0LYYMTnZB9XRL1SF6dQ0K/DL3QVI64JthvmmCRrmachYYSorKe4oDRCJLForr2AP/XEc7HsAptGgHyTPSZg4kMlYnzrk5Vnmk/XYq7i2kaQXKdZaKOZp2/lFp7OwhfzqBUS1oXiQOUoV27PmzrLg/+l9/GCPDtdssP9Jm/XAZXuzegIkxy33bgQEVSTYRp5i4xy1nxdcchUE1TdJFX8xBIv7bcD/TH3dbgHQBEl/J4WCgGa2XDnUBp/uxj1eXoNV83ZJIgPa6a2vqwlMtDRxlW1Gal6ruVs= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2473511f-9ecf-4f52-b8fa-08d9a037ae26 X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2322.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 08:38:45.7842 (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: 7oUqzNe8uNUiSfEC6JheHAqRqhBOwgIi5NKVbOfly/l0AMeb+/ZRFnNHyQbWJ5m0nzZh1rqHtFngCVbyFMBMAglMAIyKS7AId45zb1f3UoQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3299 X-Original-Sender: Michael.Adler@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="NzGS/w7F"; 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 michael.adler@siemens.com designates 40.107.21.73 as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Usually the suffix `_cmp` indicates that the function decides if two values are less-than (LT), equal (EQ) or greater-than (GT). This method simply returns true or false, hence using the prefix `is_` makes this clear without having to read the method documentation. Signed-off-by: Michael Adler Signed-off-by: Christian Storm Acked-by: Stefano Babic --- handlers/diskpart_handler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 21efc8f..b11f749 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -431,7 +431,7 @@ static void diskpart_partition_info(struct fdisk_context *cxt, const char *name, /* * Return true if partition differs */ -static bool diskpart_partition_cmp(struct fdisk_partition *firstpa, struct fdisk_partition *secondpa) +static bool is_diskpart_different(struct fdisk_partition *firstpa, struct fdisk_partition *secondpa) { if (!firstpa || !secondpa) return true; @@ -620,7 +620,7 @@ static int diskpart_table_cmp(struct fdisk_context *cxt, struct fdisk_table *tb, fdisk_table_next_partition (oldtb, olditr, &pa)) { TRACE("Partition not found, something went wrong %lu !", i); ret = -EFAULT; - } else if (diskpart_partition_cmp(pa, newpa)) { + } else if (is_diskpart_different(pa, newpa)) { TRACE("Partition differ:"); diskpart_partition_info(cxt, "Original", pa); diskpart_partition_info(cxt, "New", newpa);