From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7101379742667898880 X-Received: by 2002:a17:907:3d01:b0:6e0:c63b:1992 with SMTP id gm1-20020a1709073d0100b006e0c63b1992mr29855022ejc.422.1653481615968; Wed, 25 May 2022 05:26:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:fa10:b0:6fe:bfe2:528b with SMTP id lo16-20020a170906fa1000b006febfe2528bls894038ejb.3.gmail; Wed, 25 May 2022 05:26:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIJ7tZKtTJeqE31/uLmhUpafIUZmaNyoNf0O1p7Wvkh8YOOiMI+KG/mLMvBXeqln3lieCF X-Received: by 2002:a17:907:9605:b0:6f5:c66:7c13 with SMTP id gb5-20020a170907960500b006f50c667c13mr28313143ejc.66.1653481614730; Wed, 25 May 2022 05:26:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1653481614; cv=pass; d=google.com; s=arc-20160816; b=DvJWfPKJZ4UoCV0gxV6tiGyRKSXwPS9D+kcpO5zN+aVzdnjrmNXoSZYjbgeKustwgL IeqwHq1GYr31ySBAHQ+HAwUCFXHermGTBrL7Luw81QQ63g6HK44zHNLvr1nL8/fJeX+F rgAtvX0LgUPjLtfWw19odQtF64yHzvW8ooqBdkxhp+1v1WE1EHJOM5A9usrrbTdosVbV ls12FX7JKuA3iWY3oPAalrYjLN16UVgyFQQmECyaDu7W7xhbMqcgx5lPoghzDXECQIFg 4yrt4u4ebtFY77jVbYBOTDS4jA5t6Xt/KqaWry41RKerQT6x0ZK1z83Md1TyXddB1KMV B3EA== 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=8LaFgCa4gkO5jApigDsKk8+IgG8yxqbYP2u3dzmbKsI=; b=h//qsJLe20WCzd6Kt7a1tToKKclMurXLlI/sgxhQT7xgssMzQrHuF/h3VwGOGNpNs0 ZOgWV4shDQ6XIFTcjJ/AkH6tnPL6f8azo4uoF8oCztyR6bTlTEK9J1XV+hAdQr1yJi2m 9ue3WUMNBxe6FwZUmxtcVUXNM9kyMD9tgMikfOn1eX3oDZd0VfyaZyw2k7LyYNvEko52 JyjlGEVjpwTbcMWMjNYEtMdoMXmMHEy5M4iPv3CApMQ7DUV1EHRd3hsIQxe5Bs5dF9sH wqpNK1kK+AMbS09uJo7znW/zxJaXofWfqSy+I+KJdPhYIHWSvE3BRdhj0mbBVsz7x/Ji WWAw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="XJ4vZ/Mp"; 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:fe0c::600 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-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0600.outbound.protection.outlook.com. [2a01:111:f400:fe0c::600]) by gmr-mx.google.com with ESMTPS id z6-20020a509e06000000b00425adbac75dsi764765ede.2.2022.05.25.05.26.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 May 2022 05:26:54 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0c::600 as permitted sender) client-ip=2a01:111:f400:fe0c::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="XJ4vZ/Mp"; 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:fe0c::600 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=l8JllCATHweN8VgeT0XW86nNH/ZHfJ9Vt1rO+3AolYQX9jWJ7wUGZd6Whk9SVPVWOPqhc+KXzWYZI/Bsv/IktdZJNLPurwj1R0J/azdSdXeGntDAVLaNulaydYQmn2Nv9O0tME1t6PZhzjyMeR7BZ3lDcdahJZ3OLMDee9lzO9mTdPa+AP7YQQImHghVoa49BEaoBGchU+8a+mPo47bHG8pz8lro6n6u6FFoG0HrTn12YKhhjPymlnr8UwvwumxmkCv5BWsl39Ij5Hk2xtvRc3X0SByWpmx/3WGhe5tqoVsTYTOzBgJoSnJv6VI1yXqNL3TCSUssoVWyXP/I8MtxSg== 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=8LaFgCa4gkO5jApigDsKk8+IgG8yxqbYP2u3dzmbKsI=; b=SrP44nDkhw9UbLl2Ed5FGFfPc5eY2YLc15Hpb6Ver/qM8gEdPfA/G5zci7saQ5RkLwhWmYE7XX9kGANnUMxTujWKg5F9xgQTtJKsPOxLcwlTd76+DirfYJSBQgvdJkhkU5pr1yH6T+dzEfZhr2zYdgsD8FN+2/0vVSfbnbs+/N3L3GaFHA/FHsMdrgA4WYa5TDIkXAL755AFrOgdvl9yIhGPlXTnA0Q6MR2Px56UWg1tDVlRPU8j32zMx1bLjnBsSHeQsHFZoxwI4qBx8zYamMKv2oARwqmOgM3lyJy3GHisFE8LIrzjti/InFf6BAfQRqpIX7CmquxGe7nnl9dbfQ== 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=8LaFgCa4gkO5jApigDsKk8+IgG8yxqbYP2u3dzmbKsI=; b=XJ4vZ/Mp9+zdBPj/YToMb/+V/IG7Ti0JeWtAUv1kNArLm7J7ZL+j5kGFEMvC5B8fLpjTLiTV3IKgLe9IN7zNymVqPOzhOapDJ8aoiBBTmnchG0kKY4P8TBb4m/uikk7lm3xJSBC9LAeshdYNlIayKo6RcphHauFpJ4W478+s9D0CrD1mRYkcE2pupPQ9fnUVfuWpyQ//q+6D7iJ8W8NWCSyUdrD5UXgCyolzguNFEss2rArXEuJcDu42egVH+go9TmsVlFoar7phvIpEO8KD7p/uDoFog3nDO2ocqs932qkoVoCoY4wmeuCoJxMGEQ+qoPnnqDoIWshDusDU0ecJ+A== Received: from AM6P193CA0112.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::17) by VI1PR10MB2685.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Wed, 25 May 2022 12:26:53 +0000 Received: from VE1EUR01FT088.eop-EUR01.prod.protection.outlook.com (2603:10a6:209:85:cafe::a5) by AM6P193CA0112.outlook.office365.com (2603:10a6:209:85::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Wed, 25 May 2022 12:26:53 +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 VE1EUR01FT088.mail.protection.outlook.com (10.152.2.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5293.13 via Frontend Transport; Wed, 25 May 2022 12:26:53 +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; Wed, 25 May 2022 14:26:52 +0200 Received: from [139.25.68.37] (139.25.68.37) 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; Wed, 25 May 2022 14:26:50 +0200 Message-ID: Date: Wed, 25 May 2022 14:26:50 +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 v2] expand-on-first-boot: Resolve errors in helper script Content-Language: en-US To: isar-users CC: "Moessbauer, Felix (T CED SES-DE)" , Henning Schild Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-Path: jan.kiszka@siemens.com X-Originating-IP: [139.25.68.37] 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.379700-8.000000 X-TMASE-MatchedRID: 2baFqXa4YPdyvpLVppL3rqY70l+keWg+O9ndheAzkmSLdOs6EBREoeoK 1suvwbq+EI7B2Q/c1V6LzfrZyZWZgOcIgGen+gsN7gBMud2OLS4xFjC2tJC1UwPZZctd3P4BP6T ki+9nU3+3ltgdOztD8A13bv/YY/bO6dktb9FJwMuMqybMD87ynJcFdomgH0lnOX/V8P8ail2cIZ LVZAQa0FQwtQm7iV5jKrauXd3MZDWUeK0fD/v8dr63RdMBZmXggODxk12LIq3r/B48QzfQeXCd8 KIrExkgwL6SxPpr1/I= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.379700-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 06F42D27145D8479B71C59E1FE53F2948552721FB6242481470FE1FB7A4C26442000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a3083ae-cb10-4df7-da22-08da3e49d9ac X-MS-TrafficTypeDiagnostic: VI1PR10MB2685: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: pgAy010uSJEHnkKLDWcrIB9QA2/DnunkS9JH0uCbJJI26UAicGUZ+UGlePfR+RlKMWFD+WyIo8pRS5K33ktw36q3Ie+boyymONyu+eiOiIxKV87lSZdtS/TH/ALXOjFmJynn3tjHLiN+UHQsDhdRGgySlnLNIflUOscPKexAnE337Uq1c/JqZrP/ki5lRXUl02G5NjAWlxw50sdMZsJeeFKSvAJdMF3DnmUnvIIX+EZu6aBtZnCc4pwEUrdmadnmyps/vQ5rJoiC9nTMbh8EO+zK35HXZ3PWDB/6JAWpmbi42vjdxolcYWRArctol+5uNjTdkUw+WfYtcHMiW+uxfBz2Qeu6wL9VkgIpdJ8u3D1ncDeeXtmN3JOhAeykYvZF4XiMOo1wHS/UQnEPK6OoG2pYRn+ho3orIf1TfvGjNbWBYjGjn4darpZpW3MwyM86BCunSX9tue8EhMi/otq9VoYZsaU2FXVu9XNZd70mHvgSLo2vAc5wRVEbrFrfm7Jjnnt4dDs6mz4orRgasbwwxdUfO4C9oXbOakzJVvAxqaX4UA+hmQSLBTrA0gIefemJOuEvajdJsRYGpn1MsxmLb6UVTQziKv5n1bKLjhozFP4Qwf8PBu73nuDl5vRZZdY7dneL8fgYa2acQtCCAw8GZHaf78347SodH9MRZ+3qsbLl92jxN3DpCsWEzD0b50qsEZNv504bwp7LxiILkkhGiqJS4aCH8XGpLe+P396tKKooqRAN5rBUcrbxxkJU4/STeCCnksfViqF0YOZFgZK8cA== 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)(46966006)(40470700004)(16576012)(40460700003)(316002)(508600001)(956004)(107886003)(54906003)(6916009)(8936002)(186003)(83380400001)(2906002)(5660300002)(6706004)(44832011)(336012)(36860700001)(82310400005)(86362001)(4326008)(16526019)(2616005)(70586007)(82960400001)(31696002)(70206006)(47076005)(26005)(81166007)(8676002)(36756003)(31686004)(356005)(3940600001)(43740500002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 12:26:53.1240 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a3083ae-cb10-4df7-da22-08da3e49d9ac 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: VE1EUR01FT088.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2685 X-TUID: o4xlmOtHnFFY From: Jan Kiszka Missing quotes broke the -n test, and as we are at it, also resolve the shellcheck warnings and consolidate over 'find' for retrieving ROOT_DEV_SLAVE. 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..f3e29a1c 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 -mindepth 1 -print -quit 2>/dev/null) +if [ -n "${ROOT_DEV_SLAVE}" ]; then ROOT_DEV=/dev/${ROOT_DEV_SLAVE##*/} fi -- 2.35.3