From patchwork Wed Jul 28 14:02:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Gaudig X-Patchwork-Id: 1510867 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33a; helo=mail-wm1-x33a.google.com; envelope-from=swupdate+bncbaabbf6hqweamgqex7vcudi@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=KP91JnAf; dkim-atps=neutral Received: from mail-wm1-x33a.google.com (mail-wm1-x33a.google.com [IPv6:2a00:1450:4864:20::33a]) (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 ozlabs.org (Postfix) with ESMTPS id 4GZb3H1y9Xz9sX3 for ; Thu, 29 Jul 2021 00:03:07 +1000 (AEST) Received: by mail-wm1-x33a.google.com with SMTP id n17-20020a7bc5d10000b0290228d7e174f1sf257538wmk.0 for ; Wed, 28 Jul 2021 07:03:07 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1627480984; cv=pass; d=google.com; s=arc-20160816; b=wmeCofCxIofg/lvGYzOYGaCLiFyCo4u6cmIIph7HefljhEQ/Nf5QgAULH5oUmFh6I9 KU696M9G2f4A1u+Mqpqr/KqgXhghc68S8WNt7QY5RULwfF1VjWozPwsbY+aaceI9OP2c yz3DsKn88UdFDAw6c3uHPkstfSAw7+EQ6ml38UgXfDGqFy2G1GZXPq3U8hoslYO9Dn3+ e/MVzwlp+dtkPksRsHzJtrM+3pkhQb5n0Ib1gBoN8oXZTbEAO+RrX9bwMDxPjbTd8Fyp SlcQB6T7FfXItDye3T12+EY1eAPiHK+s3Fhss2xd7bBM0RKWkpXgwA89/aearcyTd6/Z 7W6w== 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=TcGZHZbWRglD0asUNWKe+E0VUJWGFJJ4KE276u4YjrM=; b=lIjbnaboa3QQ3TeEjWIZh/raZrljgqq+eWQCF9Q8s2WDH8gYXVh5d7a1o6ybkZBW78 U9+FnhhNWRBbGL0OQNZpD7kNEUmcf2DbMjrPRDEYOK+TcpOTx8GFzmh/H+I7FhA6JdfL YTPc4x6XHH2L1mEMTZXdlOOyf7WMKCnkowCagiOO79lNyKL+h1++AnnUd2wo6tKIfHId o4o6cwRaclKEovPTjKKfLn2IQFaF9mF42AadtjMb4gXuLDfyYWv6cxpMzKx4fH1FWG1M FPt+n5IKbdAL0XeZFqhFoJPO7CMCBrwrXkqWiDOTNJrq6CWaX3bgPbCURJPOv0mt1clP goxQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=HZgX1TXE; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.15.79 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; 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=TcGZHZbWRglD0asUNWKe+E0VUJWGFJJ4KE276u4YjrM=; b=KP91JnAfAnGj2CaKZvQLugtutD3aXBMuDyZ55zniWauGtXrG7EjpuHC70yr9PlcaMb majroQzb6WH1fUAgKTFeDQ+QXW+FRKLZ4NT5OdU3DNYWbXp8Fd8yxBs+SPiTGdG1nQi5 SDRrbkZpfYYyAvZV8waIKp8hQ2PiN+IkyabI0fGUWwufcOz9ksa7Sig3MgzdkZuzH5wN VVwVci/9d+tILauaJi58mFHwa4NVEmyaFuf/Frxi7AM24GDYPfh3cwGXvhjI/YYx7rFn 0lE6xKAxxr6xH+e7Ughy2xROCV89NqHg4kLOjHlFSXcC4UZVH6s426V6BnVyEjIB4mWu SNBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=TcGZHZbWRglD0asUNWKe+E0VUJWGFJJ4KE276u4YjrM=; b=M0WagB85TLwhAenlbQTWWLbgUANBtJLtAEP/64WfDKhyIYCK7u0B51qxRSaXnV/uNE CMZfkMrtFGey4aFjoJMiuQdZMDrj6CCAnD3pdJgJJf/HCu9SyviwKzdG+wm3JMP/S/YQ zL2Nd3q2XJmg7C2hDwZOpJAaLIyrAztjWewnfFjY+PbeGUW9e0c3tZgrSojyGUV387Fm h/BUaRpNaN11KdK0ORktjoME31Qvhy+kf6f6fKGY88+7zQ7n2AhD+sf+cWlHJNJLctnQ N4hTugUeYIpjIg4/b73BGECukdBj+9SQPV+N4QrUBMat1yzx0shdLC+LfB9YQmp3YBye s9kA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530MfArh6hBxRVY+F1pzhOCm7H73/+kdN5wdvSDQ869+pDQRIka2 plKgZ5tdfTIjRJl5HgA/eTE= X-Google-Smtp-Source: ABdhPJwufA4R/8Ox7CFxweKfcKdb6iM58VSVSwxJ1FYexZjDzLRzR/VKS+eXVqXE9QRZG6cugo2y0Q== X-Received: by 2002:a5d:6c6d:: with SMTP id r13mr30070611wrz.227.1627480983908; Wed, 28 Jul 2021 07:03:03 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a7b:cb09:: with SMTP id u9ls1300725wmj.1.gmail; Wed, 28 Jul 2021 07:03:03 -0700 (PDT) X-Received: by 2002:a05:600c:4141:: with SMTP id h1mr27430091wmm.83.1627480983167; Wed, 28 Jul 2021 07:03:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627480983; cv=pass; d=google.com; s=arc-20160816; b=0PDqnkl2EZP1JvYYCxEOweH3q3ZgHvI6FbXLh9fgVosFLRky/rFZtjCE3397tpAYWk BJNjNdi+83m8ExDEy3TIynbW4UBIGYcpmYzCOMr7XvUTVDvI2A6Tmgr8AootsV0xLVzv E0l6N1aHmK4ZCSb9Z4tkIVPb0KzRLLsLPpw2Z4iqJKkiM3BvW9hvPAx90DuNj7In1kBY iuB/RMjbDxCLAJBlBzd/53yBdKNK3ZkfI+6CE/+Go+BpwnSITACYoonC6vy2QBaKzNim OddTXsdj2Uyd5MLKXWjn9PuLqX85VJ/hPqsGmkEikn9OYvkR5mx3DNT+TrqSsccU792r CBsQ== 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=9vAOoG3L60IKYHhh+6NOTt9Ap73nTub5jQYACOv7tPc=; b=DZrV+xkLcvH2Wo1WpQnksHuUgij1mdggqoXwczXurs/QcIrIJxk8HY/1jfAaTD5gmJ kG6AB9odicvsh8tmzyBhGpcTS+rjrfh+2TcnHYALOlCl8xg1R4gkj+BGNSOnIpS7FY0C x9nZdz75Vk3vtFV9KZ6Z6bxiv1EXGutZqMVsqd3J9U92iYKfMuwEUnE7szW8c7rw/h/+ ChelkckNrsoTqUzbPMptiBp2KB7lnR3QCPkniWe/nvjsvtUhdeeAKkf/Z5/YWaBF8qYz PRNamP6c7nfHK7tkrwoQTNxitMHZ4/5oKAwC207DWTvRRpS7RFnrwTjLYtiN+6ifQFZK avKg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=HZgX1TXE; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.15.79 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150079.outbound.protection.outlook.com. [40.107.15.79]) by gmr-mx.google.com with ESMTPS id x5si3478wrl.1.2021.07.28.07.03.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 07:03:03 -0700 (PDT) Received-SPF: pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.15.79 as permitted sender) client-ip=40.107.15.79; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KdQBmxokHBzrb2tUIpCrr8IeGvJhWT2fov0n9FKli2OQXz/J9L9oskuJa5dykOXA0M9G1m8KIid4chfgu72jffifKIgmRdv0MG5G6V3LGK8LdJGUbMKZp8mILDIvg8q1L7pfPpQ0MuS35z2hKiUGSj0aYbBWl/7JpkmVechnVgNvxvz0MggekKlabmdPNKVW/KWmbrlpV+DTpZp2RvYoD7ZBXOt+WdVLYRjLBYRPKzQnNoFgBYUFTUR6KX9hdxgppujvdODxq+hDgn4+ZtbYyE5bVSYfIlND0WCD+nKBHXhRoXrmC9KijriEnWIsPr5Yi5Pd17NX48IAow7eAif/kQ== 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-SenderADCheck; bh=9vAOoG3L60IKYHhh+6NOTt9Ap73nTub5jQYACOv7tPc=; b=I9Y98Pmrh4d6KO31l6TmdqA+bqcWgxUOZFyRytCMTqVX8qIwAJR0t4tGxVR64fiTfu3VtLgUSv66W8kxoka6ebMr/yjhxQ0yirHiag78YwS6r5A7swUyGNlau7fsW86TqEPNWkc5dtLrR2XJhnus6WWOEDNLR+rHUkXtg3yDK6wJtYT/PC8v+ZS9kdMR8QHQRmFbsRcUAUSjbVoTN64pdwkDCUCEFEMP6T2c8EanJEJJ8RwM5J4GLgdtXYJhIMaNhVaLlbo02V23IgEE7KdBO8mi5JM/l4ADHwn7w7QQKbWWgxNgH7T5Wp7ePexHyYlQEVFSJjsPRpykerU/9vrK+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none Received: from DB9PR08MB6729.eurprd08.prod.outlook.com (2603:10a6:10:2ac::15) by DB6PR0801MB1784.eurprd08.prod.outlook.com (2603:10a6:4:39::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.29; Wed, 28 Jul 2021 14:03:02 +0000 Received: from DB9PR08MB6729.eurprd08.prod.outlook.com ([fe80::1d23:5e54:ef16:e7b0]) by DB9PR08MB6729.eurprd08.prod.outlook.com ([fe80::1d23:5e54:ef16:e7b0%7]) with mapi id 15.20.4373.019; Wed, 28 Jul 2021 14:03:02 +0000 From: Roland Gaudig To: swupdate@googlegroups.com Cc: sbabic@denx.de, Roland Gaudig , Roland Gaudig Subject: [swupdate] [PATCH v1 1/2] diskpart: format partition anyway Date: Wed, 28 Jul 2021 14:02:37 +0000 Message-Id: <20210728140238.8708-2-roland.gaudig-oss@weidmueller.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210728140238.8708-1-roland.gaudig-oss@weidmueller.com> References: <20210728140238.8708-1-roland.gaudig-oss@weidmueller.com> X-ClientProxiedBy: AM4P190CA0011.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::21) To DB9PR08MB6729.eurprd08.prod.outlook.com (2603:10a6:10:2ac::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from DE12086.weidmueller.com.com (84.138.68.44) by AM4P190CA0011.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Wed, 28 Jul 2021 14:03:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd0ca1db-9062-4dc8-f01e-08d951d069ce X-MS-TrafficTypeDiagnostic: DB6PR0801MB1784: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1728; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oBKq9Q6ZFEBg/0kfZ044qM9tFoz15HSJZV2Q34j48+DxFGUsXy+k8LOVZPM1Xt7mgRZ2RzX+Vi+ClBfr9oCZtD0KWCuHJub5u5GIfJlPl8j+UYpN/03kaXKkmliEFY+QYLuzPrdcN/I77/CCvA7KbkEgR2KFYSL+iGTvPjXpo7bQsIf2/eavw3mVoC0ew0JQcw6br68lYCa7aPbjRfp7wGOB/vDOwp0++zcmZ43P+r6+dNUwugFjYir8gEiGtNQSPYAVW4ufrwSq+vZFJ/x91Vh2fDCyuYSwwzmiK7LOnP/Rk982kiko2r48Oy/JFd815nYVxbwGslC58+DXeJ+BvbaOgJUnDGqnZGYmWpjip6EZ7ULhSw1SoLIRCib/ukt5qoPeSIgjUxVw3Yu30+PFyRalR/IvX2rMmM8CquJn1311a2RwbkrCGbvKazCtssFjG1OfyeTCmbiOpGtrLmuOjUI76zgvJcJuc6BqOogQxTfAHfIKEwT+GrMkfoIFlgZG7qbXWjxFfx+LS+QqyHP7pMk7LfxpPswOSiNeXnKQ6AtMWg9RCMEr9rmsbakYl8Sxv4e+fU6ORH/o0M+jrDx7/EX4pAbVToZEUB9YGeP81SWak7K2UGhiC7y8t6HniTmMUdar6bgBbXFUClZe5zNwjptAxNT35izSDgj8AvMHLnu4PKh9iJLTtOLyK0TuA4J3BWEWzOMmewz/qWG6w9B7VA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR08MB6729.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(396003)(136003)(376002)(366004)(39850400004)(4326008)(2616005)(52116002)(6506007)(956004)(26005)(66556008)(7696005)(5660300002)(107886003)(6666004)(1076003)(6486002)(83380400001)(86362001)(2906002)(54906003)(38100700002)(316002)(478600001)(186003)(8676002)(6916009)(38350700002)(36756003)(6512007)(8936002)(66946007)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /X/K40VjZddPtaH1TT5KKyzigvFZl7KQzbkoh9C1KQJadN/2691rCYsdO1ruICg/5gx1YuO+aZYpQZYVPZszkGHZXRZypkTw1cPjt/aHujeqWfpdSJnPVV/RTiMgcy1Luk7fxSHug0rNR9o36GdIVelwG3b/sZdWNBFahXa/wlfvLFQCubvG3zdtizENlgVGjNxfR5y0J+1oSdbBMcy9tP6PCCypzCraARjKKjh0vWuVV3DRsi5ZNzs/2QmD1QQXHkuvKbhmVofyZyPw8u61uVuQqGYfSlcDsWWzqHxQsKNqbAKv6lebEa7aL7N1a9hZbR4/QNu2cAtSR+CzOgFC9tsB6WNon6fVF5pNxHBA43DfQKAYIs25Oo3t6gHvO5qVFVTu4XSFKWm3DMWTQPmJUjLW9GnlQS8BCwFaTI1Zu4hzS2spPppEA2jWyBMYRRYfavqT4f7tUnzCnBLu/eO/AHIiCMYM4qvG4c7IGbmy7CmkKIIggcSvvuPXIO+P53OuoPIuo00pxnNlTYYMpG3qFZAckLhC70qjdUDdr1GmXsVXeU222dJBWzqvBgDwrDSbXGzzyBqVxsYJtmA4mdtQl8eUfx23LQNBhrueuRk5eCeaMGi4vA/0x5F5vWdGRFe5kPDJ+srJC+2BPoZEyHA32vjEPOhomY/0lY90nmvpGGoiqFge16H88v4sThpOdcSj2WQgbxn2paNI34Ma712HHIGQYDZkgQDyE8/ppam+AzV/iGGn+dqpxV7BG2MZj0Ol3WEEvKVQgrqpgiM3jV3RXKUQOG9ldFRLKP5O0f6WJdJqECZx5VrEY99xi2uVuo/kiAbGzwgNDlngu/qtZ+WR7s0Z+D11cH2IetETJa8dzWlnV7Ib07H+ZpjNHpEvVsJ6HArrCgvO5N5wJjxjvKD8q+CY8n5VvVOlogGkdxAyOFAvE2c/PVeoXv59nh51IM6eh39TXoQu8UeSZcVMZWyV3EhXANixnpAV9+Y/y4Cud79P3O/d/k7AdK4ZOHEe27XDNxAeCzXnYPcRzlgHmFjPTpx5RQQQOhhbTqz4bxAzseWdHRK+/PFbbr123gLvPGUWD85Gf78vF34fi6FJj08B28boFoSNfXsT7VEDQmmKKAqz9UYSo4py53eoUIMHxgXlHDvqfRhJ14MZvM+CLbg3m1Eh70zJNyU95xSVlJL0/S/MdD2Rwjqul43Hcm5jLZ6KTyGfoWwaygR1NSMXD5ox9vg3JprDg8QaZdmVXZIJIcyyxcsCoB7cJJTX9OIlFC1AWPzJ9Y3XtNezKteU6UuflYkwdGU93/BVDwYlfqHvHX9rKvEE6N7Kp2Kke5lE1p9G X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd0ca1db-9062-4dc8-f01e-08d951d069ce X-MS-Exchange-CrossTenant-AuthSource: DB9PR08MB6729.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2021 14:03:02.0838 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WL3z26NyBGwBDb6RnsJdVOzra65Q6faY2n0E3L/pZKyeJkNbLsFu5aYeUgW2BNny0B8n22R9T8ONwK1tXadf7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1784 X-Original-Sender: roland.gaudig-oss@weidmueller.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=HZgX1TXE; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.15.79 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.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: , From: Roland Gaudig In cases where there exists an unused and unformatted spare partion which shall be activated by a later update, it is necessary to format such a partition even if the partition table has not been altered. Therefore, this commit introduces a new configuration option CONFIG_DISKFORMAT_IGNORE_PT_CHANGE. If this option is activated a partition will be formatted anyway if requested by the sw-description. No matter if the partition table has been changed or not. Signed-off-by: Roland Gaudig Signed-off-by: Roland Gaudig --- handlers/Config.in | 10 ++++++++++ handlers/diskpart_handler.c | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/handlers/Config.in b/handlers/Config.in index a0cc5a3..bfc8d19 100644 --- a/handlers/Config.in +++ b/handlers/Config.in @@ -116,6 +116,16 @@ menuconfig DISKFORMAT This extension of the diskpart handler allows creating filesystems on empty partitions. +config DISKFORMAT_IGNORE_PT_CHANGE + bool "Disable check whether partition table changed" + depends on DISKFORMAT + default n + help + Activating this option disables the check whether the partition table + has changed. In cases where there exists an unused unformatted spare + partition activating this option allows creating a filesystem even + when the partition table remains unchaned. + if DISKFORMAT source fs/Config.in diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index b5c9a42..85dfb10 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -940,7 +940,11 @@ handler_release: #ifdef CONFIG_DISKFORMAT /* Create filesystems */ +#ifdef CONFIG_DISKFORMAT_IGNORE_PT_CHANGE + if (!ret) { +#else if (!ret && createtable->parent) { +#endif LIST_FOREACH(part, &priv.listparts, next) { int index; /* From patchwork Wed Jul 28 14:02:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roland Gaudig X-Patchwork-Id: 1510868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::33d; helo=mail-wm1-x33d.google.com; envelope-from=swupdate+bncbaabbg6hqweamgqewnwlaoa@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=LOWRqkIJ; dkim-atps=neutral Received: from mail-wm1-x33d.google.com (mail-wm1-x33d.google.com [IPv6:2a00:1450:4864:20::33d]) (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 ozlabs.org (Postfix) with ESMTPS id 4GZb3M3Lbpz9sWw for ; Thu, 29 Jul 2021 00:03:11 +1000 (AEST) Received: by mail-wm1-x33d.google.com with SMTP id j204-20020a1c23d50000b029024e75a15714sf1001819wmj.0 for ; Wed, 28 Jul 2021 07:03:11 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1627480988; cv=pass; d=google.com; s=arc-20160816; b=fvc21pM0/wQE24NGKVA2vY7iNlfaCZcFvLfM2a9nA4Zhm4Bz3oZUTWkjOheFtFKSmA 0P1oA/it1Ydx3SNTCOmX5KCT/C0LPfTCvQNPpkHDBdIYiaE6Gk0ZLiAzXKudUSuP0qGj WTJAJsXoeDpkbPvJ8D7znzUnv3L17oKnfCmrvkOztHgi7E4zfZvy6vfCMLu3TCIIDRLI c/PmeYVvpjkEnefGRyO2P2eaY4ISfZXZvkv8o1zLhUKrjMiTQJnr4rg4YDeHMnZrLhS5 HGxV2DR681vJyvbYv7weANWDM8pstilXAc2wLs1qnIpYfhKkTeEr0FTn4HaHEewGmutv oJ4A== 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=NFz1mIDwUrXQU9pp59XLfUPzoD9lqZSVI5/0fPMKkbo=; b=LkBmYdfHPK1/GQ58dLkjZ7HqwYbqcqPe+tA1vaTmVe7g/l5iRM90T28cGP6w9Ka5zq CC+GqYSLHBNj+hMGFrY3Et6h2qoHBQulAVP023ujb824I8TZOfu6crPkCmofMJBkOmKO z+ed10TvXLa3ZTf/WLaYjlkKHlJX4yYUPBe14ytGrSBv5FoVJk6yI8D+BbY6vZcO1kU7 eWlbf6USzdJiWheXwytyyUE6n2VobW4dqA1UFSjwn4nZNrNGRwBusJR9qxX+ah6Xi4iJ gL8oOGxXzVosV2oVj2pc5RMrcuFRwy02o5chCMEtsSIS2LhwYAUc4zZMxlZYpavZz3Wu Ikrw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=ult4vzvF; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.7.73 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; 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=NFz1mIDwUrXQU9pp59XLfUPzoD9lqZSVI5/0fPMKkbo=; b=LOWRqkIJmT3fK/ZMlgIXiUo8p1VBkKSgEl349RfhZTozwMITO30Oqwgx4njwX1BZW5 2t5LBjeO67HQrCvf3YIzkURt3ENDdQzwoPpuslpj3b/Pv4ZTGOh2ZAQiEGJ2H7vAZyfP co7C4Z+n4/KObvoz2S3N0IJD8b6TrxMkHegJRaNk7lIXfjpN2t2nyW2KD8SDKwedFikY qQMhEdCtcHDR6f97qLZCkHH1bRtCmJbO6IVl5N4wTprsvGQHby/TkZKYZZ6lefmKRqDH 2syaJ+irZyPKUjw7ZZSUEzx6DjBITkCgNroO8FYGC/L5uKByWYDBRKqUB2M9ETv0gcG3 fcwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=NFz1mIDwUrXQU9pp59XLfUPzoD9lqZSVI5/0fPMKkbo=; b=RR+Vw8vFXxluuVk+kccVG6J+jJwhx+E+xiUOop4FDX5cTuzvFLUvA7v4ydgVBnI165 gS7C3SRY42zTX5FYkA/330pHDqM3YOAqVbHx+XFKJdTOpi/xS1yRMcE6zDjUMjxAFoj/ YdrqGxz42rEA+imwgPTABOT4hc7yGqBUcHzv4pDUjOZ3FGoCVz4W3F4WuI41Qalyk3qZ 6ZP5MsyAyPyLHQlkCV4S0tk46B27TOYO7XDQiK8IFR6ehqWInscj0RpJ6dMuXhduG9BU BKyqBgbVTGWa1esOwDHmSFpTEshXmJXZ9nB813zeQc5H+MnPaleru6j5Kr2yGo/EnFpf 7MWw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531yFTC0eDdAViRDigiR5p8RamFuAeHgWZ7wSNKSmisqP1+UT0JJ yqrb0EGXtu+FNOjoYgFCsu4= X-Google-Smtp-Source: ABdhPJwxziLlh4dqJvPu7yQdyOyfp4PvF8ttt4v0S8HGj0B9u7p3HLDg11/V5aq8+ZuQHPw/taYf+w== X-Received: by 2002:a1c:9a93:: with SMTP id c141mr3780146wme.28.1627480987955; Wed, 28 Jul 2021 07:03:07 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:600c:511e:: with SMTP id o30ls3333918wms.2.canary-gmail; Wed, 28 Jul 2021 07:03:07 -0700 (PDT) X-Received: by 2002:a7b:c3c5:: with SMTP id t5mr9461847wmj.28.1627480987202; Wed, 28 Jul 2021 07:03:07 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627480987; cv=pass; d=google.com; s=arc-20160816; b=ShfsCxv2uNzV8d9OcTe9/FyVivBCV4UAwugjjf61FzEvEJQH7neNSjVey4cKGgr/mz rfmjP2lfBBuopYz27+PyBUwSNqvhLe1EkeelcVeMGCrWNi0L8TegVo+8xUxQH7+ILt5q 865okLcZhzcmXpOMgEXXpu/9aKXjHjUJCZU1GnOY5ISkw0KFBH/ZRFruvgYx/kQF2uqV 4om2SZM/Xbq/1o088+wYpVV+I1bPI4gD++x+EzlTiwnpxGegUoYAfuGoNqh1M9ERSS0G 4Hxf0YNrN1B3QGS49EGpoqhb0aardYwbUN43ppmF71s4xMSxF8rHPjxGsjI0dPuYVshR GFtg== 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=wbguWapIUoaNTbPfUhEVSZ7eCuKXCxz2PBceUfLmGCA=; b=lAGBhQUngX+fLIL7fG0NWdP/pJyFEZW2Ds014cmHk6J6xaxZztf0p9Lx76ZTE7z+cc VCWSH4y++8FLaoRmNeZbjKRw3qIF/vMS4b8mXW/KP7U8567JiI6gv/CfGTVkcIBZRuIm F+q+e7AqOCvjARxKb9FiH63U5xH8qQqjeKhXYoPFVE9mLHrROw3bRy3tNAQbCxn9230Y H1J7DyO8YCSrcTCMSXmc4g2zngcz+eRZA1PUxn8sAv8BcYb24seEciPfdr6Ncg1HDpTh 0v5GTstn7eJCSTZYjg5Q7eY3T35nPxmLXtsQ1u3sImSmEXdJD/nbTdgqMakZQBaofR+n jjXg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=ult4vzvF; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.7.73 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.com Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70073.outbound.protection.outlook.com. [40.107.7.73]) by gmr-mx.google.com with ESMTPS id g128si222151wmg.1.2021.07.28.07.03.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 07:03:07 -0700 (PDT) Received-SPF: pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.7.73 as permitted sender) client-ip=40.107.7.73; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=izqpHLRsg9SCgwuLADtueaVMCVDoUtlwo+Oyxlf62yVu2Et0aBjcb/cUC3L8wEBQumutFfbp273aHhSbA/WOPViP06/i7DqaBtj2r8NWtkAqnbg3kXpaj6HJzMkoeFyBKHp2/XHLDTWxfsAxn4TuP7IwkShRUUQTFjxbW963v2V7FLIPxprDLk5zxmNJG35YnN71uFVAItY21wi1DNTwvzQsUqDCnQAFx6T9g/hTzmS7bxyjOt6NAz27tayNUZy11TystO44zMRck0KLRA5Jm378KsqU/O6k0oi8IRRGuxh/vPo5bZWu/6Yof0onX3twUU24LxVCJxxclAPsHYlkuA== 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-SenderADCheck; bh=wbguWapIUoaNTbPfUhEVSZ7eCuKXCxz2PBceUfLmGCA=; b=Y5vVPJVM6wl4vLbEFwZ+69ihuRsWOmd9VJ9JPgGW5+Zpiysf4jlqSyKIBeMYzdkFuTIOAvuXHI4oXou9p53+RcV//b3OpkEPUdZdq4+52WcmML5812ohihE2Bsj3gXpIhppkGGAFlnpFtGgtiVOBsA0zfcOxZ3QX9lV57eD73fBDh0oyGEdla5R/C7q46hbuasWWRdDB7SLa80XkF4pmt6f9RePyIbpVOriBeB9T8dOAVxq1O4Vm3MBpVRKEaAmOfc+MF4sixkHS/LvWyThOcaOSWwZ7mefQsLgV09ZPELp0oxURPmwDevc6A3nsMJM3LKY2QRMdK2pvHhFhMAYYqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none Received: from DB9PR08MB6729.eurprd08.prod.outlook.com (2603:10a6:10:2ac::15) by DB6PR0801MB1781.eurprd08.prod.outlook.com (2603:10a6:4:3c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.29; Wed, 28 Jul 2021 14:03:04 +0000 Received: from DB9PR08MB6729.eurprd08.prod.outlook.com ([fe80::1d23:5e54:ef16:e7b0]) by DB9PR08MB6729.eurprd08.prod.outlook.com ([fe80::1d23:5e54:ef16:e7b0%7]) with mapi id 15.20.4373.019; Wed, 28 Jul 2021 14:03:04 +0000 From: Roland Gaudig To: swupdate@googlegroups.com Cc: sbabic@denx.de, Roland Gaudig , Roland Gaudig Subject: [swupdate] [PATCH v1 2/2] diskpart: format only if filesystem not exists Date: Wed, 28 Jul 2021 14:02:38 +0000 Message-Id: <20210728140238.8708-3-roland.gaudig-oss@weidmueller.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210728140238.8708-1-roland.gaudig-oss@weidmueller.com> References: <20210728140238.8708-1-roland.gaudig-oss@weidmueller.com> X-ClientProxiedBy: AM4P190CA0011.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::21) To DB9PR08MB6729.eurprd08.prod.outlook.com (2603:10a6:10:2ac::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from DE12086.weidmueller.com.com (84.138.68.44) by AM4P190CA0011.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Wed, 28 Jul 2021 14:03:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9afb986-11b5-4725-5f2e-08d951d06afa X-MS-TrafficTypeDiagnostic: DB6PR0801MB1781: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:227; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2GtHzdiBn6KgC8L2cfb9NTF+f2fnCb+ipzuNmzGHmhSds3g2wUc/n7DKhP4Gf3LDKX1QQX68pmw4xaLwAMghJ4vGazWQSAPWeAmntyiZfIgSro3qs3o4e/s+USd0/zP27zh0kmv42xnT3w9TNdobWcPObur7WVlgf02HrxOS+gzrLNaWu2wvN7KYXasdiIF6LrdIEIdXA2wIjsW2sODyTWTrH3WW7m1k+Tn4FSMdRkmMK97KsyXCg+lx58m5c2ccuPd+QKivXJl/7gId6FUM+dOF2FxVosuoyTpN377FrPQmAnPPdui3JSgaQk/EXLHBGLIdRSS/DnHCQ+deYRjQsedyO+4YxQ8HR4nFYBc/tPsSwhhss1PPE0lWT0QOOvoLMAEtsIlGOYXabTYNC8rOzDPNZT1YKMbfEAZPDT/Dtrizj1fVnSj8YZV54Hsj8XzA5wSdfM/d6eCmEsowb5YAEumcsbxNm8q8fqr5EmI3vhceeFpvCRdn0cTCJvVCNyOaQzdmM7XhkmtkKsTWepDM6844yVdMBFErnmhexSZPhsmV7I5v/NwC6eErH81vo/rUtTZYBQhZZhnUcNtUBibs8/Hl4EIOsSXZOq6PbKxa/4oTor4Ayvx5xyQZGVV7kcUZmIOgSVvyYJ6vnPZUJxwePVk4GIvKatAqcviyhfJdyDUW9SIU8n1G1dQoxLzAErYGsHGSL/9+olVRJLujayiacQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR08MB6729.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(136003)(376002)(396003)(39850400004)(346002)(8676002)(54906003)(6512007)(956004)(66946007)(2616005)(186003)(1076003)(66556008)(6506007)(66476007)(5660300002)(26005)(316002)(478600001)(38350700002)(83380400001)(2906002)(86362001)(6916009)(8936002)(107886003)(6486002)(52116002)(36756003)(38100700002)(6666004)(7696005)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Apis5mpLXFOkymmSDnvH0lh1bDJc+9Ig5rEg5XlwAbYitqe1RlN3zNgpq5s6OgRleXZxp8lTvuEuyPO6ndxJK9aVNb6POhn5tMBl+FgodES/juLRC+FXiVgvVK8UbQAH9A088e4uGdKsFoy34xa4J8U4+Llb3PmKWafkbGTJlUyFtfQNd6i4Q3L8WuFVV/ZCO5NdaK4nZInk+1lVL7d+naEerfO0RIMMAfoXKt1FOr6KOxFv5/L3sP1HbFlP2MsoblJ2cYTkhAaZ7VYKQ3Wg1/0LreoY14nT9xS/w3yHSY8ds+qJ/DCCHpsuzwDojfD2L6R0aMkvjKnJP1QBzjVyyIZpRlLCJBmOwR39PhWBJLvItRAemy3hRu83MEibq5p08OAGW1QRYYRfMDbnoe5RBdLvmdsEvpEupUyOGDQdOlku9Ui0LpXj/ivvtjWSDC4X5GpnbE3Q+H56XSrKyUtNTnbbtXd/lnEcs5HoDu+RX68l5VLJhQLU7xz/dbKN5ZzrsIP6C3Y1jTsSSn42aiZ3/TclExO5aIWXvtK96DPBCLwOqDIGwbnrqDi89tiq874+loODUgFZV6sm9m5lyLto/IzRo/rCL9u/M7PnJd5B2OuXfPHiLAPec6GT58W5kRpg6tKT/45n5r0cdLQp/o7Jf/Gqtulv9ZnQjUg0gALbB6+uRUt3XPjPw5IihwTpNgo3kCuvAeBZPRrpFZDIYMGktd9Gw20mzHH0janiE4VYy+WakeEdl0830nMvLtZKg8ZCN4QSYQ0TZxXMSM1S7miWAMwu4yu/BqAnzzgydmyTOtpzCoTu04a495WqbMmZ+ZKf1MUdG5La/BO4f4pTo4YoRh0EQ99MrBr+PxwJZnRhGseA/zRe3hFkIHQuv+Nn9x5o7v/xWp1Yfdny57fiGzZPgihGumYIPqDJ9qJOaUVy+P7tdGPC023mCOoV7t8SXoyqZZsy0KdhQTdXmoUX9OniM8VTcbkIA6zGalSiP9jezdcJDTZd3L6bCONwjCKDoXl1rZR2RcT81ovUcoVE1zjUBqVsIBIPncJJrVUF17lgX4TqTk1/e9gdxKWddVVAyVBrzNA8lYjvfRG3pjDQOQFl3RD2FQ11AXBDg5wrW7BXN3pzIR/yZ+r/0ziibvPjQ4akHr91aujsaN3HK5shm1kZsCvayehzMvFBkjU0yKtWtc0/zHTbdU1LGRKTeLKwzTTFUjhpL4hlgpYkR80/RRXvzppKa9YyQ9zoGpqQHl+C00/VUVOHvpo4mrsupMsJFIWIeaTSwlTx4J9od6wrFCwZpSqWNnCpJnrx605jQzezRSs48GEfEug09ypxn/fh+T1y X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9afb986-11b5-4725-5f2e-08d951d06afa X-MS-Exchange-CrossTenant-AuthSource: DB9PR08MB6729.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2021 14:03:04.1338 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: t02G5E/C6JBaii+cZCKhgqFY7/Lnq0Wunz/VWqZRuxsvMPXfzvtHRuNBzexezlac1/Ni5MYQtK94fQRAXU2s3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1781 X-Original-Sender: roland.gaudig-oss@weidmueller.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=ult4vzvF; arc=pass (i=1 spf=pass spfdomain=weidmueller.com dkim=pass dkdomain=weidmueller.com dmarc=pass fromdomain=weidmueller.com); spf=pass (google.com: domain of roland.gaudig-oss@weidmueller.com designates 40.107.7.73 as permitted sender) smtp.mailfrom=roland.gaudig-oss@weidmueller.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=weidmueller.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: , From: Roland Gaudig There are use cases where already a filesystem might have been created before, which should not be overwritten. This commit adds a new configuration option DISKFORMAT_CHECK_OVERWRITE, which enables a check whether the requested file system already exists on the partition. If it alreay exists, the partition won't be formatted. In case there is already a file system of another type than requested, the partition will be formatted with the new file system type. Signed-off-by: Roland Gaudig Signed-off-by: Roland Gaudig --- Makefile.flags | 6 ++++- handlers/Config.in | 11 ++++++++ handlers/diskpart_handler.c | 54 ++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/Makefile.flags b/Makefile.flags index d3ca49d..56ffdfb 100644 --- a/Makefile.flags +++ b/Makefile.flags @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2013 Stefano Babic + # SPDX-FileCopyrightText: 2013 Stefano Babic # # SPDX-License-Identifier: GPL-2.0-only @@ -185,6 +185,10 @@ ifeq ($(CONFIG_DISKPART),y) LDLIBS += fdisk endif +ifeq ($(CONFIG_DISKFORMAT_CHECK_OVERWRITE),y) +LDLIBS += blkid +endif + ifeq ($(CONFIG_EXT_FILESYSTEM),y) LDLIBS += ext2fs uuid blkid endif diff --git a/handlers/Config.in b/handlers/Config.in index bfc8d19..d8d7193 100644 --- a/handlers/Config.in +++ b/handlers/Config.in @@ -126,6 +126,17 @@ config DISKFORMAT_IGNORE_PT_CHANGE partition activating this option allows creating a filesystem even when the partition table remains unchaned. +config DISKFORMAT_CHECK_OVERWRITE + bool "Preserve file system if already exists" + depends on HAVE_LIBBLKID + depends on DISKFORMAT + default n + help + This option enables a check whether the file system requested already + exists on the partition. In case it already exists, it won't be + overwritten. In cae there exists already a file system of another + type, the partition will be formatted with the new file system type. + if DISKFORMAT source fs/Config.in diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 85dfb10..3cbedcc 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -21,6 +21,10 @@ #include "util.h" #include "fs_interface.h" +#ifdef CONFIG_DISKFORMAT_CHECK_OVERWRITE +#include +#endif + void diskpart_handler(void); /* @@ -737,6 +741,45 @@ static int diskpart_write_table(struct fdisk_context *cxt, struct create_table * return ret; } +#ifdef CONFIG_DISKFORMAT_CHECK_OVERWRITE +/* + * Checks if filesystem fstype already exists on device. + * return 0 if not exists, 1 if exists, negative values on failure + */ +static int fs_exists(char *device, char *fstype) +{ + char buf[10]; + const char *value = buf; + size_t len; + blkid_probe pr; + int ret = 0; + + pr = blkid_new_probe_from_filename(device); + + if (!pr) { + ERROR("%s: failed to create libblkid probe", + device); + return -EFAULT; + } + + while (blkid_do_probe(pr) == 0) { + if (blkid_probe_lookup_value(pr, "TYPE", &value, &len)) { + ERROR("blkid_probe_lookup_value failed"); + ret = -EFAULT; + break; + } + + if (!strncmp(value, fstype, sizeof(buf))) { + ret = 1; + break; + } + } + blkid_free_probe(pr); + + return ret; +} +#endif + static int diskpart(struct img_type *img, void __attribute__ ((__unused__)) *data) { @@ -935,7 +978,6 @@ handler_release: * that SWUpdate does not try to access the partitions before the kernel is * ready */ - sleep(2); #ifdef CONFIG_DISKFORMAT @@ -968,6 +1010,16 @@ handler_release: char *device = NULL; device = fdisk_partname(img->device, partno); +#ifdef CONFIG_DISKFORMAT_CHECK_OVERWRITE + ret = fs_exists(device, part->fstype); + if (ret < 0) + break; + if (ret) { + TRACE("%s file system already on partition-%lu, device %s, skip creation", + part->fstype, partno, device); + continue; + } +#endif TRACE("Creating %s file system on partition-%lu, device %s", part->fstype, partno, device); ret = fs[index].mkfs(device, part->fstype); free(device);