From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6735324566843817984 X-Received: by 2002:a7b:c844:: with SMTP id c4mr2898785wml.7.1568189954096; Wed, 11 Sep 2019 01:19:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:448a:: with SMTP id j10ls6151545wrq.12.gmail; Wed, 11 Sep 2019 01:19:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxF8Wy99uR+AopuKeYIrVi9ZtDEgM90ZaIJWSC2Ei3JKzhLVwaAKnSKAMhCxa/tgs13crFC X-Received: by 2002:a5d:4481:: with SMTP id j1mr77285wrq.336.1568189953638; Wed, 11 Sep 2019 01:19:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1568189953; cv=pass; d=google.com; s=arc-20160816; b=PnBLnWjgYrA9tDAMNL0CL7aymqdoFr+y4E3Cqy+ujS0CE5vXmPw/g4yMljSKoFpmqC mMDqy5DQI8WyX0ccyeQ/uEVPwxWPrAN8ckb/rPWXxSCKHzLETJXq2cLgyDGAZNIN70+i AVxQdObUo/dnHleaBXw0GhEhcWKUPItz4F3C7MRhZte0nfKVcCyVFzxRqNCxlx/02plb uGdUq1uQZuDxW7wOigvDFzSnckfS64+SEt1ltbtB8Q+HEthRvv9leY6eYbQ9Z4NIQpaQ 6yUfvlaMeb+0XBz4qRR6sKuGN92ZZgxeGr+XZuD4ziAjLI1UinzACoaOgwiRSSIsx3Ii 7BgA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature; bh=qU7oKa5qQ6EOsnpz5kC7msFPAsBKyROhyJeKhT1HeM4=; b=mPPZ57rEuL9FbHV+Y2DZtKGjeebJSWGPOdNNVJfy26PnCVsCBlf5oUx1gcYEMQj5PW h1f+0vgeppwBj8dpessjlluAw8XUsgDAIIN1NIvr9HiFSsrOYYUrcHM7zFO1+rrrS7SG 5BOKGR/nqQycrXo4j8/ym1bvGJeBZPE5N1VdGb051NpmxermmB2kgvq+xCuI9NDFhtJ/ 4qHOasOwULCFWj0ZhdCtbz0v7r5EB/0zXz74ny1OGZmJIk1G7VLFdKyNe/+7m2P8jS51 QBctrKJdc+lEaLAd13P9i2zEXMjn/qrzIoyJn8M/GDqN5fSDO9Ov8SOU2ETRevntcsZm YqXQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector2-siemens-onmicrosoft-com header.b=htn6N9R3; 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 konstantinos.dalamagkidis@siemens.com designates 40.107.8.75 as permitted sender) smtp.mailfrom=konstantinos.dalamagkidis@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80075.outbound.protection.outlook.com. [40.107.8.75]) by gmr-mx.google.com with ESMTPS id s78si75257wme.2.2019.09.11.01.19.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Sep 2019 01:19:13 -0700 (PDT) Received-SPF: pass (google.com: domain of konstantinos.dalamagkidis@siemens.com designates 40.107.8.75 as permitted sender) client-ip=40.107.8.75; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector2-siemens-onmicrosoft-com header.b=htn6N9R3; 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 konstantinos.dalamagkidis@siemens.com designates 40.107.8.75 as permitted sender) smtp.mailfrom=konstantinos.dalamagkidis@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=MY7XgTd3ZTiFEXdeeeJcbwOYcqXDuoEBzDRyexwaxLPMYL6jkVM9xB8WYBmbMH6/J0J7mNsMMtgf07J85JLVpbOjSfVYmfJac6W6XzGIFgkE9CNaORQWrcTx89aGwHOE9DqczHUgibzIG1W4H3QMoE5y8ZkN3DqoD12ECW6fbyVsVLdOx4Q6fcFBvjW+tIn/XBJokKxW216qT183k9cWyDSd0DcZLolcQqX2eM+Dq3rlHqO/du4Z3k8l93OZNgBWHHZLK0UvF0h7ZKkWCs/30TRMR4XVEiOgHKTEFDVaLd6QpqB0IJuQ44SE3sI5X+dC67ybMZcbVkIO2iTHbG1UAA== 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-SenderADCheck; bh=qU7oKa5qQ6EOsnpz5kC7msFPAsBKyROhyJeKhT1HeM4=; b=Nvz8NEJFnpJFaMdacu86mJBbQbvVvko5xmCECQWVNeynwKbLTXCk3fryMLflk96wFnb9fwBE7HGTrwSgtXbzdmLaGPPmYBnO2XKEHwTEbWi9YramPUFSvUUcUkHcbpmES8GBwX2T0dC9pF8RoZvaNifipkh9pqXqXvSrTBIkN0Mb1P/7Uk66dyfWFLaJx7kIV4mEGE1fUh9+8mJ8gwnEYWlexzFJBihjZqRMXpNo+JgxsCiVCn0+S5rn6M1jA+EkAESNxVhYEXXJmsMW2vfPhBvuAwlInJKSy/Cn6tnz5dtv6M16d54d9+PxZ/JGJoaDRJcIXdEOPx6ixKoTMk2Kfg== 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.onmicrosoft.com; s=selector2-siemens-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qU7oKa5qQ6EOsnpz5kC7msFPAsBKyROhyJeKhT1HeM4=; b=htn6N9R3hv/VnSsAEb9G0h4fm1pOFByt0SCXJ0QQAY9lTTFGQEQ8gAyxRgko5ECFpOJh+puumEYGN7d0aBEkMGjZYvHjHxAF8G1UKYhxwDKJQDWQxqBacVida46fZtdD7HLh13P6+cY36WYxrnU5I7Ddik8q1ifB7RqUigmiFtE= Received: from AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM (10.186.174.207) by AM0PR10MB2306.EURPRD10.PROD.OUTLOOK.COM (20.177.110.211) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.14; Wed, 11 Sep 2019 08:19:12 +0000 Received: from AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM ([fe80::c911:ce61:5c9b:268c]) by AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM ([fe80::c911:ce61:5c9b:268c%4]) with mapi id 15.20.2263.015; Wed, 11 Sep 2019 08:19:12 +0000 From: "Dalamagkidis, Konstantinos" To: "isar-users@googlegroups.com" CC: "Dalamagkidis, Konstantinos" Subject: [PATCH] Do not clobber policy-rc.d if it already exists Thread-Topic: [PATCH] Do not clobber policy-rc.d if it already exists Thread-Index: AQHVaHmXAIko6M/fL0Cx7eM5ikH1Sg== Date: Wed, 11 Sep 2019 08:19:12 +0000 Message-ID: <20190911081906.16662-1-konstantinos.dalamagkidis@siemens.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.20.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=konstantinos.dalamagkidis@siemens.com; x-originating-ip: [80.146.228.89] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f3fc0731-f088-4e0f-cbd2-08d73690ba6c x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:AM0PR10MB2306; x-ms-traffictypediagnostic: AM0PR10MB2306:|AM0PR10MB2306: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6790; x-forefront-prvs: 0157DEB61B x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(346002)(366004)(39860400002)(136003)(396003)(376002)(189003)(199004)(6916009)(1076003)(8676002)(6512007)(81156014)(81166006)(53936002)(8936002)(4326008)(25786009)(316002)(2616005)(486006)(478600001)(99286004)(5660300002)(71190400001)(71200400001)(107886003)(14454004)(476003)(50226002)(66946007)(2906002)(66556008)(66476007)(64756008)(2351001)(6506007)(76116006)(102836004)(186003)(66446008)(3846002)(36756003)(6436002)(66066001)(305945005)(6116002)(26005)(14444005)(2501003)(256004)(7736002)(86362001)(6486002)(5640700003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR10MB2306;H:AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: siemens.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 3fL2GBK2QBfXbTmT7Vv+60EGRLESz65PuIo9GmuFl/GLoT+drMzFtQ3LHq9rZikrPosS6kwAE+dNX5JtURaxpcKOdUPCkp+TkNXktgYg7lFOqNijnz3LP6+lUv7hTWQKqxGho6O/lVnBMeFvDxPtlvjQO8Fyvk5pmhMEin9xR0g4r68A0nqME7PPsJYesg4ftQJpv4yYa+3hwOtBeSF7b2cLZ56aFGJVJ8kJKxoKWmsp0MZ8yrcjO4N8oGEXLXRvMmsuknWmZTV565yohjb4n7rjJOfLW8q7qTyz8FNTIbDn0ZiBypSDL1xCqtacHEgjuuYxiUkCP9fbDxlrY3lyvO6i2XPAeXAXgh+3c1niYMXohbkf5cbudeRg3Op+vx8gihNkLo/MTnz5Y66QvMiiOmmsuCL9BVXf6YGgzs4VYB0= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3fc0731-f088-4e0f-cbd2-08d73690ba6c X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2019 08:19:12.6236 (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: VV3lAq0cpKyHrum+xF97uRGcHM9i1/ErIHYYXzMzwOrMMHM6U5hBeHrEK9aKcmCz1VBEy4QRUrWLAnEfWEvqPAwB76HcCcDeJgBNpBEWSRjYOATQufZhZocBQIcvFdRK X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2306 X-TUID: aVA0EuUrEliv We had the problem that our policy-rc.d was removed by the chroot-setup script. This proposed patch uses the mechanism used for the start-stop-daemon. --- meta/recipes-core/isar-bootstrap/files/chroot-setup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/isar-bootstrap/files/chroot-setup.sh b/meta/= recipes-core/isar-bootstrap/files/chroot-setup.sh index f84f63a..4150011 100644 --- a/meta/recipes-core/isar-bootstrap/files/chroot-setup.sh +++ b/meta/recipes-core/isar-bootstrap/files/chroot-setup.sh @@ -78,6 +78,9 @@ chroot_setup() { # Create a policy-rc.d to stop maintainer scripts using invoke-rc.d # from running init scripts. In case of maintainer scripts that do not # use invoke-rc.d, add a dummy start-stop-daemon. + if [ -e "/${TARGET}/sbin/policy-rc.d" ]; then + divert "${TARGET}" /sbin/policy-rc.d + fi cat > "/${TARGET}/usr/sbin/policy-rc.d" <<-EOF #!/bin/sh exit 101 @@ -114,7 +117,7 @@ chroot_cleanup() { =20 check_target "${TARGET}" || return 1 =20 - rm -f "/${TARGET}/usr/sbin/policy-rc.d" + undivert "${TARGET}" /usr/sbin/policy-rc.d undivert "${TARGET}" /sbin/start-stop-daemon if [ -x "/${TARGET}/sbin/initctl.REAL" ]; then undivert "${TARGET}" /sbin/initctl --=20 2.20.1