From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7039983387261534208 X-Received: by 2002:a5d:4568:: with SMTP id a8mr2374225wrc.471.1639742734922; Fri, 17 Dec 2021 04:05:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1c7:: with SMTP id 190ls7331wmb.3.canary-gmail; Fri, 17 Dec 2021 04:05:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjLa8oYR1vRneQuxs4/HzvtgDHlBbFiOnia3gEanxQAfcmvCQAwBUPRy33+FnzFCfTicWb X-Received: by 2002:a05:600c:4f56:: with SMTP id m22mr2395374wmq.107.1639742733977; Fri, 17 Dec 2021 04:05:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639742733; cv=pass; d=google.com; s=arc-20160816; b=VOBjt/An7qyUCZkvp05WK2oe4/CREYoU+7A2O4DB93Pb7zoPXrUVwjUQl6A0Vdbgx8 PApksRUFnXPWi0+zuHPK5Ek0c1a0eXgNWOkTTBz9/85YDTsnHAIzX8OFFPJWQ1793FmE Ry2HmmiCU3Sph9wa1+Q1728fqD4jfVNJJ+Q8Ihwe7rBTUL1YRa3tT6xgSXSQl5shNOMJ 14K3SblgpLCxCvipsWMG0wtjWQmF4O/PTGRo9/qmJDZzqgivEtI9WwEeT40eP4URAGr8 5TPKj4pkRGEeSR1EoadHrPPqK8QhGgHS8Mj03hBljeakfYNm8gxFvGc+pGU0J+AjzA5P TRcA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=vK+Ql9K0tvLIFDggq3jn3WhtR9AcbonN5/caqFPEo2w=; b=nGxABGKnVN6camP3XBOpdZhdkudopDmO6rHWDo6paeCeYsUIxPSYv5Z4yyVYnRCLAA Wwp8Mn2GYHNrS3NSA7lSOh8F1fx5Od8TpSXdHaLHCuH1PBSb68+wYblMJN5jaNvyhtaa ZXYtBCq8O5mW8FC/6OqXBbcyWala9yjOG+FmFVJfSfMjahLirvBe/+jmVtZLWms3WmF0 SHB/MciQZVLN7O7Anpoy31IEyAQq+lmxcZHyM2G660cL9LiLcDcRLaD2LVtZo5xZZQ4H wK8+ILzVZgZsCnZkflBdbhFCxcEkRclmbAxualfqrF8azM1YMLzm4+gMrSo0xhRAGWGM aajw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LAVAZHF6; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::601 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0601.outbound.protection.outlook.com. [2a01:111:f400:fe08::601]) by gmr-mx.google.com with ESMTPS id p11si558393wms.3.2021.12.17.04.05.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Dec 2021 04:05:33 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::601 as permitted sender) client-ip=2a01:111:f400:fe08::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LAVAZHF6; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::601 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=eoyXtoa1buO9HrKv8gG9iFjJ901rt1EIx4QjfMSi8CuGnsBN22Ekd6I/YUhcsjJNF8sS/uqsOyOAvKSayFiG1lXgSQFaVQkJdb+Db92H/35w7gevdUtfsDGh2cCQZT5+zJqDpi66PSNOsvzVEp3jZOPl2cPkZeXxDkolDjwNgRyIlJHqsT8w9vjgrpj3BWcETV2LMkrqL4b/xyRbZJ9s7sqvzeF+Nc+15kg3zFGH8Kzq/kJQ+Eye6CC/CqFRSKEkdENom3dqaCGbX1M1TzdX5TH0kpj4tMS2yhole15dP4D/OZyGVa+EcwzeSwVkY36n68ofnTXbNUhceVLxXlt3JA== 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=vK+Ql9K0tvLIFDggq3jn3WhtR9AcbonN5/caqFPEo2w=; b=g84cIPm+SdeVEnFMwoJQQ36XsSBKWLUmHp2pBZrJAO0AFV3x0nQyNwmN3R6eFvFlZloqtNszED8Ac8GvhRx6rLnELzFKf9B1pW6lVb6WbZz2rF0oabo5tBuyk2avFO/+WGaKsSpMyD8+A7QHWj9MCbqujvnKveJnU8gCa+U/r2r9j+pseiGgOVMjt06867JCXqAF4S/JokYTijsbzmf2VoEStdzAvkx/p6bC96JrlzJ19x+jIing9j8M5rUiUmG+quNK5exnIIl8oBDTiMfSXYZ5F9ucRRtpLzW0FmjhXC2guQJyQ3zpgOXIrAbKucAZs8o/y30bkKt6GB1Ixd16hA== 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=vK+Ql9K0tvLIFDggq3jn3WhtR9AcbonN5/caqFPEo2w=; b=LAVAZHF6SHADv/Cv19Dcx1s7Fq6v9Vk7Z/U5tT6rM0Ab4RB3/40hbYUDJZpMEjvykLHULCERk1yoStymcdpES3LheveBSFooHXT5frXFAhjZuNNpoYnPFVPIVddPbmU7vyy8Kr8+wwcP8kZQTumHWOG6LALYARpY8o3qaluMscHX5OXRcV4bTDuNC8O82+gctCGlIbMhRBhjCnjqUEpoRaur24u7o/CPUEKKao9YTOApcKquBb9zB2AMf6O0Bbi3kGQ5yInGzpgud3ThqtK9jf8fbG7bWRKedHyOxb+NTHeext3BgN0HNvY2wQ//PoHZRTENCmB0JpIL1ftnWumiaw== Received: from AM6PR08CA0008.eurprd08.prod.outlook.com (2603:10a6:20b:b2::20) by HE1PR1001MB1337.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:3:f2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Fri, 17 Dec 2021 12:05:32 +0000 Received: from VE1EUR01FT016.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:b2:cafe::a4) by AM6PR08CA0008.outlook.office365.com (2603:10a6:20b:b2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.15 via Frontend Transport; Fri, 17 Dec 2021 12:05:32 +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; Received: from hybrid.siemens.com (194.138.21.72) by VE1EUR01FT016.mail.protection.outlook.com (10.152.2.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4801.14 via Frontend Transport; Fri, 17 Dec 2021 12:05:32 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.2375.17; Fri, 17 Dec 2021 13:05:31 +0100 Received: from md1za8fc.ad001.siemens.net (167.87.33.86) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 17 Dec 2021 13:05:31 +0100 Date: Fri, 17 Dec 2021 13:05:30 +0100 From: Henning Schild To: Anton Mikanovich CC: Subject: Re: [PATCH 2/2] sudo: Fail on the first error Message-ID: <20211217130530.48268378@md1za8fc.ad001.siemens.net> In-Reply-To: <20211210081054.225747-3-amikan@ilbers.de> References: <20211210081054.225747-1-amikan@ilbers.de> <20211210081054.225747-3-amikan@ilbers.de> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Return-Path: henning.schild@siemens.com X-Originating-IP: [167.87.33.86] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9fa46bb7-3259-4661-c0ce-08d9c1558694 X-MS-TrafficTypeDiagnostic: HE1PR1001MB1337:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:972; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q/+QsNjIYyH4AeiIWkQXjMzdKgvjXNoTvS0ZEKyLzw1AWNAVPc2uUgeYP44Ns6zhs10n2t9nhMSVJExhyZd6WMVGi8E2zd6KZcSWQ9+61SxN5yFpzZdr6/AOeycX7CHONuhteuVqIgj6TBr5laRqgzQ6qfvNPsfiXlmDPO5E34aI/zG2N/RbKVmh7TQ+N3MCGDLZu/MXEHfwjjIvZ4AaibTtPWGvlpBj3Vja4M+939HD+DanxDlcOP9N9uW2PBxi/suU/pqlKVmL7tkZhs99aSlZNfW4BvIp0HpFldSnkp+hcnIEnNajRISMeuhR5ul9hTWMbno+lY4NSw8ZWn7J5hGWbdUBNOlqgAucZTXl0YSWvVmaGxnZeMtXNS5wWVXK9AgrI2Td2HS9guS0h661PuRezl7BP4DIsjWdrD5Jr93R6niW0mmE9P3eoU2wSehlujFH0PNMqYsjJzoIifqkUiAMleMxl/gGAl9OpqKVQZdokVEchqpHa3jTeCGxGCVYMmW5nu+p4iGhIse49G/K0iEBdDe+sPGPSRAV3zsT4HX4I4YnqmmUcNdbQjN6uWG4+KPxVH4j1C/xz6mHiZjLtdxgy+jj5dUV9mezaz+QNrFYX/GTrlt4KCjvMZrKesY59JdPkyFqWeq54gUuIvsWih3vYHPv03ycWRiMm0Nhz/YYBW7D3V1SCwwCyAhoVCAQeisi9OX0K45Js19y62GyGkv3MHHQjzD63R0lazsRtcPBnBqK+mL4unf7jf9X2/GNC7fCjuscFhLaFdY+3XYVj84IpjereEXfhUI0HjvHdTk= 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:(4636009)(46966006)(36840700001)(40470700001)(6916009)(55016003)(83380400001)(356005)(2906002)(7696005)(16526019)(40460700001)(186003)(26005)(508600001)(4326008)(86362001)(956004)(36860700001)(47076005)(70206006)(316002)(9686003)(70586007)(82960400001)(8676002)(8936002)(44832011)(81166007)(336012)(5660300002)(82310400004)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Dec 2021 12:05:32.3287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9fa46bb7-3259-4661-c0ce-08d9c1558694 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: VE1EUR01FT016.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR1001MB1337 X-TUID: 0aiGy/8wZLNg Nice catch. I think we do have several other subshell places that could benefit from that as well. i.e. "sh -c ..." could become "sh -e -c ..." regards, Henning Am Fri, 10 Dec 2021 11:10:54 +0300 schrieb Anton Mikanovich : > The code execution inside sudo section should be stopped on the first > command failure because the next commands can cause incorrect > behavior. > > Signed-off-by: Anton Mikanovich > --- > meta/classes/deb-dl-dir.bbclass | 2 ++ > meta/classes/image-locales-extension.bbclass | 1 + > meta/classes/image.bbclass | 1 + > meta/classes/rootfs.bbclass | 2 ++ > meta/classes/vm-img.bbclass | 1 + > meta/classes/wic-img.bbclass | 1 + > meta/recipes-devtools/buildchroot/buildchroot.inc | 1 + > 7 files changed, 9 insertions(+) > > diff --git a/meta/classes/deb-dl-dir.bbclass > b/meta/classes/deb-dl-dir.bbclass index 29bf45b..ffbff07 100644 > --- a/meta/classes/deb-dl-dir.bbclass > +++ b/meta/classes/deb-dl-dir.bbclass > @@ -22,6 +22,7 @@ is_not_part_of_current_build() { > > debsrc_do_mounts() { > sudo -s < + set -e > mkdir -p "${1}/deb-src" > mountpoint -q "${1}/deb-src" || \ > mount --bind "${DEBSRCDIR}" "${1}/deb-src" > @@ -30,6 +31,7 @@ EOSUDO > > debsrc_undo_mounts() { > sudo -s < + set -e > mkdir -p "${1}/deb-src" > mountpoint -q "${1}/deb-src" && \ > umount -l "${1}/deb-src" > diff --git a/meta/classes/image-locales-extension.bbclass > b/meta/classes/image-locales-extension.bbclass index 0f0d0ca..25af540 > 100644 --- a/meta/classes/image-locales-extension.bbclass > +++ b/meta/classes/image-locales-extension.bbclass > @@ -59,6 +59,7 @@ __EOF__ > > # Install configuration into image: > sudo -E -s <<'EOSUDO' > + set -e > cat '${WORKDIR}/locale.gen' >> '${ROOTFSDIR}/etc/locale.gen' > cat '${WORKDIR}/locale.default' > > '${ROOTFSDIR}/etc/default/locale' cat '${WORKDIR}/locale.nopurge' > > '${ROOTFSDIR}/etc/locale.nopurge' diff --git > a/meta/classes/image.bbclass b/meta/classes/image.bbclass index > 95c14e5..ea49354 100644 --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -189,6 +189,7 @@ addtask deploy before do_build after do_image > > do_rootfs_finalize() { > sudo -s <<'EOSUDO' > + set -e > test -e "${ROOTFSDIR}/chroot-setup.sh" && \ > "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" > rm -f "${ROOTFSDIR}/chroot-setup.sh" > diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass > index e0604e0..6ecb39d 100644 > --- a/meta/classes/rootfs.bbclass > +++ b/meta/classes/rootfs.bbclass > @@ -30,6 +30,7 @@ export LC_ALL = "C" > rootfs_do_mounts[weight] = "3" > rootfs_do_mounts() { > sudo -s <<'EOSUDO' > + set -e > mountpoint -q '${ROOTFSDIR}/dev' || \ > mount --rbind /dev '${ROOTFSDIR}/dev' > mount --make-rslave '${ROOTFSDIR}/dev' > @@ -80,6 +81,7 @@ ROOTFS_CONFIGURE_COMMAND += > "rootfs_configure_isar_apt" rootfs_configure_isar_apt[weight] = "2" > rootfs_configure_isar_apt() { > sudo -s <<'EOSUDO' > + set -e > > mkdir -p '${ROOTFSDIR}/etc/apt/sources.list.d' > echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > > \ diff --git a/meta/classes/vm-img.bbclass > > b/meta/classes/vm-img.bbclass > index b230af2..c75a544 100644 > --- a/meta/classes/vm-img.bbclass > +++ b/meta/classes/vm-img.bbclass > @@ -95,6 +95,7 @@ do_create_ova() { > image_do_mounts > > sudo -Es chroot --userspec=$( id -u ):$( id -g ) > ${BUILDCHROOT_DIR} <<'EOSUDO' > + set -e > export DISK_SIZE_BYTES=$(qemu-img info -f vmdk > "${VIRTUAL_MACHINE_DISK}" \ | gawk 'match($0, /^virtual > size:.*\(([0-9]+) bytes\)/, a) {print a[1]}') export > DISK_UUID=$(uuidgen) diff --git a/meta/classes/wic-img.bbclass > b/meta/classes/wic-img.bbclass index 80ca5f7..7537a27 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -156,6 +156,7 @@ wic_do_mounts() { > buildchroot_do_mounts > sudo -s <<'EOSUDO' > ( flock 9 > + set -e > for dir in ${BBLAYERS} ${STAGING_DIR} ${SCRIPTSDIR} > ${BITBAKEDIR}; do mkdir -p ${BUILDCHROOT_DIR}/$dir > if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; > then diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc > b/meta/recipes-devtools/buildchroot/buildchroot.inc index > 726c7bb..6d9ced0 100644 --- > a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ > b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -44,6 +44,7 @@ > BUILDCHROOT_PREINSTALL_COMMON = " \ > rootfs_do_mounts_append() { > sudo -s <<'EOSUDO' > + set -e > mkdir -p '${BUILDCHROOT_DIR}/downloads' > mountpoint -q '${BUILDCHROOT_DIR}/downloads' || \ > mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads'