From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6735324566843817984 X-Received: by 2002:a50:f04e:: with SMTP id u14mr35223811edl.247.1568191396929; Wed, 11 Sep 2019 01:43:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:4a0e:: with SMTP id w14ls4484391eju.1.gmail; Wed, 11 Sep 2019 01:43:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwEwP2d0G9qex3oEZNfaBPHV2vol0ObehHkFWZ9+8LH8pFKN1cGpllsB8jbQotMkb9Ud0WX X-Received: by 2002:a17:906:b254:: with SMTP id ce20mr28813634ejb.129.1568191396483; Wed, 11 Sep 2019 01:43:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1568191396; cv=pass; d=google.com; s=arc-20160816; b=uGPsfRS4r2X4+uUO//IfrGQ9s0JyUPsvPd7qd0IH1YN/0QVyPQ3eqyU7QUu5cLCvlK A8ev+QJTAt5N+kNl9Rm9m1aBU70FBq+zBqMCvq4yyF0I4fWeqctoFqvivnQ2+Tp6tjmO t1j5o4dq2VDPRlSydjKGVc8PFaZcz+ASVvBLB45bTvv//i7MWWsVfbP3vVYEO38iHKBn LaQSRc1cIxwWzd8Hjmyo89ppT1lhQfxDScxpKtGfeF3+9LzUPT5SE7Iee3Pr0H2Kywd3 GY8X09bXt/35mnhLM0UQGr9a6V7+Qykw29HfWq+d4hybilTE4q2cKfeWr8Ne0Z8gfeE/ hYXw== 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=lHhmmK5njgFquhf8+NGtwQPjLwegq7ysBaOpNcNKCO8=; b=RpA0M+IvcLtmb4qiUdvhng0ydGkd4bYNE7/MCxTIZUGpFgGye8j5LOMArwiQtA24vn BQ1XJNeJRd3n0CrRmFrfBJBPTNb8x63hvJUPHj8U3b+XBlA6d7E2v0f/EsDZdLafSWIx SvSKY1SpaVaAZ/fTlsYV1UaPXz4OMzmDYBuTWv+oKRqfGimtNhGEmz4CT6rWUW5iFhjm 5XfzGGHgiOhgkX7RfksaLF1OyPKCK+PhCeEv0Q7zte+Ll/bq9XsrcHHrMs9X8GYM9k2O bwwLE6NQwILblNbzqq1KBU+A8CnnS2ttveTqvI/mNS0uaABrl7JB/anfqu+lcCa9qmE2 Nzrg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector2-siemens-onmicrosoft-com header.b=PrE2NYVD; 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.3.46 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30046.outbound.protection.outlook.com. [40.107.3.46]) by gmr-mx.google.com with ESMTPS id ch16si1480663ejb.1.2019.09.11.01.43.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 01:43:16 -0700 (PDT) Received-SPF: pass (google.com: domain of konstantinos.dalamagkidis@siemens.com designates 40.107.3.46 as permitted sender) client-ip=40.107.3.46; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector2-siemens-onmicrosoft-com header.b=PrE2NYVD; 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.3.46 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=ddNJeJd/DVUl9WJ3J0ZJl+h1oOTU1ga8HME7TJUVG+snIgMCQq7vGq+N43+A9kutuNwYCuP+ch7Wq0NctfktmOXjThkH/KHZ5eRm+qiUPM9gSLvwToH4isjIFr1BhPTv1uMJYVenXo1o3WReC5uOmtQqoqjt1LgMMH+Q1r8oalE6ZOzPNNvj2tcGI6A8ruy00XwIvWekcV2EYKFHwIQTxe73YSvPUA8TJTO1nY3uco1HtB8Xen/SkxK2XYx8+7obmkE7Vo7DZdpvN1tdsvy/p6E9tSQW2R686vr3rnzk51R/0+0jFVVoqPVRys66rZ1No9AxrZRgp4Fbgv8/XKm+hw== 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=lHhmmK5njgFquhf8+NGtwQPjLwegq7ysBaOpNcNKCO8=; b=PT5F8z+Ups2+7mZqh6m2bOA/FdpERUkyzWpfRzIvbd0V3fn6L+G53iRuPRXznEE8HVd9vKk6yWQB4Sn0X08gqZBovA+globEFtYIBw5oiqubHGSOp9ErW13HUXjSwMC9HeTuN/AIuK1KEtKG24k8Aje5xXrCRSIlbHeqIMIpc6dUeFEm3D01d/PuHA0FsY7zSOm+MGb2qjHFPqCW5jk8m9SOoVcDf1K2VHNnjlAMC7Q0amJOwJQ+naHP5EgtJVtnz/iPSaRyAcp921E4EEYKMPEBebG584h9mDhLLYbM9ZoJTly4n5SdzRcUjsz10YK1pzpo5uV0RES9MUuHWiowSw== 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=lHhmmK5njgFquhf8+NGtwQPjLwegq7ysBaOpNcNKCO8=; b=PrE2NYVDUOG7yPDoQVAY2X48QtV8fMg3GBVsV4MzH1hOTx0OsjvAsU+E7GuoJKc1q9e8PeBwy4JXhOzLwvzmmOwho5wXaYgYSt6vw4UwyMQhfxLXZTuIROPsh5lCJk6WYOqIP2xDZrPH/7Mu4KRIw5/CwaAE7yVOFPbyunMCqj8= Received: from AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM (10.186.174.207) by AM0PR10MB2116.EURPRD10.PROD.OUTLOOK.COM (52.134.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.18; Wed, 11 Sep 2019 08:43:15 +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:43:15 +0000 From: "Dalamagkidis, Konstantinos" To: "isar-users@googlegroups.com" CC: "Dalamagkidis, Konstantinos" Subject: [PATCHv2] Do not clobber policy-rc.d if it already exists Thread-Topic: [PATCHv2] Do not clobber policy-rc.d if it already exists Thread-Index: AQHVaHz0fYRTi+0ImEqiH9QxYqK/Tw== Date: Wed, 11 Sep 2019 08:43:15 +0000 Message-ID: <20190911084230.19868-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: 38742179-30de-47ec-8797-08d736941695 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:AM0PR10MB2116; x-ms-traffictypediagnostic: AM0PR10MB2116:|AM0PR10MB2116: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-forefront-prvs: 0157DEB61B x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(39860400002)(346002)(366004)(136003)(396003)(199004)(189003)(102836004)(486006)(2351001)(6436002)(476003)(2616005)(66066001)(25786009)(26005)(478600001)(6506007)(14454004)(6512007)(4326008)(36756003)(86362001)(53936002)(64756008)(66446008)(66946007)(76116006)(14444005)(66556008)(6116002)(66476007)(3846002)(107886003)(71200400001)(6916009)(71190400001)(99286004)(186003)(7736002)(5660300002)(2906002)(256004)(8936002)(6486002)(2501003)(1076003)(81166006)(50226002)(81156014)(316002)(305945005)(8676002)(5640700003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR10MB2116;H:AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX: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: v0Ot1VHnySgU6ZQ5tN4KuBo7to67UL7Ka+ln2VKD5e5C21v5EHM3Z/GAGC7qlWRLqPA2oJjrcm7aIaFgIY0cJL2a56BHOXUSTgWyM22azlO0ggRf77yeBO+zy0Y+UtuDYdNauiYVhpH+KbKztMryRnGT3qUOKQSZaQrqZA2spLXWLpXpahuNTUbfHgUgSe4l0guG1V4ZDcipavEXfqzdPgEpXcdlWHiUNqxB48cP4gm4HelMme3MOJGaywf2EqyGlpEl1AtxHrsS/sWRwfwsjDjEBEzxj2Wkq/sgkrOfPe6JOejCR+cmUDoqcoYMRyOexpAOG/FknpTueTvz5ZTdG6ZTom/ECdYGXqVpR0ajCGNeFFs2ERKjFJZo+u0zoUn7eQzvtShqMu5SpO7wPCCZEkKhpyCjPIebToLjYA7t7/Q= 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: 38742179-30de-47ec-8797-08d736941695 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2019 08:43:15.7081 (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: q56xbGyuET/RKjm5WiQrSuKHRmPtRR14tKjvM6gWGJ4pJHXvrLYOC1OYxUstQ5AgbcwDoQx0bsnIigle/CsxzqHqt4LNXt3OqZb7jVjeo/r5JRGyHIik/Q315Y4i0p8t X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2116 X-TUID: iwO282A5MYvI 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. Signed-off-by: Konstantinos Dalamagkidis --- 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