From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7107445708784926720 X-Received: by 2002:a05:600c:2105:b0:39c:37d0:6f5e with SMTP id u5-20020a05600c210500b0039c37d06f5emr6809887wml.44.1654838064894; Thu, 09 Jun 2022 22:14:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3d8c:b0:39c:5b80:3b5c with SMTP id bi12-20020a05600c3d8c00b0039c5b803b5cls1703441wmb.2.gmail; Thu, 09 Jun 2022 22:14:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzab9krF/39OqkYj0zsfBV3VzwVJrojSogoUZAd4heQS0TBfXz5FeKEd82Z4hfM1NNcI1DF X-Received: by 2002:a05:600c:19c9:b0:39c:72fc:9530 with SMTP id u9-20020a05600c19c900b0039c72fc9530mr5012459wmq.88.1654838063683; Thu, 09 Jun 2022 22:14:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654838063; cv=pass; d=google.com; s=arc-20160816; b=cQZvIlZdpVzqpuhVLjijXyGLCDJ8B/7uFVfaBoR1P2b5KlsBxhtyj7gDzTIyGJHTGw jdEIgisrTytGVNqEb5x1PKXr/oUCIYIB/9xdjwBP2Ku3ThcyBFMswEZgxEB2o9D84rYf dPesWrCPsYY6vnCSNNhXm5xLyUozM52hC7fjufHULphG70UJ12bcs0Ijygtj9rOulVQd jywRC5OubOcoylkdWQrEFN6GIN62Gmcza6dgG5+/NOwwXyAhz9vyZyAVBwJMw4waQllp 97lfEq4+6m+KdnsyoPDdJT6iovSvN95i2iLrfq7NW0h3EJA60ouLoohDnlkFk8sl5Gus XrDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :dkim-signature; bh=qIPCDv2kb7lf+9KUjmY+DnpwFTCTvnxplMAKB+gHR5s=; b=o7q7gjM7118eSuWAplE2aBWDAedD0LOOCkfj+qhxRBKJv8828pmUAdpJXE/1TaytPI lrxgPVNL9vEcY5N6zSd/+cHz3JOXD1CAqSh3GNAAAsZpR91GwD9Jfr4D9tgDYK2s8w96 HpABEEE31qsK1zyJZe23YssVZeGM5xFrBJ3z+mqKqjHsabZV/Rx/uhIAFNYYmvO+DifB QBh1neOOTsc3qyU7/Ugy/nvk9IDsNm3OaJLYfRzBaDnVvZ/yk4IPMsTf3lYpLPpgm5ed zt9VKfNBIhNCH+YcgqJxILa7Zw0v0I0Q7vHI52xo/1VKuDbdyD6KA78kiUSpYIbRA+eL wiXw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pYtjbjge; 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:fe08::625 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0625.outbound.protection.outlook.com. [2a01:111:f400:fe08::625]) by gmr-mx.google.com with ESMTPS id n35-20020a05600c502300b00394803e5756si51280wmr.0.2022.06.09.22.14.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Jun 2022 22:14:23 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe08::625 as permitted sender) client-ip=2a01:111:f400:fe08::625; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pYtjbjge; 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:fe08::625 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=HLBnCIeEaxSXZ1DUdRALT1C4ItBrLNMCNrd8q39fqnUDLOz8oQNLp0Ywrb1FV9i3GCMVTa84fZGqYlXYGawuiAsBhZ1WvceeetX5lhKxHdJWfPRbZ4kBPlLTv+qo/Z5SLdhTNV0vkpyd/8urbLBZ2bGOv1MBaViwILXpV9VoeeocBj6ItLOSf90FJWFc8M69IKwqwi6oKKANOvbmzJ7UQrRo7PaiHiw/zeuX70PtPgsWtNRpBgzE9PDgShKh0Zjejte/XVU6EyFU4JH/7rCo+Ciw0wdN9UwOhvfFi4swjqwHLSM4EoGwaazIrE8NkLFJdYFRWBV//Y5NF76ogozN4Q== 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=qIPCDv2kb7lf+9KUjmY+DnpwFTCTvnxplMAKB+gHR5s=; b=BgO6Ba4mc1fS0WRvO5AJfHib7y7R00yFbK0xBbHNI8c/PMxzhXieIkJlFkg6e6CWUB6LlJZ+aw/QBSp3o4ay7G/xBxjkjOsoI6K9MfIIsgxGClICjrZKNezI4pjdEy7ajE1VLlFwplJYS6fLaJkBFtbHCWyAr3y9+EymV94M/sMVjg7XKZK6nJlBWA5xn4cLbglolD0/IMUMG6NrvqcWdtTw9pXsRDVe7iacC0qIVzuV2QxMa00iaJkyTs5EcEr2wWGl7mGsvY5WuDifVJvkZQSm96Lc/UC6/bGqr7U1m2la8GJ/Tqwd5v5TfGVSIYAXEvlSEDoFaIeKaVuiqyvFhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=ilbers.de 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=qIPCDv2kb7lf+9KUjmY+DnpwFTCTvnxplMAKB+gHR5s=; b=pYtjbjge2JHdLqGMWyVy5jlZ6Hu3kLv3Kwhmm0z4hpGjoALcW+BZB53SEzJn9Rrlm7Gvsa867QgEul+l8cDs33/4+DBxb85ApyHWEOhK6ltEQ8VzJAOMjs+LCbaraOU/gsVs/Vq3L8lK6GUjGMtM4mjBR/DYNJJa9J8TXjCHSqMzjvtGVQpr9FnwthoAL3FVmAwsCSJM+AwMGOMq2B1jvP4JAyc11XefrQb/7vXIiYfhm57Zsc1KpH836kFKctXMFsFVGRYpE6FktWPE5DJXuR22X6sk+5c2OGS+0Sx5ydDfAX6Fg0RVUEhKAHRrfzJ3qEw7YJr3fS/zPbzgQYdBjA== Received: from AS8PR04CA0083.eurprd04.prod.outlook.com (2603:10a6:20b:313::28) by VI1PR10MB2205.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:88::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.15; Fri, 10 Jun 2022 05:14:22 +0000 Received: from VE1EUR01FT072.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:313:cafe::1a) by AS8PR04CA0083.outlook.office365.com (2603:10a6:20b:313::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.14 via Frontend Transport; Fri, 10 Jun 2022 05:14:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) 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.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.72) by VE1EUR01FT072.mail.protection.outlook.com (10.152.3.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12 via Frontend Transport; Fri, 10 Jun 2022 05:14:21 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Fri, 10 Jun 2022 07:14:21 +0200 Received: from [139.22.143.62] (139.22.143.62) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.24; Fri, 10 Jun 2022 07:14:20 +0200 Message-ID: <3e329667-190f-0021-0b98-4b82b065e0b6@siemens.com> Date: Fri, 10 Jun 2022 07:14:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH] expand-on-first-boot: Fix early exit in helper script Content-Language: en-US To: Uladzimir Bely , References: <20220610031915.25529-1-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20220610031915.25529-1-ubely@ilbers.de> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.22.143.62] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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--13.676100-8.000000 X-TMASE-MatchedRID: 8xNMUprDHafrOhfRe676RwJfVW3wuXXEPg9yfk4YC0YdZEkR8Y/meVWt 71aOqpDDt5bYHTs7Q/Cczr80gOpNK2nZ6pt6zaNozNny9LCRSYMKPiR+tsTJ1pxVZzZr7+O7ljg w/8s6b3cLBZEuqIL9SoXsusYf0YZ8cbBL8t9JdCIyrrmh/vL+UYYCBZzro74fse5htcvwW7MB4J HtiamkLJQBR+Vr4iFospdaYS9obcSXLJHjo+8i07ao0Zou4ee+TX7PJ/OU3vKDGx/OQ1GV8t8dW DYdvqmp1GcRAJRT6POOhzOa6g8KraB98XdQ18B8w12HaQAjljBntJvc2BNEQoIzb9YRYfK6ZXfg GLlR7YI= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--13.676100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 81C775A5EB112858BC85D3E39035EE91D3E57E56675186274EA2DE2CF5AE93092000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab9117f7-ffe2-4d3a-6aa9-08da4aa01400 X-MS-TrafficTypeDiagnostic: VI1PR10MB2205: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: GmeAiimVyuEfnjCZKDWTTqvV0EmiDIxlMMgbrbs2AQQF+1boMT4XrgtEXe4lbc6TdXCiBEROkPZttbK7ZDa6PrSWCjTDjsSbXKlGZePi1MKq5VNE03G6Z9s+zS059niFZb8YYOxJ9X8hOM6B18pgK+ktprCNC1hI8983ZnZBMoRbKDYJEcdOD4Ky5pNtG5EXg+ZjJFS5Txq/M0+B8LhDiJbXjgljpQMTx//zpxQb2b4cKiHcLWx3PIAQVvJ0ngiO1TX5CMqZfZQxG4YJHRbySc+ZHeA8c0D3eIxY/1TiEfXP0xuX+I+qB3pguhZvPDVQcoa6EeaDZGSwpPPo82Lp4n4zeS3AMPdMQdA72ZY1T0AJWZ7lDyFlE744EB+dpv3ZTT64mKbezbr81qK65NqwcFxFWplXa6k7npyS0TMLipoienZYzmqKPRbMr5jzWOvs1jKCXtEfSFKb2iVUvLzUHMRcYb1A6Kf7/C+EJpi2KqoiXaOLwcchj73GnsKHL6idx9uP6in97VUwCP/DE4Udii0f+d16Cl3DlM4RbShCXwlwxANYBgzAY+mLpB+f6SX6S9vBUd1j0y5W7EOusw81T4gVGoo/3MHIpP1JzgW42KuRT24IeTrEquKCzLxw87asHCPJWQWOjBuTHcEmrUbzyqpEaSQm28Gf6YyPSv0k1tvvll7bS12Y9ZgEomGniHPiUz/Cc9VawvmRRNvTIm+V4h3ZI3vCyjZhSf8eQiF+uWJkCX1oIgzZgT1/G1AYJCALzD5acRpyQYCNkbbvH+l2sw== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(36860700001)(2616005)(26005)(44832011)(336012)(8676002)(110136005)(956004)(86362001)(6706004)(36756003)(31696002)(31686004)(82310400005)(5660300002)(70206006)(70586007)(47076005)(16576012)(2906002)(40460700003)(316002)(83380400001)(82960400001)(508600001)(8936002)(356005)(186003)(16526019)(53546011)(81166007)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2022 05:14:21.6621 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ab9117f7-ffe2-4d3a-6aa9-08da4aa01400 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.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT072.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2205 X-TUID: xOut6jPdKIY0 On 10.06.22 05:19, Uladzimir Bely wrote: > Changes in 342a751e introduced a regression when error from 'find' > makes helper script early exit (with -1 error code) just after an > attempt to assign ROOT_DEV_SLAVE variable. So, the last partition > remained not resized. > > Passing 'find' output to 'head -1' masks possible error from 'find' > without breaking the logic and continues the script execution. > > Signed-off-by: Uladzimir Bely > --- > .../expand-on-first-boot/files/expand-last-partition.sh | 2 +- > 1 file changed, 1 insertion(+), 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 f3e29a1c..934a014f 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 > @@ -11,7 +11,7 @@ set -e > > ROOT_DEV="$(findmnt / -o source -n)" > ROOT_DEV_NAME=${ROOT_DEV##*/} > -ROOT_DEV_SLAVE=$(find /sys/block/"${ROOT_DEV_NAME}"/slaves -mindepth 1 -print -quit 2>/dev/null) > +ROOT_DEV_SLAVE=$(find /sys/block/"${ROOT_DEV_NAME}"/slaves -mindepth 1 -print -quit 2>/dev/null | head -1) > if [ -n "${ROOT_DEV_SLAVE}" ]; then > ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/} > fi "-quit" is supposed to obsolete "head -1". Feel free to prove me wrong, but that was the reason for dropping it. Jan -- Siemens AG, Technology Competence Center Embedded Linux