From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7101379742667898880 X-Received: by 2002:a05:6512:130a:b0:478:811c:6d21 with SMTP id x10-20020a056512130a00b00478811c6d21mr5263511lfu.138.1653418816167; Tue, 24 May 2022 12:00:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls1397636lfb.1.gmail; Tue, 24 May 2022 12:00:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfEINbGNbRzCPV45S6HTIIQ776ZQTRRjhx0pefDGde9RLcyEsTl8g/tGoHROfNIEfqjCvF X-Received: by 2002:a19:8c52:0:b0:477:b904:3fe2 with SMTP id i18-20020a198c52000000b00477b9043fe2mr20165253lfj.493.1653418814566; Tue, 24 May 2022 12:00:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653418814; cv=pass; d=google.com; s=arc-20160816; b=Vk4uvLjD3HIErgQElnncDUD/ac7bztaTr1rI6fQENh6kPY7oGKP3zvLHy/JKtDhLGH NqV+EQ+DffNuPBpqiJvH5twr2AL4TuDJUhpArphfiHS64632zt38o+uaKlNP/OmjVTKt 94dce2MBW3TlYEBFyxJNbBOwS5lHa8VUEYm/JCDiBLdICBzUT6oBPGqgIMU3A21QRWmd WF4lIO3ePHT9HcpEUFA89454OrkXq7f51oxug4nlASwgpPOMhAen7SRkcdEyq8JYER07 fy7limbnFmFLJO8R3QzN56VBJqfQdnyGWBZhlQRm7rI/3OxKpI2YYcVnyJOTVeZELrhm DgAg== 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=c6WbOpeGcm3OfWfuIvTziu/txjevXRtrrBZk4jkNOPk=; b=a6ZHYJKCzq5JuAx236gjsWrFIn0gNI4/iLBhwXpyeduZf8xNPvT+cDMSa5eojz7cmP YXTHCggDrMOo+hrJ5vkQvLFfTnipD2aywwNDwNFqAVPA9SGK064mepRXB0FFYQBEkf4R NBdx2IGcQWnljqsvfMHjEa9tZfbM0ebcgq1/llOjRuRTf0UwJLa1T+6ug9PO+jhxCdk5 xd8nI2CF4dQOzgI2LnSfBxdv8YRNO7giE7kXbdzpDcJ5/S4BsN3CJoHJuQkuZJAUjuMb VovMPaqgM9iIQqh/eHRZxvn2atVc6a14vnavazk5ln95P1jH0IxRSDYd/CchzrZRztWm tfvg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ekKC70R8; 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:7d00::61a 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 EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2061a.outbound.protection.outlook.com. [2a01:111:f400:7d00::61a]) by gmr-mx.google.com with ESMTPS id a10-20020a2e88ca000000b0024eee872899si524976ljk.0.2022.05.24.12.00.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2022 12:00:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7d00::61a as permitted sender) client-ip=2a01:111:f400:7d00::61a; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ekKC70R8; 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:7d00::61a 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=Ycj5BPd2AJKmKS/ufD4eYYgbeyvI8zw8R3FEuWUqbd4oFCN4KVKbiiiMaJIYfDaweCkoyj1UvQ8BMMqTki+FJoVhBdEVtxbCc/x3U4k/7dEPGlWzzxPWmnJrrgMsIuRxUO8qK8ndxM1JhDbMCSS9Dw5r7necqWD1k3Yes66MHbyPRUUNx8EA80QCAUNiuZArsAVgSHAVfgvE136sb5RB1WzCbUZwJwd3CWX7L6Q2UWaTzuKoCB5IO6Wde3mo1zWXWr0E+AGQepng89DKz7ILL41CQv/H0tmgqCoZK61rUyMzJgvir6PAeIfnglqzkdzl3GZHpOUmRLoderWhwJRKqw== 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=c6WbOpeGcm3OfWfuIvTziu/txjevXRtrrBZk4jkNOPk=; b=VjXn3du1rEUd74GJnCLAzRvWwaX3RF030ChURS/qkksi+0S8wVCJJWOROfbLuvcFqnZN6goqJ7rCi7ZGHhfgBOQdmHj0UJ6fQpkZY6p3rElrxV06vuwonaZlDhp/3evL4yMeR2u3hejnQ9AWqmzopz3xUD4XBGtqansBxJHuessLZJEek+a7NcJvLucNMkwZzNfSurx3P+GAwq30dyur0jvaVv1fJrfFnA//C2Ahwp0vlhUF2TyWWox0Mq9tTIobje58v+X/AzrTP7UvkYJ5wWC+0g0M3lg5/3/WVMJnUMNcgE7Yj5bLzl5E6N8UMw2dVg7ZJ+OVWkiq8xHaAHOZDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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=c6WbOpeGcm3OfWfuIvTziu/txjevXRtrrBZk4jkNOPk=; b=ekKC70R8ecABHUxnTZFRhlwyBdpXJsSWXRky2hOCnQqH+RXytWb9LiZQuxo4qPwEyeEicF8/xG1UusbBVZl75fRXy3lFyxM4P1o0mT9OHSy+4uUbQLp4zOoiN9DrzA9HctaQXN18KMmp32UyLcIpCRh8tIfwrlB6hTw6+G3xZZLOIiUKdaC9xIoPqw3Eic6U8w7VkpAnCeY685qbugY9tmpQXiznwnkD10tYWuT6g8ycZVwFr7FBytXqbDjOfsZ/cWNkT2rAKwRk+Tz/tKNClxRs00507U276XX43HeFso6Qy5qJh2MpanTgJ93Q9ZWoVfKAH+AES4U4ZDj4GT09Zg== Received: from DB7PR05CA0044.eurprd05.prod.outlook.com (2603:10a6:10:2e::21) by PA4PR10MB5564.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:261::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Tue, 24 May 2022 19:00:12 +0000 Received: from DB5EUR01FT093.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:2e:cafe::ec) by DB7PR05CA0044.outlook.office365.com (2603:10a6:10:2e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.23 via Frontend Transport; Tue, 24 May 2022 19:00:12 +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 DB5EUR01FT093.mail.protection.outlook.com (10.152.4.174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Tue, 24 May 2022 19:00:12 +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_128_GCM_SHA256) id 15.1.2507.9; Tue, 24 May 2022 21:00:04 +0200 Received: from [139.21.17.240] (139.21.17.240) 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; Tue, 24 May 2022 21:00:04 +0200 Message-ID: <644a0a94-5128-556f-ee7b-c644c46a8db5@siemens.com> Date: Tue, 24 May 2022 21:00:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 From: Jan Kiszka Subject: [PATCH] expand-on-first-boot: Resolve errors in helper script Content-Language: en-US To: isar-users CC: "Moessbauer, Felix (T CED SES-DE)" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.21.17.240] 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--9.119200-8.000000 X-TMASE-MatchedRID: urT8+OGxW/tyvpLVppL3rqY70l+keWg+O9ndheAzkmSLdOs6EBREoSYo f8qPjr5VgU38wRbnPPIS5LnfGo4vrdn4U3v43E9+d2llOY3WOtitIop/D9Co1V0u3AdA7qLm2gp +A6golza2ZO4LLn5VSlLOmf+Nx32acbBL8t9JdCJKMuVi6C1rCk1+zyfzlN7ygxsfzkNRlfJlVd RvgpNpe/oLR4+zsDTtz6Z2NvWLo/BDLNK6CmkkRuA3DxMGYR4PQ/ajjyJKHG6ur+XzpDfXCVZca 9RSYo/b X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.119200-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 55820AF953C6C5898304952DA48AE15343A7ABC871782AE6C1568E21534CCD872000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 094e7cb6-4a68-4e63-ee93-08da3db7a17a X-MS-TrafficTypeDiagnostic: PA4PR10MB5564: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: z6uIN2VTlUWlU4rpb82yvoNuN8sUPNCU+vf4jOJ89vDkKFVGq4HD7yTxHWcEhaaCrB2JnsSfMu92KD91kid+TNY9wyVqjVLJkr1nE67EJMAMBi/1iAYt2BkUAD10O5Zw4DB+XXya+hhXDVqpLBL4ICqs+dY3/RTDbCz4LTouFT/kW8jso+zzctHD/sFtTIyvGYNPYrxlfWgU/NPcKfFz5lEUVFlbaYbQfq0ySTURS9GhXMPvUQdiVgTJBvYJLmu6AVpuTELDHlgdKqRHXBN9TrQDb9wGIAhqWjlHIuK7DL7vdAMTAqhyvHPV8Cl1os9HD8vDoBr0tY7dCcG19IBrb/4RlmS/wkG9CyNN4mvufPZ3LN9T6G9EtXZ0NqXJ8B8RQoDIvtV8bHglOgrgTpoK9OapHOWw7x6uAnCjDTtJn/cg4bVUrjDrglAoTDh1RXI5TzrbLj4FspR+TSNC5vXE7hZurTLSZny96oIstUErqime3n67VcIcKn+cF7hQz/GXbXymNrVRp5oEFe352WWZMv0AQ3JWq7d9J6ryYqSxF2I65NEvHCd+0NJ0/WV4eS2uDMMSQ3zRzECYphkRHj/naBrDJMcVEZMh1U735tuLTOpKiy31mx6aIP8fqRufBbJT/v4jtD9BVIeQ1/OEjGKgpytvk/SZ25eAXVCz7qfOifP0HTUhZ75a7YtZuExd0o51b5LvtrcZ+AZZ8WAhC7geByb1BERBSvE9JpXETwgxyIpTNLo9Gil1SzOlt2Lp0tIFKQpB4H99BCrfAzaZoRZr0A== 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)(46966006)(40470700004)(36840700001)(16576012)(508600001)(81166007)(82960400001)(2906002)(40460700003)(70586007)(6916009)(356005)(6706004)(8676002)(4326008)(70206006)(44832011)(82310400005)(86362001)(316002)(31696002)(83380400001)(186003)(36756003)(336012)(36860700001)(47076005)(956004)(2616005)(16526019)(26005)(8936002)(107886003)(5660300002)(31686004)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2022 19:00:12.2906 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 094e7cb6-4a68-4e63-ee93-08da3db7a17a 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: DB5EUR01FT093.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB5564 X-TUID: 51Rdvb5DNhOI From: Jan Kiszka Missing quotes broke the -n test, and as we are at it, also resolve the shellcheck warnings. Fixes: 15214487e19e ("expand-on-first-boot: Add support for devicemapper") Reported-by: Felix Moessbauer Signed-off-by: Jan Kiszka --- .../expand-on-first-boot/files/expand-last-partition.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 bb371e9f..8a8b7c98 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,8 +11,8 @@ set -e ROOT_DEV="$(findmnt / -o source -n)" 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_SLAVE=$(find /sys/block/"${ROOT_DEV_NAME}"/slaves/* 2>/dev/null | head -1) +if [ -n "${ROOT_DEV_SLAVE}" ]; then ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/} fi -- 2.35.3