From patchwork Thu Sep 23 10:33:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1531678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: 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=FaAq4jmt; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=LvsHCmfd; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::e3a; helo=mail-vs1-xe3a.google.com; envelope-from=swupdate+bncbcl4hcw73qcbbfnqwgfamgqe4lmixzq@googlegroups.com; receiver=) Received: from mail-vs1-xe3a.google.com (mail-vs1-xe3a.google.com [IPv6:2607:f8b0:4864:20::e3a]) (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 4HFWjk4BrCz9ssP for ; Thu, 23 Sep 2021 20:34:01 +1000 (AEST) Received: by mail-vs1-xe3a.google.com with SMTP id k1-20020a676f01000000b002d2b5806905sf2392554vsc.1 for ; Thu, 23 Sep 2021 03:34:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1632393238; cv=pass; d=google.com; s=arc-20160816; b=vJNer0w6JWQYt4hmfyTSO4dwGpnGVXjJVHS7XR9n46CosCp5a6mpY5Y123/Q3+3FWd UjxSkBfbUbYydtpXxtZVR9ryGAvGzb8k56+n/qxZslSTIZVWv262Vk0T697wvjyrugnt lG1+01JDmDwRpZiY3dflXQJkN9JfiZlLxcLr1WOkh47Uy93205jk3aVpWU7nCXIVmoqC h9oMNuAWhXi4w+dhC2mVDwkzElhKx0Zut/kOwdep9HgKy+IWcfV8SXFNJ5f0oaD4Qon5 B+2CWBriFPIk/fXSwqQd2I+9NDYjSzs3cXRnj2VnAu7nXa+f8PkM/kHxJ56kI1SygM3c 5tpQ== ARC-Message-Signature: i=2; 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:dkim-signature; bh=ppci9U7eg7AcnA6iMJ1hoV0XWAcd0VLsT96oV0OVjBQ=; b=BqcoUIj070WhYnQMVM7sb5uUwWwV0AUcC71fg2Q0fIrXr436uEmtZYGGh5OYqh/nsr bsEXF9iApaSq211SBQU7wCuB3Xr3RWaC6i2+4GbnyencAmkJA8X8fnwq9jEHRQg7dxpL 07G4fg30Ng80qf9/AlIL5Ssj8ntrPewqggxV+Sg/B7f0QkZwZvAfzyMmqfzUN4GE7hUg jTrLqGBkWm0XwRAZ+93DYzPhsQSSPBzs3xDCFIVXMwlrXFnFm8tpnejlALLHF/dRfSsL dlLA3wX3HtizGscIb0EimcbdTPNprqjDqXQEybLngnMbX7wMoujVnQRIUw1sQDPmann0 rTLw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IkKIBXgy; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d31 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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=ppci9U7eg7AcnA6iMJ1hoV0XWAcd0VLsT96oV0OVjBQ=; b=FaAq4jmt8ENuPiGCr1hk1P/Yw+yNmkV9m4l0BaAXv2ESHh9hV+VDO6KJE8I2eAJNP+ NVfFX6FCx3oZ/xgkNfUTzIhJrcttjW9r1Zn4n9BfOf7x57Ba84lqqIDe/iXCnsyiysoB dV+ydnKdwyRjgbfvWwWdMN+bhLjhnNi+RgHxDLXvNwqdtSXVJETY195Cg+PSwbdd9rx9 pEJRl9PUuRMTmqa/W1JKGDkBLpzGSJXBv/anrrgDj88PuPVpxtPj49CSRkoV08pMUCam hrSD5QWvFqCWlUCSOsvkUjy0gOUM+hdg2K72Mh4YoA9du5Uxz3/QZkAcdX6sVTee5Rey ER5Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=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=ppci9U7eg7AcnA6iMJ1hoV0XWAcd0VLsT96oV0OVjBQ=; b=LvsHCmfdf0HAzi3nMIKjGkr7TuYS+R15Ft1p529ndHZr/i8k6GCEWX2omXwfxzymqk 2sVyoB35aN95R8OwJN2eJYRXX6RYlbjIo1r8Ub0CpNYw0gwAsuHps80YwFOyoMluPJuF nVXCRSrRAvI6Iah0VFtU+Ub68Ar8ZDcSfIvXrCmgB3YNVKTpsEXxfCBnddRNZL6ZoB6m vVJLcKymxJsMtk1ZCqPf7RtIvDpkTtg4nPUqDNKWn6JopRHZP699ShOBHUJSOntt5vwE TPNAmA8HiMjsPvST8OhMRKvdtiF00FyGSb+bGAF3Wts+HbyhEuoGoZbNs4jINVcwKd44 ebUA== 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=ppci9U7eg7AcnA6iMJ1hoV0XWAcd0VLsT96oV0OVjBQ=; b=w9G03aDlIzdN1bDZwQrjUFZKGbqau5TzJEvvrwH+VvqqQNmo/R7C55I87C2niikwEq fbM75iUuhij07VjNAExLkpdt0x44pv6SkNmV8zIOTCigvzfUvKI2OcwCoFCs0cc97iNV 03f/tXmb4VGMHLnXnqXEoNuyf9tvdKh+vcS8EMyRYsrRN8bDodg2FDcpRDbhrKW+HUlY NFg+bE77brbB4icWZLocncSzqL6kaYXsVyhCL5RJs9byCycAqwySgLxusWELECn4aJh0 czQi8+jlPyLykeg3idWVy7dPFts1/t+3iH2Eo0pR509WG9jh1N0uvlFQLdk0D+gIbDY/ n4+w== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530ZvKrbzGrdnt91VVwsOiQjVQVo39g+Pxrbo0FgvXiSi9b1KknC wuAVwPWcPJpVUukbqNafwlc= X-Google-Smtp-Source: ABdhPJyISbegAyH27eh8ypIJa442Q5jYy486xHzW2neO5ZSClMvpOqQX85V2ZuEjoG5b1As/rvVKzw== X-Received: by 2002:a67:eacf:: with SMTP id s15mr3049918vso.44.1632393237969; Thu, 23 Sep 2021 03:33:57 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1f:a716:: with SMTP id q22ls475811vke.4.gmail; Thu, 23 Sep 2021 03:33:57 -0700 (PDT) X-Received: by 2002:a1f:9bd5:: with SMTP id d204mr2465695vke.8.1632393237510; Thu, 23 Sep 2021 03:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632393237; cv=none; d=google.com; s=arc-20160816; b=sixAjJGWKkTFzDd2pXDQY1k/KkA+uyB6e2qRdK9EO4RZoWyBbyO3JvKJ19WqhTG+hS 9WY1gEpyXV/IOOI6lIqQeMvFBlUO4N0KXjxANgBGpWlLaB1IZI4k3ce1g6ddsVEDob7J cVexAxFCQrCA9Aqj81L3zZe2zAYC8J6Wo9ESTWywkAUvFdPY6ezLT4BJb3qr5Fgn1ZC6 zLsYYTslviSEOW1/MKAMJyRPLl71rsRCzqy+92GYMa6zXQiQQFKxy3fYAS2wKnsI5+Ql 7tGlJwVs79xO4F3CAKdT+Ua46qYD3Hix/D09z8uwx0xcCDg9XC0EeYO83M9vKfSTAdwy 6F1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=q9SKO0T7Jw0G/8yVvLRmxU8J2NcNtHaRqIn7NTclVIU=; b=bYMfnBEU2YnlaZG7wd7tpIbtEisPcyLeNr2MbW9DRq1HXU91bd9LEo/BEeLTInQxDn ggZHr8XWv5fxXNOyAKfrLlWzrB6aUK+bYZLhKwd7wodVqFZfrsqaoY2Dq29dUpaV8bn/ OVY8ew1blVg8I2rQrzFBpE5E4uVsVY827DP5HLGMdov5twX38hk/D2u6Ilp5rGkSeUKp ilH0O6RzGzuORlQ5+FxjilcoFpiLsLxCuj60bbYRia8QoUM7Q4tsoo+Q/46DxNlPOXlM Rj+bsE9lBlXnNfsm+00jyQe/1mN/jvzgJQR8mYjhhVkrDd3l9YZseL85RNOBggB/Yp7n 81NQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IkKIBXgy; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d31 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com. [2607:f8b0:4864:20::d31]) by gmr-mx.google.com with ESMTPS id f9si333440vsm.0.2021.09.23.03.33.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Sep 2021 03:33:57 -0700 (PDT) Received-SPF: pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d31 as permitted sender) client-ip=2607:f8b0:4864:20::d31; Received: by mail-io1-xd31.google.com with SMTP id h129so7512003iof.1 for ; Thu, 23 Sep 2021 03:33:57 -0700 (PDT) X-Received: by 2002:a6b:c9d8:: with SMTP id z207mr1232510iof.150.1632393236728; Thu, 23 Sep 2021 03:33:56 -0700 (PDT) Received: from MacBook-Pro-2.localdomain (71-33-146-72.hlrn.qwest.net. [71.33.146.72]) by smtp.gmail.com with ESMTPSA id a10sm2380581ilt.69.2021.09.23.03.33.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Sep 2021 03:33:56 -0700 (PDT) From: James Hilliard To: swupdate@googlegroups.com Cc: James Hilliard Subject: [swupdate] [PATCH 1/1] diskpart: ensure diskpart format is enabled if fstype is set Date: Thu, 23 Sep 2021 04:33:51 -0600 Message-Id: <20210923103351.88684-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Original-Sender: james.hilliard1@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=IkKIBXgy; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d31 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.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: , Signed-off-by: James Hilliard --- handlers/diskpart_handler.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index d079c8f..ea4d792 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -826,8 +826,14 @@ static int diskpart(struct img_type *img, strncpy(part->name, equal, sizeof(part->name)); break; case PART_FSTYPE: +#ifdef CONFIG_DISKPART_FORMAT strncpy(part->fstype, equal, sizeof(part->fstype)); break; +#else + ERROR("Partitions have fstype entries but diskpart format support is missing !"); + ret = -EINVAL; + goto handler_exit; +#endif case PART_DOSTYPE: strncpy(part->dostype, equal, sizeof(part->dostype)); hybrid++;