From patchwork Mon Aug 26 06:40:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Adler X-Patchwork-Id: 1976622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=ro0sgEL3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::53e; helo=mail-pg1-x53e.google.com; envelope-from=swupdate+bncbclp7i7wwmhrbz6hwc3amgqeywne2li@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-pg1-x53e.google.com (mail-pg1-x53e.google.com [IPv6:2607:f8b0:4864:20::53e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wsh230RRKz1yYl for ; Mon, 26 Aug 2024 16:42:50 +1000 (AEST) Received: by mail-pg1-x53e.google.com with SMTP id 41be03b00d2f7-7bbe0ab18casf3908762a12.0 for ; Sun, 25 Aug 2024 23:42:50 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1724654568; cv=pass; d=google.com; s=arc-20240605; b=h2qwI9nu/gFVATIr36RJs7TI8GUTTa0eYCALRsj+gDwTrgpp61fVE4i+U3w4Nk8flM o024nZNb7Xpqnms2tQXVY+7+ggu3z+TAxR0yAw5nmwCK0qkuPtoCrx0xyO9QC1VDPMl8 N7Ai5Tf9ceD4m5k1aGcgkrDdQ7iDbH+TYtATSRhWmJYBD9bknEcp/YPInfSg2SN79mkA lZnI8M6WUs4kBV3/YkysxF6NMnc8CGjI1rUmdL38GVN3eivCffjwHGmsRb4DKJPVmJip 1GQIfaGDOav1DcrWcq2En3R7yxAchQ820FGEZubvVgpvLsdj04ZE0j64zWM8IrgA5HFM Aj8Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=IT7xVuLlcYTC4vAOvEWDhQf70LOHss/lo9owpRtV3gY=; fh=6FbvNY4amyyHx/g1OyctWbUSKbTfMUvJk8Vod5fgTwA=; b=d7uNQyJkwvTQrhYG7RREpBJUAGcce4b0GQty8DYR5i2EuZgQRti4/DGYtviNbGDMVQ TI1lO0mN/LwHszxFZKnERbDtWD6aay7l827SquKa8b+iAd1dhUh0wCfcEnQ0VoMdYQ/u iNXSA03CQ6nVserrRXljhudgWBfBstCFOUOgQrUbaPmNS95s2qhZAsbDKVt+e105+DaM SRBy+qXm1RkqLLVWwCurpRTGQItTBuNsl2qELLWj2avps3/eRL8ld0pAsqOvqcnJMS6E Gc+w1bCTEJL0ku+yPinUaR/6TSzkHj9hgEUaQV05vfCATcoApyKHy7ue7q8ZQ3IboZCA jyGg==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=sk90rdyb; 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 2a01:111:f403:260c::62b as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1724654568; x=1725259368; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=IT7xVuLlcYTC4vAOvEWDhQf70LOHss/lo9owpRtV3gY=; b=ro0sgEL36sf1SFoVVWZ38Rg2qPFP5UAdPrsBN2yac24dNzH6LJQ3H4v8qse0Y7JLbX IllDycVbKg9s8YlH/mRW4l6mPFhy6+7F31XdjhXcLo2ghzB1fYyZrCqpk2kNyizKoZ5V PNFhnzsyIHwCQDT+2aiqOY7LFQAE/hqMs7c42RfOlD+rktTpNPOa+8oR3WZY2DeBawK3 yFweUb40cQHwPv8rVvakxyvBxiyV9aW34OYf8l12k1YNtbwzJL9tvY92RDfhOiTS1430 pOrZzuF+bgALjfs1OARZdcQ8lEEfqH1sFSu3pNISFTt+cRvAVjtVHXjbfcdfAu9t0Oi9 3iYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724654568; x=1725259368; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IT7xVuLlcYTC4vAOvEWDhQf70LOHss/lo9owpRtV3gY=; b=xEpuXU5l5wAtDRQXoVxS7rqbyIa/lIexqdKDuel1X4l82k0ISxt5DtKGKHW3YSgAVa RsYpPmb76wfscXJX2Xp8ktLERgCL0aWTSkxM9GVtvrAPAbnqdXYyD9iw4UjD5s6guq4y ynLHAlC/MQE/9XcWSVj6ij13Bkfgijwo1Nm/cakZBJPJHVlNpUp6fdauUHCTnARBNFcI 0wv8gu4IltY7ZPiquBaBJQfoydH7BIqqLvEJhU8R0qM1Nt9kHjfrZIS5jp5tCTwH5FVo EobsRHUYh5YUdOg15sQtcZh33HfAkhwxFkH4o/OBqyJn4Ln2LfiBB9xkH8xc65GAXBrS xUmw== X-Forwarded-Encrypted: i=3; AJvYcCWqmvBGt/Kr9sAkE5CWWGORvrVcohTonk8TSeMnWbQJDiks1dl1u2LparnKFrEcs4KwHVUiXaSlRQ==@patchwork.ozlabs.org X-Gm-Message-State: AOJu0Yy5beVS/+1AmgixH94Uowpfcu2lliCFgHbe/TdMkZGrwL+YstLR SvqXgmTxzOz+xKMm+lNRPfHP63BmHB5n65neLqmb4UaeaMszDdzf X-Google-Smtp-Source: AGHT+IHmR9ATGH6qUd/LiCMCVXLiNcWkisltqrW2HnC8kd8UCx9TsjVogkRX171RYuu7ZFrr00citQ== X-Received: by 2002:a05:6a20:d523:b0:1c4:7dbc:d21a with SMTP id adf61e73a8af0-1cc8b520264mr10490838637.32.1724654568351; Sun, 25 Aug 2024 23:42:48 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a17:90a:740b:b0:2ca:d1dc:4a26 with SMTP id 98e67ed59e1d1-2d60cdadcb6ls2590065a91.0.-pod-prod-06-us; Sun, 25 Aug 2024 23:42:47 -0700 (PDT) X-Received: by 2002:a05:6a21:9614:b0:1c3:18f9:16d8 with SMTP id adf61e73a8af0-1cc8b63afd6mr12682527637.52.1724654566817; Sun, 25 Aug 2024 23:42:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1724654566; cv=pass; d=google.com; s=arc-20160816; b=QqprH4rOf6MIft0LhtI2JPiDhPFagEHxG+ogRVjWVg9UxVsioVPu3oF/WtCl3CafZA ifj13aa/dE/EtGicIdsIDFGpxKYSj9IvJTFeL3qo4xiULJSAbgfvOgm6RpmMPraeN6Y/ kbQ/PU1C4ojp00tRH+/VjOvYVGw1KtvNdUlHhsS2KZ47r3rev0DBAgG7tLlzobisE3um 0gmZymVpvoIq16I1er9iOaeow83OMzVsw5EIUTaWDrrhjuSoA7SGVA02xaUviynzAt6P 3P1BNvtTwAAJ67Mvl/U/CyS+AXHz4pnWiOU3gGh6jf/0QJ9XjdLmBcSs9iRoIQzhTWLZ BoGQ== 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=qHXE3EyfH5HaMRt0vcpY8wVN7iRyIdjrELGyAuYEAlM=; fh=pJ2QQAjkJ3PWvKTF55tgLj/Eq5DHqWw4uU+orlV1UBs=; b=SmjunWiHyv9oYRIQ/kCuVUNIvxg3YTZnt+s4WMjLGMtouErng7mr7ZBtVPH2lcxHx9 nTyp0vaTA7K+76rFCzDZ0Y9sGajjh0nP7TiSWUDZSECe46GgivWLwTnmc97BOxMsP750 hX5/qWQinEC6wFl0rVXITp0vCIWLG/grJj5IbCHsJSDFEc3bWdefUJzDjTi32hzJWYUh HPiA1wScSmUGdAVcxXOYkQgrIRHDrQ27vQfAQCtx2OQxXQFCWLWnB9lbjuZsQJa0SJ9Q c7M0brGp0m3ByOlhwUcA69CZrRmP9Kqqz3tGyWxR/t0lgpDMcHXT1hyzvau5YvZV2Umf YQ2w==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=sk90rdyb; 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 2a01:111:f403:260c::62b as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR03-VI1-obe.outbound.protection.outlook.com (mail-vi1eur03on2062b.outbound.protection.outlook.com. [2a01:111:f403:260c::62b]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-203859ef113si2967365ad.12.2024.08.25.23.42.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2024 23:42:46 -0700 (PDT) Received-SPF: pass (google.com: domain of michael.adler@siemens.com designates 2a01:111:f403:260c::62b as permitted sender) client-ip=2a01:111:f403:260c::62b; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=n0bumgIK3l5fZ3BYipDVXSWM3ijivhbmMVJOjsDxriB6ofUJRsTdB7JIM53OWJrfjqd1eFv1k+Uj+xiRdufPPop+2roWPtpZEpQTCfPaqdSFWUHYbucDTBwpJ6fSAzBhqdaSfG96p7NsMcb8bOjiXNtCumOBPwVIofpc+6X/yZfW4NX3graGCsczRoU4fxAt8k9WZBNMEQS5npvfbhZoPzD/ZuH6C/WgdUU4Qda2avYlN/bYx9rFMoItcQzgyi5y80Oxan2WxJuWGZESRC/zskXMsKbb863TzWnsp3WCUFzQon9ON7pfRTmre1cvhQwnDx5r8hi+AddmHL8fCbdn2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qHXE3EyfH5HaMRt0vcpY8wVN7iRyIdjrELGyAuYEAlM=; b=RLKCe/drcoKZjTvASzj2Mnw7gKumbggbPNGnKcc5swmiPG0MeP4Sfwb9rBJb3YdIYPJDTTiFPHi7BCkhduwqScxAVPIhg5B0VaxyH/3ayBzG2APLjyrhEzCyhxqNb33+yCQHbLUcsfzvujhZsyjsl+0LyT+w1GIHBax5cjs5v39gkCUiKlIPGofIvDXmBBeEfD63qBcn8xilHLIPbyyt0kiQP5I/Yt1BS5+tSSnYQCwU8Ws5ZPV7pmhp6Zx+2KmI9q/zaQdmpqzPXTcYPElcE7xDIqBOQvgcAleblsOyobb2gqGF6SkfPPe1odqSWRd3hhsP18GXCcC6F0ceHRshwQ== 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 PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) by DB9PR10MB8285.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:4c9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.24; Mon, 26 Aug 2024 06:42:44 +0000 Received: from PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::7499:8576:c129:4b89]) by PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM ([fe80::7499:8576:c129:4b89%3]) with mapi id 15.20.7897.021; Mon, 26 Aug 2024 06:42:44 +0000 X-Patchwork-Original-From: "'Michael Adler' via swupdate" From: Michael Adler To: swupdate@googlegroups.com Cc: Michael Adler , Christian Storm Subject: [swupdate] [PATCH 5/5] diskformat handler: add support for fslabels Date: Mon, 26 Aug 2024 08:40:06 +0200 Message-ID: <20240826064006.41623-6-michael.adler@siemens.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826064006.41623-1-michael.adler@siemens.com> References: <20240826064006.41623-1-michael.adler@siemens.com> X-ClientProxiedBy: FR4P281CA0395.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cf::19) To PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:12e::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR10MB4734:EE_|DB9PR10MB8285:EE_ X-MS-Office365-Filtering-Correlation-Id: 8be9c5a1-8892-4acd-2879-08dcc59a4a25 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: DZQ7Qf3j5sxEd68518TBzt8W2M1R/2y+mTjISPEN5MRCICjAcxjBgB5+LBbdp7yZoW4Tm4Aj8l3FY1Ay/MlS2CeEhfJXg2+gxTV8t4myOW/gnGs4qCe4Tc9Js7r1umZin7kgyBSM+s62wiLMwUAcIYJchS2fpzlcXxeUol8ek+IEmynqlT4gq2xk614Ek0r7Vude2i2hFuoEPvo0mafQsam2vAbq4yExEb/xfREeG61bsgc0gzpwnOBPE+UiiTotHAXTTeg5Bwd+XrbDd7NuVAqHJmRTXivs5ZHRj2nnvU/7q52WR4IxLo4930MWdSSCXKVz8WMN2InsF4MbOvHBAF5h40zcxHjZlOi+oFk4pzzITz4edKr8yl8xC88pSgeRZx4C+31ErsKu4H2Irf9i3Z2ngIW4SJmjx1syzaLpO/EQrGcf2WW1grYDmn+y5YJLJW6BcpM+PlUjQ+4P5BuXsbFFC4hT4g7xXn8W3vO+QparXBrqkaSs+QaPWyu36/xxIlqBbUGmwaOou8H+oj9EcOvR6kwraCg2Rr2YGwg8LTGXvDqP/HocuiadT/tOwzoQJZxYLzzXlLsqGp1i+UmaRHS5cDVg/Ba++YolaKUdNTpFUT0Ex6PU15K7yJJ03UqbkCsbnnCA9Qip97P013wI2DRVxUyZVUEVQBhfjWL5ey3vBwsw6bXiG1ve+wNhofmyUSVbxVuxixTElHElz4nx3yw+9XsQkpY/XDpfiXoZTFlnP/Zw/Q4Fy03gB83UdfneKe55Oq/Sd+S+KCdNK4+yUoioOlsMjZvmGTx9kN8er0SXRpWFqETVALYUI5nHkEcJRZBiQIEfOShkDFfvovrEnEwVyBNzyZ9KDTxa+z49h5PJgtBBrr7HimJBxOXLt6XP8GyAzTTu1yrUDAQfOn/Aiu9wSDbU4/uh/eb1p9U7XfserK3bXDkIdd1sJaHw7nK2cTnY90LRWi904LWKbuWWpurp4dVQyBDUOYmL2eaZYwDdzCtvbytanFLP0cugcDBAbCg5Ix+jSOJyFLUxZSaci46d/0XxVV2DSMe0PU2L6fKenAQiHf61VQLKbwQs7c9gmoIXTzt1JblAC0Qxi5X1dHU1tXARPkPde28L+d29ye0YyufSYnBCaFZ4fVBgAvXGERdlCufSee328x/1/ztY5NnMnO3V9IFjhzl0fnxZeVK0uVHlHb/osFrsInEsYkTZ1C0spn8vYe0yPavytuwSDE5+hdely5W164mVWzYWRs9AtKTj7dX0N2+vO/oj8k3wFNdX00ym8w+xVp/EpDpa7sY7k5RcruC8DjzCJOTimZbgWumx8JkHc0Oge/oROObKS3LQqwGXuba6IPGdh6e7HQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tsYYtlnzZE1lQPismY2G8dlToxMdB3QPGh2DCDvfuqiK4TVk/nzY3qRnbO2hb4a3+KL2R0A3X8RxDVkeO0os5J21DHGdWbCYU5CPvFzNelR0+sv47WjlCMlZHlXqt2IjjQ8qrPbec3HKoqbmumdSlrI68zLJ2cYKamkl8K3Gr88HyRTn0LzyX4LQjzUiBqAT4wxTzyYS+TnVyzZvx2OgCBCgBHJnNmnH/JkG6xRVx5AzB9yloF1ycRsTc4YQ2MnZdrJ6w++FzJpUR3vNuV8BiPlkm/zxusXtZnAD3Wz1K+uF6x23gvSmspgoNUWgSWKhpVCmFgEUO67IYGhrhPQFayCu/piMFbUxqRh8ao/KgfZZLzxo2As6r7rgMg2OJcxr39Hr2LxZ08L/T1E1mTvgWsLQaR0zk7aF/wzCU7Bj76n21AwSlg2tHToyn2U7vCMC7JX+80Gb6CoSOkT522z1HtOwntc93a6fN8Wf1j65VroeVD1tOaDMhSL+I+wPfUkZM+FVYB4HFm2y8hPsfDXa+zZDjEi05Qln766xywEiGSmhnqRAx8vpyZPSuQCwcmaZLK74UbTBIS3G2DyuA749pSBhzq8jvX86kTgBxniFj47mQ5ne5JA1dtIco+s3idI4ksveNz61El61OlsiiIt7XnYa3av64pyUD5qnnXzFqzYp9DjQbW3jdYfF9zp1jq2YzP3tiuxAp2AL5e6Tx11uhFX7mEH8MS/2SBSQtiLnXdG8eLlzyHcYBD64pyG18vRK/IHGcmx9cXM6umCZT7m11hvwH29ADE1d+bYKKmsZtl8BbGOGU/a/t/5Iq/zraOeGWcs3D0++JcPOCOGWxMPPuX9S68541oRj5+cp0bYMOFYlLMAN9XwAPx9Yy+fRV4qGNGsjkrGV3yzTHaZ5+J7jSjYyx4Kqyf4bKuHPKDpJWnOZgrbZWiCpbq8NW7cMVId3Y/JVGdOuoO1W9ymNyFAmOr+a4b2U845lvu2TSkwCUZZrVKjRUvPOBq1iDh6XcKvkLcm7gSVHvA0yGxKumRinUva7FopwFR+tcHWMPuVZtOYrk9DxLz+lAuiVbJxYIAMWYqgJ/mjThgCtPc0rOZc7NhbRhFG+j2NeELD6JQDJCW3pTkQ5xFyLwtSf7KIb3Mj5fbT4Rfh8t4ibdpS0TvoQRmH0Wd5w7cwfzh3F7+duT+gwzQ8/qaQC1Z1Jv+l2q6hqk6CADJAJN/zWVc8/WbKypBRc61/uo0LkyFUowj7wji2MJjPHczo4YvLjSE1MF79uvMHOVQr/MFjfxziiGWvDbL4sRMSJFKGSKlsCtK/RNKESutxQPi0QMUNuiKzYGOpsjru8VxURnmfVILyCfyeI9mVzVV9fACA8+lZ1jMWqFKaSUQbk371peo68/SiNH7eDr85YO5LxTBWfYV8zC+hxAUwZQwTdcOYhlBMwlMY8MxoKklbKQBjfrXjV7uvnxP0WGMjOC+n+M0fPjfJYEPWCPwQh0rCRMVlgyIKs7FE7FEWZxR836euyJftV43jJlXbGsy+pFncU0TGglM5qtt0jLlcTg+yasAUgd3sVdPhb83GYwmpSMDo/qrHsoPzUtV2W2QVlDfxfeao9X5XXTVvJvg== X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8be9c5a1-8892-4acd-2879-08dcc59a4a25 X-MS-Exchange-CrossTenant-AuthSource: PAXPR10MB4734.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Aug 2024 06:42:44.0233 (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: x1zjndKlBuI5eq62tGWVxgf2RmZxG2RiQiZEGqIMS/++DiqkUkKezzqW9Zmq95wjYTnKu73T7Q+vndXnoiHlHMIz7oIC7IK2cuTBMukRjGU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB8285 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=sk90rdyb; 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 2a01:111:f403:260c::62b as permitted sender) smtp.mailfrom=michael.adler@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Michael Adler Reply-To: Michael Adler 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: , Analoguous to diskpart_handler, diskformat_handler also sets FS labels. Signed-off-by: Michael Adler Signed-off-by: Christian Storm --- handlers/diskformat_handler.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/handlers/diskformat_handler.c b/handlers/diskformat_handler.c index d968394b..07e0f2c5 100644 --- a/handlers/diskformat_handler.c +++ b/handlers/diskformat_handler.c @@ -35,19 +35,25 @@ static int diskformat(struct img_type *img, char *force = dict_get_value(&img->properties, "force"); - if (force != NULL && strtobool(force)) { - ; /* Skip file system exists check */ + /* create filesystem by default */ + bool do_mkfs = true; + if (force == NULL || !strtobool(force)) { + /* only create fs if it does not exist */ + do_mkfs = !diskformat_fs_exists(img->device, fstype); + } + + if (do_mkfs) { + ret = diskformat_mkfs(img->device, fstype); } else { - /* Check if file system exists */ - if (diskformat_fs_exists(img->device, fstype)) { - TRACE("Found %s file system on %s, skip mkfs", - fstype, img->device); - return 0; - } + TRACE("Skipping mkfs on %s", img->device); } - /* File system does not exist, create new file system */ - ret = diskformat_mkfs(img->device, fstype); + if (!ret) { + char *fslabel = dict_get_value(&img->properties, "fslabel"); + if (fslabel) { + ret = diskformat_set_fslabel(img->device, fstype, fslabel); + } + } /* * Declare that handler has finished