From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7089105727946489856 X-Received: by 2002:a19:2d59:0:b0:46d:40f9:6048 with SMTP id t25-20020a192d59000000b0046d40f96048mr321899lft.404.1650561049061; Thu, 21 Apr 2022 10:10:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls361069lfb.1.gmail; Thu, 21 Apr 2022 10:10:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztwCvMGNAPPKY1K/Dg5UxYNUxhL5kSCGZO+eLGgS90wIu9cmi//lvHDYO4ukOx6M03Nf2b X-Received: by 2002:a05:6512:3f88:b0:44f:567f:8715 with SMTP id x8-20020a0565123f8800b0044f567f8715mr270558lfa.609.1650561047679; Thu, 21 Apr 2022 10:10:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650561047; cv=pass; d=google.com; s=arc-20160816; b=Z4Ca0LLXwaT5B+3OxUeqU1cZwTd1sv9De9QmLEiu6ZST27Sxw5HRWnnSRAKbdF2grD dcKTCDys1Yo67OV4u2EVR1MdtCOSFSgRNCg5bVwgn6U6WZ09vnVGux8gRkdOlECWFCHs Ro9FJE/7iTUQhBHX5cGujQqT30qJcXb4Vew7tMWByugBxoH175XrFPFNf3XDRgGRrUWK 7zUylPOFYQ2Zr7Wcutb27QEWhKlHCSigTXTUfiM9+7TF8HT57yWGhSg3IZH9rZhJHFwf Bcmu15IUT6GKEZcJ55DUCmMZj5IirWSz1CW2BkYm3udzc3PppwT82Y8GH7VQzHfeMGXV moDQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:cc:to:content-language:subject:from :user-agent:mime-version:date:message-id:dkim-signature; bh=RuoxHAWc8R1xPHwqOHfWzA8kCElIOyK/AJU4Z7/dvfQ=; b=l6v1Miv6+qEy9aqxcvUf4xGcrvA6CsKguYdjO3UY0fmOp4b3hrfD9euu+8RNREgxTD P0SV6Sfm8yfpYrzMEYBDc1rrhP8KcxNd3KmB+plk0MzZ4TaJc1iY5kW1f7fTcCTQmcvi /IIWXbIywvw+Lr/WtNBGkxBznD4jI8HJWPuuexljkyvDtwPO+lLIW0mRm4B71nfkaieI WtEiEexfXkGu7f1pCOK8gz5Oonebb3p0BqukPMQI1QA+HGIg5nEEgftyCag/UpFLp2iB ylGABaIa25861XaWEFkwHZkgXg6cexJA+pyh8nn//sJE+oBNpUnMFvGuQ6cj/0iYqgwW ssLg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oexSI1pr; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::627 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0627.outbound.protection.outlook.com. [2a01:111:f400:fe0e::627]) by gmr-mx.google.com with ESMTPS id bn24-20020a05651c179800b0024e33a076e7si222020ljb.2.2022.04.21.10.10.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Apr 2022 10:10:47 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::627 as permitted sender) client-ip=2a01:111:f400:fe0e::627; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oexSI1pr; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::627 as permitted sender) smtp.mailfrom=jan.kiszka@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=UHmRUsrnjYt7PGnfga2Ycz8VLZ4gOnUwZKiSB94xphfGyFiCzXyiEBQOP5k39sDEjnO20FUIbgQdjHt2DbSBnezDNesgV/aHYBsmKEQ53w1Cm3oacz1rl3nJJo3w9qTf+4lT/4HrQDGJBtISDCeFo1xDhauEQPuH17VTcCdYDI/EQpSdd3E8rg4npFUu5TwVYdY+/2XIF9xUElRicnYxEfv+SCWPtJKXHeMuqjtbFO2v/L1b2h5aQGmWA4BFHq0Mdb2Y8/pt02ylI+/UGyA9OKDYl+1OYsDPhrjq7oTB+mDDVXaN35l0aq5kQi0LXFS7ypFtNR585/RIjjLTwb3o+Q== 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=RuoxHAWc8R1xPHwqOHfWzA8kCElIOyK/AJU4Z7/dvfQ=; b=Gy/DpGw3Pbp2ICqwe5LptKTiyszWFDTNwLtslP671EyrLDRVRHl6nlBtq87jir7bhANaZCug2nzmDBGg1Tx6krDqd9Qd5FGELODUqUG8WAjSuadO/8dfMJCbGdjDa+fqc7Hgltlk9YPvx/aGTnGY5qj7jh0XUt6WGMnZzK+i4NoWGIWEIFlHpfc1juRyijridk1iv0et42GdP8gYVYJe7Cxog6ut5CSDKce8CfImfbP0zrxaaIigo1CNnrYvqFXgkYxTMWkJEUCimiQQlVrvx1lwB04kqcH6akLIGuCuUmb5/2OZG3nE6ABPu7gQkpO97t1rtWZ/31PDVjI0mLOyEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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=RuoxHAWc8R1xPHwqOHfWzA8kCElIOyK/AJU4Z7/dvfQ=; b=oexSI1pr8p0v0t0+8/66J9Yp8wrl7J0KSdUK2TBmdcikQwMuOs8oHP1Z0ekKqZkCG+/32gPLJdxARWASHTy03m8ry8FrQQ0DNuC95VX7MK6wzTNhCyZmMkT5za4QdykFAt/3HB4WXWtE7URV7Sru1TZnMX2flWJ8pb7+DgQ9wORrO4yS/C7NYqI2hvjJOgo8/z08irBtQbrSujQx/wrb4w8j7jr/KZBrm8BoQjXBNtDfkehjQAq76oQS3t2HFAUNai48XagLqLvdz6yAc2swL5VV8g3fpDllfdyp6vsReLEXuaFc9CIhsFft1BKUaDegDjpW4nNaRb3JvevjGj31MQ== Received: from OL1P279CA0007.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::12) by PA4PR10MB4365.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:104::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Thu, 21 Apr 2022 17:10:46 +0000 Received: from HE1EUR01FT102.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:12:cafe::42) by OL1P279CA0007.outlook.office365.com (2603:10a6:e10:12::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14 via Frontend Transport; Thu, 21 Apr 2022 17:10:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by HE1EUR01FT102.mail.protection.outlook.com (10.152.1.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5186.14 via Frontend Transport; Thu, 21 Apr 2022 17:10:45 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 21 Apr 2022 19:10:45 +0200 Received: from [167.87.32.12] (167.87.32.12) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 21 Apr 2022 19:10:45 +0200 Message-ID: <8965f42b-0813-bf3e-a7ec-023d2b41db4f@siemens.com> Date: Thu, 21 Apr 2022 19:10:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 From: Jan Kiszka Subject: [PATCH] expand-on-first-boot: Add support for devicemapper Content-Language: en-US To: isar-users CC: Christian Storm Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [167.87.32.12] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--12.264500-8.000000 X-TMASE-MatchedRID: uQZ0PIIwtonPmrVKltGy2IAKzG/QdI/5yGDnc/DDAQQsWKt1qrD4oeKE ndfG3ZsCnhD4vcFcha5GvMimTiegtYUHLvxFN01V1Poa3n/sr+eZxQ0LLmG+fwPZZctd3P4BN+J HLCN5duMGmHr1eMxt2a2LobuNU2ekSC1mhJyOhERU3OGdAGcyukQXu2820icGa87CDXaKRVJBlC ad1Pul8JGPHiE2kiT4JISWdGNCV27i8zVgXoAltkWL4rBlm20vt5CrqYXZLj/dB/CxWTRRu25Fe HtsUoHuyuaR6byIbmpp01wzTj7AP3pa6gozeycIVwI5rlPY6TBgO21BQaodlQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.264500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 6197D545ECFE532517DD714F7886B12AD8EBCB2107F559CF8B7A63E7BBD038B72000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c322cdec-9252-47d6-7a22-08da23b9e004 X-MS-TrafficTypeDiagnostic: PA4PR10MB4365:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v4+0bpVTIoU5CPsVZLSeyOJlCjdApTS6Ut0DFixY8nA5c8vWQ2mBE2pHUiuEGsp9G+zydZEnfnB7X+DXKssGp79nSlI2irEvzZ+1n4kCCVcexJNR8+wtQvo5+Nk3HGrcDqAwO5tVAFCFzicmXT2n8heH+fi3yFGu3QHdBb7rQK6QKaSNomn0x4yqUUhvv93j8qZNc4rVGKjuTd7SfJMs9qLhotSjPPIxgQJTQMoVMtFDxM5reJr4kVAHwohKevpR6dFosdazSRXZAJFcG3jrK7+4lW+ERe18pt4CV94HUgc+0IWG+VjegLbp4SBIunJ0Rez2YgwZpPjq7lHll/w/qBQx34eBXcc0dNwstPx/HpFAjQ5a37HAh5UDh03BfXRgyjZp3+1kFE3HK+7Gsbl5+PjbPQ4T0blyzBooZqKuARkEngl521XsaFvSsakMb//LpcDg6fG6x7MBaVpnxcIjJkgIPILfN5eRWIlcN+8N6/cM9FjayKCx4URhMfMrIA1tX2HSWV5IWtXWYt/2hlemDWGZWRvulEl2Fxb7e5VDWX5BOfRu8ikB30NfS6/YCk0xj63+t8kwhrtKDO4WClW+jZJpSSXFpApo0OJXncKj2wrlZOM67EjDLkC9wFV3QkhAiGEc7XO8boBioFXBTYdUuO6lwPlt0ctS+70PiXyVgLkqMMkPPs7O4k3MYbMLzDj/uvFqKnNU7wa0AkwF6bU1dQD/x9FwsrEOEO29fVLfZ0P4p5vxQZwa+B2EqYpMAA4QdEUC/pfzru9iLF4kgyyIpA== X-Forefront-Antispam-Report: CIP:194.138.21.71;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36860700001)(5660300002)(508600001)(81166007)(356005)(8936002)(2906002)(44832011)(83380400001)(36756003)(82960400001)(16576012)(186003)(26005)(16526019)(316002)(82310400005)(107886003)(31686004)(6706004)(47076005)(336012)(956004)(2616005)(6916009)(70586007)(4326008)(8676002)(70206006)(86362001)(31696002)(40460700003)(3940600001)(36900700001)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2022 17:10:45.9720 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c322cdec-9252-47d6-7a22-08da23b9e004 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.71];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT102.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4365 X-TUID: lY0uGBd6/tCj From: Jan Kiszka When the rootfs is inside a devicemapper volume, e.g. dm-verity, the script so far fails to identify the boot device. This adds at least basic support for that case (single level, single slave). Once there is a good example for more complex setups, this could be taken into account as well. Signed-off-by: Jan Kiszka --- .../expand-on-first-boot/files/expand-last-partition.sh | 7 ++++++- 1 file changed, 6 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 7175dfd3..bb371e9f 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 @@ -10,8 +10,13 @@ set -e ROOT_DEV="$(findmnt / -o source -n)" -BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')" +ROOT_DEV_NAME=${ROOT_DEV##*/} +ROOT_DEV_SLAVE=$(ls -d /sys/block/${ROOT_DEV_NAME}/slaves/* 2>/dev/null | head -1) +if [ -n ${ROOT_DEV_SLAVE} ]; then + ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/} +fi +BOOT_DEV="$(echo "${ROOT_DEV}" | sed 's/p\?[0-9]*$//')" if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then echo "Boot device equals root device - no partitioning found" >&2 exit 1 -- 2.34.1