From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6636661668945330176 X-Received: by 2002:a1c:9cc2:: with SMTP id f185mr964930wme.10.1546874390753; Mon, 07 Jan 2019 07:19:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:afca:: with SMTP id y10ls161102wrd.4.gmail; Mon, 07 Jan 2019 07:19:50 -0800 (PST) X-Google-Smtp-Source: ALg8bN77HJqglrI/GrPVdo3QHV8R+0keikflelmdOoudxWTiAif56wozR+ymknLYJpbJyRrOZJNQ X-Received: by 2002:a5d:64ca:: with SMTP id y10mr3072515wrv.28.1546874390300; Mon, 07 Jan 2019 07:19:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546874390; cv=none; d=google.com; s=arc-20160816; b=H0u5pZ81KxAYgCo/qlOJD+565fzp1WofIuCPyf/1hIbdeoLBmpNGNyWI7gv+WiGxH6 rnsQGa9M9WFBU1P8FMpw94KCg0zZVYRc1CRORt9IdzbxZsuQxkjldL/yspYxFmguBAbi 127nCXZMXk7Eqyb1bS9mOXG/RmUv4f6eX/ExCoee9IcA+2XgHm4LqwWrFGi7XQUSOBOf b8lIwc4ZEgTGUrBMsIgemeT0lB1tLnkpkgjARes82iaeLDlnQFaqxWtD+rj8B3SuaYns yoCEKNc9p0i8O9Hws/78x7X9x7r4ffwnDdmQ+mFjJGDHVSeF72rFrKDIN6MEB7s54H9l ud4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:references:to:from:subject; bh=+au1H37j4u+sfGjDjitnCju4+PnD05ogkJhpJXE48ro=; b=hI156ZsGRN9XwnTqR2yhFiKaJuI6+ZANCdhYObGfVFUMqZyM7hXnSRee+OJQ8RVVxL EQxCRUeTkZ2ASblrsRXGCa0sNuWvoA0Qm23zqyIn1+Vv8YvxjksTmR7eIjofp00HSbZm epal9PuIMsrEFsjwRhp048eU7iD/PeJl7xhaneamDZjMPV8J8oOpkgHwUVtJSbNI6mEg g9LmxZvvFoomjHjPIvG4vayev1RlPHELKeo/8kvv/eVJkP+JvLSbEm7m4TSFxlzuXXq7 B9Zj0tekVLfZmf2gWIH/gSc5+xMTIufP8tw29868/30yy73oJSgFulPLY5h/IDhwAbjf COYw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id d6si2576985wro.4.2019.01.07.07.19.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 07:19:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of mosipov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.50.180] (nat-ppp-217.71.235.199-satnet-spb.ru [217.71.235.199] (may be forged)) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id x07FJl4i008811 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Mon, 7 Jan 2019 16:19:49 +0100 Subject: Re: [PATCH] classes/isar-image: Collapse multiple sudo's From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com References: <20181219111638.22173-1-mosipov@ilbers.de> Organization: ilbers GmbH Message-ID: Date: Mon, 7 Jan 2019 18:19:42 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20181219111638.22173-1-mosipov@ilbers.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: CF5esc0a28pm On 12/19/18 2:16 PM, Maxim Yu. Osipov wrote: > Suggested-by: Jan Kiszka > Signed-off-by: Maxim Yu. Osipov Applied to the 'next'. > --- > meta/classes/isar-image.bbclass | 40 +++++++++++++++++++++------------------- > 1 file changed, 21 insertions(+), 19 deletions(-) > > diff --git a/meta/classes/isar-image.bbclass b/meta/classes/isar-image.bbclass > index 4992800..754e896 100644 > --- a/meta/classes/isar-image.bbclass > +++ b/meta/classes/isar-image.bbclass > @@ -53,26 +53,28 @@ isar_image_conf_rootfs() { > > isar_image_cleanup() { > # Cleanup > - sudo rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list" > - test ! -e "${IMAGE_ROOTFS}/usr/share/doc/qemu-user-static" && \ > - sudo find "${IMAGE_ROOTFS}/usr/bin" \ > - -maxdepth 1 -name 'qemu-*-static' -type f -delete > - sudo umount -l ${IMAGE_ROOTFS}/isar-apt > - sudo rmdir ${IMAGE_ROOTFS}/isar-apt > - sudo umount -l ${IMAGE_ROOTFS}/dev > - sudo umount -l ${IMAGE_ROOTFS}/proc > - sudo umount -l ${IMAGE_ROOTFS}/sys > - sudo rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" > - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > - sudo umount -l ${IMAGE_ROOTFS}/base-apt > - sudo rmdir ${IMAGE_ROOTFS}/base-apt > - # Replace the local apt we bootstrapped with the > - # APT sources initially defined in DISTRO_APT_SOURCES > - sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list" > - sudo mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \ > + sudo sh -c ' \ > + rm "${IMAGE_ROOTFS}/etc/apt/sources.list.d/isar-apt.list" > + test ! -e "${IMAGE_ROOTFS}/usr/share/doc/qemu-user-static" && \ > + find "${IMAGE_ROOTFS}/usr/bin" \ > + -maxdepth 1 -name 'qemu-*-static' -type f -delete > + umount -l ${IMAGE_ROOTFS}/isar-apt > + rmdir ${IMAGE_ROOTFS}/isar-apt > + umount -l ${IMAGE_ROOTFS}/dev > + umount -l ${IMAGE_ROOTFS}/proc > + umount -l ${IMAGE_ROOTFS}/sys > + rm -f "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" > + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > + umount -l ${IMAGE_ROOTFS}/base-apt > + rmdir ${IMAGE_ROOTFS}/base-apt > + # Replace the local apt we bootstrapped with the > + # APT sources initially defined in DISTRO_APT_SOURCES > + rm -f "${IMAGE_ROOTFS}/etc/apt/sources.list.d/base-apt.list" > + mv "${IMAGE_ROOTFS}/etc/apt/sources-list" \ > "${IMAGE_ROOTFS}/etc/apt/sources.list.d/bootstrap.list" > - fi > - sudo rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list" > + fi > + rm -f "${IMAGE_ROOTFS}/etc/apt/sources-list" > + ' > } > > do_rootfs() { > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov