From patchwork Mon Aug 30 11:34:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1522209 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=2607:f8b0:4864:20::739; helo=mail-qk1-x739.google.com; envelope-from=swupdate+bncbcl4hcw73qcbbzuewoeqmgqexj4iiui@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=20210112 header.b=EQO/PG8p; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JOWyA+D/; dkim-atps=neutral Received: from mail-qk1-x739.google.com (mail-qk1-x739.google.com [IPv6:2607:f8b0:4864:20::739]) (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 4GypCF69lwz9sT6 for ; Mon, 30 Aug 2021 21:35:05 +1000 (AEST) Received: by mail-qk1-x739.google.com with SMTP id x19-20020a05620a099300b003f64d79cbbasf537292qkx.7 for ; Mon, 30 Aug 2021 04:35:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1630323302; cv=pass; d=google.com; s=arc-20160816; b=ioh7O6NKind4OlRliEQ2QSwINVUt46t+w5nBMJHqR2KmdA87pvbbJkh71dIopUztA5 +9Y9Z++yCsOCmBGoJPqcbe1Aoui9PyhTbSouOOpHh/UteojVGBI5fXSImI2egOrVYB4V uwxub8rtgPR+PlQUHGCIUTYGyuqX2n/4/lCtDHH62t26vQ5Ti+bjPoOrVPUr/hTNek1E MUoLHUmMiKPklai2IwX4WU4USllTuL2Mhtvsn7xPRPb8Sr/xIGA29rQmrlQvL+zXkDq/ RGieTIV993auEth/blKBNvWRfwJQYeRZvjf4y1q/SzUpYR17xanzMR/NOsdK60J7JgwH iuDA== 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=I0RRTRK+cDc1A/oQCv3QHLV357yTjj2LAqLfa0HV8h0=; b=rhDYQ6520+o9gMZTv99CI8cXqE3wgpqIIhr7JXeIZE0HU0vK9tjdDjqM73EHBv6j69 w68T86vTKmkLwgiC4oToXZw+/RyoIC75K+j22NGyvOh+q/AYtDRSPAuCqByTOc+RHzJo sFAH3WK4mtakS4fUs6sBgpMYKL64tSI8kh13OwWy7L9i3TgCD7ef2lkxifloPq2+0T1z 3d+XakqAP2hJoDcpWuyYJmjzkKUnZ6g/2+2pyeuYKjHlN5wSBFCARv5kukQW3HHFX2xy ZJ/tz+Q5I6GUdYyjguxyu7jn21osMoUuyctfdFVk6NTcsWi4LYr9fCYgdO/DVtMOWZ9X tQvg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="RV/OSw5F"; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d2e 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=I0RRTRK+cDc1A/oQCv3QHLV357yTjj2LAqLfa0HV8h0=; b=EQO/PG8prjUmDrQFM+oczAFyqNZaxeWQZ1EGu5w2VYycq3ZLxrWT4WS6Mv8BFY2t1H MJ9CyjLgeOg8WX4DBCFE/MeIgJo6uWJTTqtnpSIeLMEPA86zNWqCQBPpYuZZ138tBJKl iVZhl40g8zOMmmQz0wvrsw4ZqMX4SsrnmZsMSp4rvqzATWUOhGiH/MvpvFh8eHIueTc/ RJsMq1+DhIJbH61bscJxMv6FYcK/bmH55N2VGfaD8ghAmQDAzugCWsoRZjMtKWatbORe +xuI9ekw9lKbpW0jJBq2O/nUuC/y3uEzqOqfM2IYAdWPJY80GZjBixUzXytjbaFcNlkr YLmA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; 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=I0RRTRK+cDc1A/oQCv3QHLV357yTjj2LAqLfa0HV8h0=; b=JOWyA+D/qfyFJVzLLtzkEXgvPw5EI/2r0IEbIiJZzwyRH+19dZUwIwrD5iqZfkG8rx F+FgNbNDtO/GATFR10/Bx5XgRa4cs8u6c+QD6CPI0KbhyisfkTa3utxftE/wEdpjDXqz bXYjmD6PlsEHyIds3/9g2CxVVeDzQ1yagGh1qUh9GPYV/SPopwLPXfp+T1hxbLoac9D9 16YhrZ4BZU9mIphVGzx0V/KNyJ+HQvbLILcIac2GttEWai9F3UrJ11X47Z5CkRpsQFpI 8mTxO3RJQp5aVBjiTb5Kq+f3z0ZxqwyUPtjNrcN4kGJF571WEOENdOhvib9fjPTpCRcu nKAQ== 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 :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=I0RRTRK+cDc1A/oQCv3QHLV357yTjj2LAqLfa0HV8h0=; b=AFdGlJbtxZ7rAZos14RWQAZW2gvGsKX4YvL0J88eguEp0wIA5yDxJSUkVA9/lww75j +OP+ex3KTe4RcvjumcePk9+folhkyL7YKU9v6x2lrExzsMvUN0N7VBOowpVOnboyVBwn +XIZf/2tfpQea4+0k2LCmZw7g4zEbLQZFTlVZih+YmJ0CO0LwQ5R+MlW9Y4Zaad3GEk+ vsEr0xIdSTIalyTTpyYLgx9P/8QnUyBGYK6kCNmRYIWUcLGA04dZ+16GzmLWibou2LFd 8C7e6uCeiIf6zdDvVm+sUgYm29f/rogBZHKpibNh1Iye3hIyfKyWUF4gj+dmsgM7Uab2 dYnw== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM530bE1nHTnVYAv02dLjw5UAxBMfanRwdVNInG+92yT7tZkwO2dQs WToKQEmmtPp5RBLU6UV/u40= X-Google-Smtp-Source: ABdhPJz003gUJpUR2i9I6QByH0wYF64+VD10YinUDaejeOEhSskvMw84J6r458Ws6MCXMxEN33Woeg== X-Received: by 2002:a37:b2c3:: with SMTP id b186mr21973964qkf.424.1630323302385; Mon, 30 Aug 2021 04:35:02 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a37:5f81:: with SMTP id t123ls10219187qkb.6.gmail; Mon, 30 Aug 2021 04:35:02 -0700 (PDT) X-Received: by 2002:a05:620a:214a:: with SMTP id m10mr22390725qkm.374.1630323302021; Mon, 30 Aug 2021 04:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630323302; cv=none; d=google.com; s=arc-20160816; b=Hbsb+pWyyE94grAtx+uEEsupNWmU2XU6hT60sDHgOiSLYJtQD/LcdG63XLkkm8SqS/ gRo6DvkqAKbXgKIdm1W9E3ue5wNQjHGcWRI0RcaOoX/hsdOMiIfWeaNjKwbLSkG/Pq3F beku1hNBep+WNLQhQE6OPBa+IY/Q3Zdzafawqv+qCvUPD9nbz9o/KKv6ULKx7F/ML7yC s2GkQTXrlxczSOqA5IzR/E2xmDXJo1/a3/hpKvWN4F/3NSJlAEOIv+iQiNTzLIjNrEsX OT0A2Bj7l9Oa1yTvRqdqkdILNCBd4A1NIsffBIOfI1AIWP+/ERcrO+z6nJVb43/cdByq n7WQ== 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=B0kgxhFrx2aY8aAlkrNM25YDCaz9cCZHPaoXgTPZ9mI=; b=BDtczqdrn9gFC0sZ0ITqpniSMmJEh+Q6S/lmXP9TJzw5cmN6jAIERSSxL1n3U7M9Om H+Ft/5wGFrNiSmeJWsLGozWlraeb7XvUimd7B1qc0s6ja7fRwuSlcgJYMXj2PGLmr36z 7bZ4ND6awyU7DeRZQyinMf4CzSkMUJXbeRDcT+hvqlYod8hUFGlEPX6B5B47AzFx1TWa nX44rYX9p5cV3080DyWn3ZOsR4jMM5aH7gwv3KoTUfqQPWzMQP2Plvzp+rr6LnSfHGpc 45LQkXpmlb9hKj0vjK99nqt9hJh9vBGbZK5Lv5Okm5Zo8YdANL7DV01SZ8xBuzmvYWz7 0mUA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="RV/OSw5F"; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d2e 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-xd2e.google.com (mail-io1-xd2e.google.com. [2607:f8b0:4864:20::d2e]) by gmr-mx.google.com with ESMTPS id s128si1247568qkh.6.2021.08.30.04.35.02 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Aug 2021 04:35:02 -0700 (PDT) Received-SPF: pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d2e as permitted sender) client-ip=2607:f8b0:4864:20::d2e; Received: by mail-io1-xd2e.google.com with SMTP id b200so19340565iof.13 for ; Mon, 30 Aug 2021 04:35:01 -0700 (PDT) X-Received: by 2002:a5d:9304:: with SMTP id l4mr17993032ion.167.1630323301218; Mon, 30 Aug 2021 04:35:01 -0700 (PDT) Received: from MacBook-Pro-2.localdomain (97-118-237-25.hlrn.qwest.net. [97.118.237.25]) by smtp.gmail.com with ESMTPSA id e84sm8188335iof.21.2021.08.30.04.35.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Aug 2021 04:35:00 -0700 (PDT) From: James Hilliard To: swupdate@googlegroups.com Cc: James Hilliard Subject: [swupdate] [PATCH 1/1] diskpart: resolve symlinks for fdisk_assign_device Date: Mon, 30 Aug 2021 05:34:58 -0600 Message-Id: <20210830113458.5655-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.32.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=20161025 header.b="RV/OSw5F"; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::d2e 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: , This should help ensure diskpart behaves consistently when using device paths that are symlinks. Signed-off-by: James Hilliard --- handlers/diskpart_handler.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 45ee97c..d079c8f 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -147,6 +147,7 @@ static int diskpart_assign_context(struct fdisk_context **cxt,struct img_type *i struct hnd_priv priv, unsigned long hybrid, struct create_table *createtable) { struct fdisk_context *parent; + char *path = NULL; int ret = 0; /* @@ -169,10 +170,18 @@ static int diskpart_assign_context(struct fdisk_context **cxt,struct img_type *i return ret; } + /* + * Resolve device path symlink. + */ + path = realpath(img->device, NULL); + if (!path) + path = strdup(img->device); + /* * fdisk_new_nested_context requires the device to be assigned. */ - ret = fdisk_assign_device(parent, img->device, 0); + ret = fdisk_assign_device(parent, path, 0); + free(path); if (ret == -EACCES) { ERROR("no access to %s", img->device); return ret;