From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7089105727946489856 X-Received: by 2002:a05:6512:1398:b0:445:bcef:e4fd with SMTP id p24-20020a056512139800b00445bcefe4fdmr396099lfa.398.1650563033379; Thu, 21 Apr 2022 10:43:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3e2a:b0:471:af61:f198 with SMTP id i42-20020a0565123e2a00b00471af61f198ls425061lfv.0.gmail; Thu, 21 Apr 2022 10:43:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyy6jtDogx0vZMJynRXpgjXC/+w811Aq7vBSGx15JOFvBEnqDMxCbmiZR7jdzP2JcizXSdJ X-Received: by 2002:ac2:46fa:0:b0:46b:c3a7:97fe with SMTP id q26-20020ac246fa000000b0046bc3a797femr379338lfo.95.1650563032204; Thu, 21 Apr 2022 10:43:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650563032; cv=pass; d=google.com; s=arc-20160816; b=Svu6dFoo005IjVtHo7cguw5o3tmR5Lvusi9VbDi90iZOXXVWWHnUlaNxoV6YLOkDqd /wUVbmU0tJH9vXbi5dAUsQFqZ0BOAiQontz54ca3IHpwZYg/dy52OkNIx3TOG1Fh/CI5 OxzDFM1YagFpzxY5UvlZLzAHt0g8h/l/9sRkNnUQdGklGJ3PcMZ1cBa8UUWvwTjqE+Sm BvIBDGsvS1/rbBRSKPEZd6+E8OSxrtjvm2bO6Ghr/yl4VxoBYa2vTJvtt4C8HcMrsyGI MVaZAi3zAoeo5xku4Eh0q/y1diWWGsegZu3fBGgA3ECRZzpu5Ir1SIVP02MaWwjk9aIJ pYug== 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:subject:cc:to:from:date:dkim-signature; bh=LZ0VwFa/eQE7u5g2hIiB1xJ32GvqzZqp5VDeTG4gNUo=; b=moMUlyWkAvEmdhy7BZ8lE+fxlcTIXDj6AanLCNkwCwHAsI8GBKmnpGZ0Ocrn9LDezk rPkLkKGrsZ5hRntIusvH7m/4LwzfXM74n3fElTcfzEO0cNhTe0SFDXQlmJlgQqksRqkl X69FLT7nOT0qOMAWFKXEjBFxXBvKTY37Mx/AQLxPdHpna/OmiSmLqTWGgtL5UtOwlQHx AWHY/8CzM2QOIsDcBozCuG/ZOfaRx9On+yhGZHytVoQZsf2/je00R+uJAW+xrMIfq3Gc hrTwZf51oSC/j8KQQX1NxkNswbcCVGGPyKRsMocBJ553tMAkCvuFTvk99neoXl6GdtVf furg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CoL4syIo; 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 henning.schild@siemens.com designates 2a01:111:f400:fe0c::60a as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060a.outbound.protection.outlook.com. [2a01:111:f400:fe0c::60a]) by gmr-mx.google.com with ESMTPS id bn24-20020a05651c179800b0024e33a076e7si225495ljb.2.2022.04.21.10.43.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Apr 2022 10:43:52 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0c::60a as permitted sender) client-ip=2a01:111:f400:fe0c::60a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CoL4syIo; 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 henning.schild@siemens.com designates 2a01:111:f400:fe0c::60a as permitted sender) smtp.mailfrom=henning.schild@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=WK18GlOprIlM2wdUW3U2bcB5IKoS4fSAruFrjl5YXQyMgi6ss+z7py7TBC9v9xfN7UhLjYfevAQyn0fXOZTJFp2Xn+r1BTiS6NCTvVUGR5Rrhkczf7apQXrL9ss2cLEiO8y1wzOD4r1oEgaL9WBwA53GcgtlV6rOGaqQS6RBN8kF6XY8F+oQHQMpR3Xaq0/NYsIDHX/ay4d5zN0NgVkCr7vjeYSNb6euG5ZBsCzewa/P8dX+M6GFpCIbMPsDQF9xx2CFtuSqwel7bUM6Jcg95qXd6hCj+5S0a09fsnY0fXfqtPQitkqvoUI70K04nEVilmLwTF5XaENmRQjL1382Sw== 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=LZ0VwFa/eQE7u5g2hIiB1xJ32GvqzZqp5VDeTG4gNUo=; b=f4yydcJJXw8UUEl4afibtG+fnCQMe/IiyecKUrbMs4BRPa1Oj8L3Sse6D0qMm5D4AtgMGkK/ZE9AMQhIp7wnD7IUUi5/zs3poueGm5sPGp5cuhiK+AiVSOLF6YdlvqlWW4DVmQ/RsKNGEovi3IZDL8jaVCqlt+WVkEv2NVHfasmLlt2ANUiQ39WBtGKN3CwK1ofmk93YJ6UBYC+Zt2MHMmnu8oAXrWasyjanXfp2YAWkp+SxtZo75G/4T3x4l7kbQhm6rN1NeKs2i032D9lYqfunq2i/Z98xdVgxxhYUtA2v08O9w6+g/tq4sU1JNXVmz9DeoExQJjzyx1+azWyzXQ== 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 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=LZ0VwFa/eQE7u5g2hIiB1xJ32GvqzZqp5VDeTG4gNUo=; b=CoL4syIoX4RA6qeGnKUC5J2BXmIcpa4RFd0zMBQKc4F9Do6/L49Kj8xHD73iBQ/QlziycD4gzs/UiwxPWIql6HmSMM33HSBB/o5JhkOK6XjxR4NvOXnLt++wCeSvBbqz60NokK4oApk7nqsH6gmAOr/unFr4c8Wl56Cj19D1XEh2eyvST7rZzVygx0kfAf/vC/1uU8mxgRQALuZJhuFxQ55mQqTezqKy7DxpFs6hLtTTEbgRbJwwJb4glHHGDIuMFovOHLBm8VGkONQeJJZ7njdd5FKb+9hyJWstDDWDFxkllVKkH/5OyE6Jro4zZcTNE8VHyuGBrpQSj9C4LMog7w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AM0PR10MB3300.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:187::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Thu, 21 Apr 2022 17:43:50 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::f4be:8b5d:4314:c2d8]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::f4be:8b5d:4314:c2d8%4]) with mapi id 15.20.5186.014; Thu, 21 Apr 2022 17:43:50 +0000 Date: Thu, 21 Apr 2022 19:43:47 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users , Christian Storm Subject: Re: [PATCH] expand-on-first-boot: Add support for devicemapper Message-ID: <20220421194347.21b0b742@md1za8fc.ad001.siemens.net> In-Reply-To: <8965f42b-0813-bf3e-a7ec-023d2b41db4f@siemens.com> References: <8965f42b-0813-bf3e-a7ec-023d2b41db4f@siemens.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM6PR08CA0007.eurprd08.prod.outlook.com (2603:10a6:20b:b2::19) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea02453c-57a6-47dc-c4a2-08da23be7ea7 X-MS-TrafficTypeDiagnostic: AM0PR10MB3300:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr 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: 0BvJ/jGNpoyj0wfU8gSvakl6ApwspCBFAaUKBE9AI/Z14Oflh3MID/ZwG56ghiU5yhIFuLHoQWrPRVjNmAS+I0+AhkZnEEi2afYIFcIunCIxFXogopad2KOqf4ps+NVjI7FxxQDKGSxp4qGF1Mhl+PX5vsO7zuJsXNCLJi+XVm/RCVtirOLyFUpIackNxnwmig3D8NVQkwsWw22/lrK5U9Jjn6xOrdTnS4m37EntCHkPeq8muBu6xTYQDb60GczzKXk40DqESA45WZD7tlFY1FgbJXCi0v0651vSSDgF5ejHbLlmXWKX+Gpa3+Z8W23iQQRQrV8yPBH3m5r0ECgVEA+D9CCCTfZNp9x47Dm7pumMJ02DZIycwJpOpzyT11RBxgdWJAtqFdeYOJmZXwoj+uYJYaGFFcOXcd7yvd1ru8qFrotLp3F5v2ETfdFE8cLXQArFIEs4S3hGDwyrb6L48wgNEXOeFjRbkMlfcIZpDdIZnQGad+LonLO5bYRL+tWW/3+rLh68fPtVGIyOsJSJ20WRLZf2aMvYo4jmQ0qCgsHWFbSQRssN1ZrMafGSpLF5uJM4UAGref5ETeZvLW7JEPIQLaTJ/mb6kwnEU+TIVkQNslidbNawm+W1MqDxR1syBjjt7Qv/WALvm7KzK6i4UQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(8936002)(6666004)(9686003)(82960400001)(66946007)(83380400001)(54906003)(6636002)(5660300002)(86362001)(6506007)(6512007)(38100700002)(26005)(6862004)(66476007)(966005)(6486002)(66556008)(4326008)(8676002)(498600001)(2906002)(1076003)(186003)(44832011)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ICjk8o7fxIfV0yXgz6OompkmgJhn+Iljz3HyFrU6XODmN1Xho4foLW7VZECP?= =?us-ascii?Q?ewTkwGHzbl5f99vj2lQs9fJ2GXR44BmQGE28nrbgg2VZ2UyBQOXc6pD9394M?= =?us-ascii?Q?uHxOtpi51m64r8JiB3vMQE7Z2TiKw23cBTpPCc7mHPvrXf3xodoK3MpGhsnw?= =?us-ascii?Q?4A32Y/45AYEPnOY4cgq+Jeo9qgmTnFjkDIC0GaCmHitat1DFiX2Hnqh0fwOS?= =?us-ascii?Q?TYz3DXInvUnieRVpmn4CBMlwSIrC32QQARHzjsMJ89dWkH50VzTSyp05bpaD?= =?us-ascii?Q?s3UXjsl/06XV+Qz8GfT/QaP9eOLLwhZb7LgRyX0kUdpiJCaNFs2h8cn49SOQ?= =?us-ascii?Q?NyD0H7MM5kOM/iYOUoi1tlUI4EfsozCO98AQT2d/aibSukxCHx0/ZSfpj/g6?= =?us-ascii?Q?4MjWluP3Fs4T0iInrJwDXKpoezopFT/XlaHTXxt5sAl1+62TDcKeCr0fltNO?= =?us-ascii?Q?sgzsNu2k/g5d1/NFVWXLMBjXn3lwQk9enXrqsdTn4qOMMDmkUMMP4bzy2v9V?= =?us-ascii?Q?R73YTGkf9DuhFPs227CM44UrGKP/Qog0AkR7gr3QuDMt0DCiaPXF8ZOnMV0U?= =?us-ascii?Q?oZVXxLfPmmrEM8q6HM9gOk6DrtFXxy+3GaP08UH70kBbuPbAVqEAdKi3rqgh?= =?us-ascii?Q?1yeuMOKpWa+39856gS/KcRIu07IXQQmnKcwFtsHzOy75ELnuty9NxcDrG7IA?= =?us-ascii?Q?FfuNnR5s/qcVXb0d9yvL82ZFyDzNW5duYuE1fdgCNySdR/5NKbe3mcechlU9?= =?us-ascii?Q?MhCDCMo6JQrzoAOp2221JoHK0GTFocOT4X9f8qh8LS9cTm3DvSh42unvNUpi?= =?us-ascii?Q?FCquVIDsjwPaTkcdfhrsT4R+g1VbueupZZxl9l/ktOKIDRnOMdoBYptEQ/ww?= =?us-ascii?Q?N/STA//TmQWXaSZTuPqtCmFQxnNdBcWaxWFnJEe6yjO9S7X0yNpsajlo9Rf2?= =?us-ascii?Q?NtyDjC7yncKSVKsmTez/XyJV/u1yEILkuolOe9BfgVRpbA42zcy7Xjs9F08Y?= =?us-ascii?Q?KpiBhYl+ipgludx6YFf/XL+ZsqTY1cH50bvlAbgagVJ+4AwR2pxk7KU7/dph?= =?us-ascii?Q?ZPV44s64u+mmYnnDuMoyWk6cpoJkNFFM6LU2uAASS5yCkBajCjSb8SNxNlFz?= =?us-ascii?Q?B7+Mas4VWNNwwGt71cNlukvCFZY7FgKgoP3QSYgZHmngDVhNb4eFetopuYPl?= =?us-ascii?Q?9IuSfeFEC6MDtQFijbi1vuDay+xBmcnciNqGNfhGIY0tC7e5PM7y+Fqd1hkQ?= =?us-ascii?Q?pnSY5+5ORWTZ+mUIpFWSmG6jyyAfbXAjYD7SRXb4xVi8HFSFb/1gtjN36zzo?= =?us-ascii?Q?lZnZB8eTeUl+ZQMMGZ8LXZYCpcuyRbecRyr4hAzRuGgI+imkciZDxD+FsyTb?= =?us-ascii?Q?W/0bQAeKTFvjJ/I+s6qlBxT0fnQgcEn2mpHuyJGlLzGaLv45Du2Hip6nPDqw?= =?us-ascii?Q?wy68O5QZk2h+9kYS+vDqDmwxvuM86+IKwOULqFPOaTX7NYn4a3WKDYfNuJfZ?= =?us-ascii?Q?6oHarTTVuJJxaPuev+U/D+nuMLCThBzhO3Z1e7eo2LumBTHGgXtqSc3YnweF?= =?us-ascii?Q?bnhgNw9mUnpq8j8VS6Zrt02CADOGWlovo0VbougZ21a4fRq7081oOLkuzHaX?= =?us-ascii?Q?F3ljy0sX2S4yzWBK+3AFC0KQpepQ8H1LgWeCDaBlW9+jGRO+gWFsFDvqONGZ?= =?us-ascii?Q?1eWeOuLIL89h94r09SySFLqzwClWtW9nqi/ohdOsrEqp7bGFmQD4zIcnCieY?= =?us-ascii?Q?z8145tKjKQ+T2cx8ctedAadii5u1lUA=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea02453c-57a6-47dc-c4a2-08da23be7ea7 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2022 17:43:50.3434 (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: LWhmyovDUTI2ZplAd/wVQRCavt0fdTOgcpL4gtqKQm04/S6o9vG1PjD7f/lXkZz91Q9Xl7jXmFSLfDwnA+i1NH4R66B5/f/b+1LqvGet1Fo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3300 X-TUID: 0iaVKsH/MffS I learned yesterday about systemd-repart https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html We should look at this and how mkosi puts/uses it for debian. Not a review, just a generic remark that there might be more powerful and ready to use tools out there. At some point i will play with this and see if it can replace expand-on-first-boot, i bet we will soon hear the first btrfs stories ... and maybe luks. I know people do that with isar and their own funny scripting which can not be found upstream. Am Thu, 21 Apr 2022 19:10:44 +0200 schrieb Jan Kiszka : > 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]*$//')" Please add a wks and switch at least one CI target. In case wic can not generate that dm-verity ... NACK, or provide the wic plugin as well. Henning > if [ "${ROOT_DEV}" = "${BOOT_DEV}" ]; then > echo "Boot device equals root device - no partitioning > found" >&2 exit 1