From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6636661668945330176 X-Received: by 2002:ac2:42d0:: with SMTP id n16mr1653838lfl.5.1545218208695; Wed, 19 Dec 2018 03:16:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:42c5:: with SMTP id h66-v6ls2437017ljf.7.gmail; Wed, 19 Dec 2018 03:16:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/UsKI/xaJgRO0ciR93Bw1IRkkTXdch0Yr8XuzdqqUFvfHXZC86uHiBeEhi/kv6pEsMpdLpY X-Received: by 2002:a2e:90c8:: with SMTP id o8-v6mr1692889ljg.24.1545218208144; Wed, 19 Dec 2018 03:16:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545218208; cv=none; d=google.com; s=arc-20160816; b=z+5h2hCmFXZXLrDy14Px0CVGG0oCGkwpYYYu7zFGnZ7N0WTwwR2AVouJOmUbuXrlQU havYJn3PSvW0BeyXY7hPprQ3jz8xo7C7bDwQAR3+dd72HFmqWw/NkkGQVEE1BWaUGeVk tVY6khmSzvxkLHgU92aEKjVLur3L7pf1fKV80MAjlcDJmfVoqBxGCNXNZ+O8AT1vox+w vGJobpewSrjzhNw79qw1noc8JAUz7fRkMbX06AueBWRiQApANs2NoK2dPYyU3HZJu5Ir MaSNcWfMc8+XIuRP81dlAf4zUKGjwBS6Ux66dYdlW6EAdIpfwAmsKjQLjjYnlJMt1Gzq qKow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from; bh=l9OR9BllKYjrQ3bGZFHVNvMeWofth5B1Ur8UKjrS+UA=; b=R/f38VLmN5jEUgHvknvfioDCxpKooN6RiIke+FZesObOAnqhMUcIbL5cXey3jxs5+7 vneri8bHHR3JNvFeDs0XJFisKs2E6duRKWGjz1Dt24N1Y5NViUs2xeSpHImCcz1KXWX1 LD619FJifMp6v33shHremlEq+GBU7qkuhw9ysSjC3gyamgMFugoC1Et24gmofQOQEEEu hV42JjTWtpabMPvmH71NvLPkWaOq1a9JxqsI4pmkR5UOVxRWWiWdLlxr+WCiGWoAvjzE pEWyUVC06moqIMI8ZSFb2l4PL1erkP46keSgD61VgFtKGoLACd0fI0W+OXFh0GU4LWRV gvzQ== 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 t5-v6si702870lje.3.2018.12.19.03.16.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Dec 2018 03:16:47 -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 azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id wBJBGcZs010392 (version=TLSv1/SSLv3 cipher=AES128-SHA256 bits=128 verify=NOT) for ; Wed, 19 Dec 2018 12:16:46 +0100 From: "Maxim Yu. Osipov" To: isar-users@googlegroups.com Subject: [PATCH] classes/isar-image: Collapse multiple sudo's Date: Wed, 19 Dec 2018 12:16:38 +0100 Message-Id: <20181219111638.22173-1-mosipov@ilbers.de> X-Mailer: git-send-email 2.11.0 X-TUID: KUzLUNMDToDU Suggested-by: Jan Kiszka Signed-off-by: Maxim Yu. Osipov --- 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() { -- 2.11.0