From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7174822613449965568 X-Received: by 2002:a05:600c:1d8d:b0:3d0:8154:e20e with SMTP id p13-20020a05600c1d8d00b003d08154e20emr21864168wms.47.1670585103813; Fri, 09 Dec 2022 03:25:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:218b:b0:3cf:afd2:ab84 with SMTP id e11-20020a05600c218b00b003cfafd2ab84ls4853097wme.2.-pod-control-gmail; Fri, 09 Dec 2022 03:25:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf6dlb/nqEsnqJZ9Irou5c/B9kcf6HLKB7lEmd8r7uIsoNLp6/Wp6kVK8mivvHk3NL54JbHO X-Received: by 2002:a05:600c:1da9:b0:3c7:a5:610e with SMTP id p41-20020a05600c1da900b003c700a5610emr4795729wms.27.1670585102708; Fri, 09 Dec 2022 03:25:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670585102; cv=pass; d=google.com; s=arc-20160816; b=oLF47GiOZZA9gmaXr5PNTYbtzMRHThrEbXmK8zOzde/DO1U2DO3o1nrE0CrPVsstZc LRweIpDXP6e4OszaFC48+7zoTksXUPiEcQVzwVu70wsHTqZnxYlxb3vZj/1l+EmmESp1 RmgvegjLI1wSEgOWM8AI78EsFuW1RvNwK7CM0PVpFdqNjwusojs5CZMXAbN4b2gB28lT PS51AqrsbrX1xl6QTCAoUCcFnCTnuF09jz3COo7KgL5T7wekk+Kwna9A7EJr9An/u1HI aeNffOL5opmvXALNzGvPom3UYOGEB3i5X7II4PrNdxJ5dE0clyVKYD7c4bztl9chq/oQ N6mA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XrR1A8Sus7SGin3K81d1blZKj8BZBq+iSnf3vZhZ8Ec=; b=wifR163qKvih7mWflBW8WGJ5Rre+/qY1Nbo/VmN6x1LfuFrfvQcy3Rcj3Opz6E9npV 2veq+GKSMk4upOoZn/Lurx4+uAd1e2AsufHDzCK50cjj/pc1VRQUCeWeUZuyJ7l/QEVm JNqt70LUlZ8WQnZiySNGLbbvaH9kepN6W1ZGpYrsrsKe0l5VSDcTaLl4oXUazawBDruL a/pcXXNT2wBdtQn+0wpX9NoiDeFVsr1OVUeAzM8poxgLEsTX6Xhp8HM6Cb1d20jOi5xl BjPzH/YtbC6tF0dNK+59W87M6WwVEwLrerjFKXbykPbNf3D2PqOwEda+ohxAPm2un2NY kLWg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="yb6/ZeQ5"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.20.81 as permitted sender) smtp.mailfrom=tobias.schaffner@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2081.outbound.protection.outlook.com. [40.107.20.81]) by gmr-mx.google.com with ESMTPS id n2-20020a1c2702000000b003cfc33e8333si458748wmn.4.2022.12.09.03.25.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Dec 2022 03:25:02 -0800 (PST) Received-SPF: pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.20.81 as permitted sender) client-ip=40.107.20.81; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="yb6/ZeQ5"; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of tobias.schaffner@siemens.com designates 40.107.20.81 as permitted sender) smtp.mailfrom=tobias.schaffner@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cocq4mGopWy6cOku0pnUSGqXVPFxfe8ReFUaSJMKmRnR9BIfQ3oYulcNMJe2XKu3wrPE6ESCFHBsjXt263+u1L4nl2an1FpC5WLhwrXOkZy0O0TmotM7COt9qrCu7uuRdwR5hNDqcxwsHEGaaRarF48P4vSKd/9FjNGGTgmU/Y2QuVSwMPfvE5OX6QnGgnhzyWrqdspv2k1bXW7EgV0Qsbsv6/n3sw1hYhN8UP6WhHQCSsRe3QMQgxpSumWEBlLipSH+6MEcVmktOiulGTckpNSHKawL1P/n6RE3LLFqSItarAXYKJYinM79a7EhfKowltPEMr9zHOHaWBPazHCRWw== 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=XrR1A8Sus7SGin3K81d1blZKj8BZBq+iSnf3vZhZ8Ec=; b=AVOH10RH1d2cazDn0nflhKy7S1QKKOQFAzNyjxe3KqWHlHOv3LFMH4M4+g/hbaYdzMhH1v0b45XQVoevv/5twzoecJH2cwffbFv/RgYZ3yKu7UxSi4dzLGJKWOU3ycy+mCBhEFEx0ltC4loUroUqsknxp06g+J8/dWz9Bj+JdiM+SdUTaL9qqfUwihiPAhiUEFQqrZTs5BcxWBYSpvzG0oZihjMKzdGtZ/3d82rANozcFc+jreygA0mmZoUfypEbw6uguuHehMsc/ItjW9vaDhmFRBFLk0Q1wwFzuZ0AdYfww+rkk2pmt5tRGUcFKw7mkr20VNXgU5+tSyJG4fY4tQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.76) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XrR1A8Sus7SGin3K81d1blZKj8BZBq+iSnf3vZhZ8Ec=; b=yb6/ZeQ5JoHDApcPWqR1KbrUh00TRWTfcmc2fS2kaSXqz9wszobVpz4QSmN2zMJaRq3VOOeVBl1cbeq75oHgQ0l3rRRhfPXVeAxkSSExAW1M4iAr65cSlyLvxVD7i6aG3fuoX8Qoh0GATOu2C3Vb3Jq0khrwRWYV5YWoXNl7Fs0vg60n9CzQA0HOgaIjxzBmP/75DhlloTf7KEcU6asQepgQ/XlsofHWJjowqOElTjHMAGgNZiwbcdFZ2MPYm32ydQirA7Kbb5IyNQfZJdRKWinwOkNVaunHwKb5Js7PJZeg/kE7sIh8dTxQkVd5D9L6hyDPxwDxiVkzUQd21yICpw== Received: from FR0P281CA0051.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::12) by DU0PR10MB5946.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:3b5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.16; Fri, 9 Dec 2022 11:25:01 +0000 Received: from VE1EUR01FT035.eop-EUR01.prod.protection.outlook.com (2603:10a6:d10:48:cafe::a9) by FR0P281CA0051.outlook.office365.com (2603:10a6:d10:48::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.5 via Frontend Transport; Fri, 9 Dec 2022 11:25:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.76) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.76) by VE1EUR01FT035.mail.protection.outlook.com (10.152.2.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5901.17 via Frontend Transport; Fri, 9 Dec 2022 11:24:59 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 9 Dec 2022 12:24:59 +0100 Received: from L15-Gen2.fritz.box (139.21.146.191) by DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Fri, 9 Dec 2022 12:24:58 +0100 From: "T. Schaffner" To: CC: , , , , Tobias Schaffner Subject: [PATCH v3 1/1] expand-on-first-boot: wait for udev to create symlink Date: Fri, 9 Dec 2022 12:24:41 +0100 Message-ID: <20221209112441.87669-2-tobias.schaffner@siemens.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221209112441.87669-1-tobias.schaffner@siemens.com> References: <20221209112441.87669-1-tobias.schaffner@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: tobias.schaffner@siemens.com X-Originating-IP: [139.21.146.191] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1EUR01FT035:EE_|DU0PR10MB5946:EE_ X-MS-Office365-Filtering-Correlation-Id: 13bc671a-6b36-428a-213d-08dad9d80200 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2atXKrJdLqYGKWRIAp4YoqQHXLFSTraBNXmtpAX4vEzrBchtkaSeME+jDMgOUC6vQ7Y3S874djW8Bg2LRz87x9Q8BkdMOsaSvEQWcXaIH/8rgT0xEuuxneTAjOLr3ITq8thr+yw1cKgxGV277Mjo7hXkptTKvH3hFBv9i64XD+u24szDhus5LPOpeEtaD7j4tn/NiR4rbnM86zSvkzyzho8ZMXsFNmQPtDTVajUl8oZs2rznZZHmKB6jzG7ekoSLNPucRBuz3oRD6x5dqXbGLGeHKqsMV2IT/416MXfRZZXn5hsGJLosgc/hNfK/mskNKWTjAhmDPii20CH3oIX4SJPapcIj1KB3FCyYTP3IXRNJ6lolBH5qK02dcGd8IBhhVdmKZd2327UQcs+Svde03S+lCS2IHAI0wXXWPiFNSFDN6XoQnAbRVI1zGkNWCS564VLPqQocRLNgVA293W8UZBoFTnXl5Iy6xTrWeaD9XJo0263iGDJCeJC56ELfC/S4dhTlulWGWEhiAO0R+1ZL/hfEwYPJGY2pnEyeB5M/H5n/h5y8Q7L6I6p0QkVzLloikdb/652RuO5uV6x3prGhUwtWs8f7WPolOpVAj4wqNUOGnKRPmhHAcE+CGd4AwDbSibKdEcVXVnINkis7/AQ3Lv9NbYxWsVpLWm1/amXZ0RFVSgDrOQyGM2mwsoa0ewX29vb1HH/i6fA5tHauLcFOnddaPWc/FszzxuqVtCps2h0= X-Forefront-Antispam-Report: CIP:194.138.21.76;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(346002)(376002)(39860400002)(396003)(451199015)(46966006)(40470700004)(36840700001)(40480700001)(36860700001)(8936002)(82310400005)(41300700001)(36756003)(5660300002)(1076003)(2906002)(81166007)(956004)(2616005)(6666004)(336012)(186003)(26005)(107886003)(82740400003)(40460700003)(82960400001)(83380400001)(16526019)(356005)(47076005)(316002)(4326008)(8676002)(70206006)(70586007)(478600001)(86362001)(6916009)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2022 11:24:59.5604 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13bc671a-6b36-428a-213d-08dad9d80200 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.76];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT035.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB5946 X-TUID: A0PoHWEUFIhh From: Tobias Schaffner systemd-growfs depends on a symlink to the partition of the filesystem that should be resized. This symlink is created by udev in /dev/block/. If this symlink is not yet created for example because systemd-udev is not up yet systemd-growfs will fail. We could use Require and After to depend on the systemd-udev service but this could again create a race condition if udev is up but not fast enough after the partx -u. Run systemd-growfs periodically until the symlink appears. Signed-off-by: Tobias Schaffner --- .../files/expand-last-partition.sh | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh index 57055cc..4d78e4f 100755 --- a/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh +++ b/meta/recipes-support/expand-on-first-boot/files/expand-last-partition.sh @@ -80,6 +80,25 @@ if [ ! -d "${MOUNT_POINT}" ]; then fi mount "${LAST_PART}" "${MOUNT_POINT}" -/lib/systemd/systemd-growfs "${MOUNT_POINT}" + +EXIT_CODE=1 +# If systemd-udevd if not up yet or was not fast enough the symlinks in +# /dev/block/ might be missing. Retry in that case. +# This retry logic is only needed up to systemd-version 252 +for run in $(seq 0 50); do + if GROWFS_OUTPUT=$(/lib/systemd/systemd-growfs "${MOUNT_POINT}" 2>&1); then + EXIT_CODE=0 + break + else: + if ! echo ${GROWFS_OUTPUT} | grep -q "^Failed to open \"/dev/block/.*\": No such file or directory$"; then + break + fi + fi + sleep 0.1 +done + +echo "${GROWFS_OUTPUT}" umount "${MOUNT_POINT}" rmdir "${MOUNT_POINT}" +exit ${EXIT_CODE} + -- 2.34.1