From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6588749641152462848 X-Received: by 2002:a19:1289:: with SMTP id 9-v6mr667821lfs.7.1534062821075; Sun, 12 Aug 2018 01:33:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:1a15:: with SMTP id a21-v6ls810656lfa.29.gmail; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw5Hwcq+wgdIOlMEZjewFi35/nWqSic0yMBU5gAjAWKoO7VpkfW5U7B82iMLgOKYKIsS8Ws X-Received: by 2002:a19:cd0a:: with SMTP id d10-v6mr655559lfg.21.1534062820479; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534062820; cv=none; d=google.com; s=arc-20160816; b=U9YPdxYDX1yew0nSeFORILyjrKvbZIiRlY0dv3OVuLeoCJw1YNfTbKXlYgdZR1qZxH 3XR68s8MQw0FbW97UoWiwyor8XvF3Dywyre5+VfLu7u51ppvL1/lNwEmAcSvU6DwfC+Z iKODEpJUV9AHkGFbaIBoIZPHwGYJDjSe4m71W8CcXqbr28aQBNVdXiA6LBNX6SQpV9Md yh6ahzhIMFqhvMK80gMBxK3qdHMOie/UQBGnKGeMWlzr6EzIxpqyK0ya8mf2mNVP/4uy I33ySeXGtkutCAlhSUe2MQ+n74ppnYqfYReVKnrp6fHvnlw2R/wB8oNc3Ozeet0w7SlL IY2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from:arc-authentication-results; bh=LFoTc9fOcP2vnG8TFx63i/iSmCsN/+NRL1M92QFMg5k=; b=o9KZgZwnRdxIhAbU2CCilix5819UqrAInhbK6C5qW8+LvlRWXucGFUWoK4oMrFW9Ho QIq5LzN2MIwncuXqhXaN+nQF25Bg4dKVCs6JkbchwAGyo4AS4QwW6GFEfbp8WBnus4X3 pPs8WwbSyheP6Eiz+eclV1Lm/tpGAsu/L9vIDLOCR4TEDnQbXOeMYcclt7D/A7FHx0F0 2OWATYRjiE6Xh69JUKrDXRKQYdFDffJwDGtUo/9FgI/17LUgvFwCT9lx3T0aUEGvP1vi dLJ24s6SAqcj7k9XwIB38GNXDkmMg4REEwZFnjLwVaCrfuRFrBEUnLcADX9qaQwjsBCm +PxA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id q4-v6si516515ljj.5.2018.08.12.01.33.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Aug 2018 01:33:40 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id w7C8Xdao001069 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 12 Aug 2018 10:33:39 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.3.53]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w7C8Xcu5016811 for ; Sun, 12 Aug 2018 10:33:39 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 2/3] isar-bootstrap: Remove redundant sudos Date: Sun, 12 Aug 2018 10:33:37 +0200 Message-Id: <4e3028243dfd0aca1199380fa04f25bff5bbe8e6.1534062818.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: ubfKiV3AD0+X From: Jan Kiszka The flock command is already called via sudo, thus the shell it spawns is run as root as well. Signed-off-by: Jan Kiszka --- .../recipes-core/isar-bootstrap/isar-bootstrap.inc | 84 +++++++++++----------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index 5fba3dd..bc91f35 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -175,69 +175,69 @@ isar_bootstrap() { set -e if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then if [ -e "${ROOTFSDIR}" ]; then - sudo umount -l "${ROOTFSDIR}/dev" || true - sudo umount -l "${ROOTFSDIR}/proc" || true - sudo rm -rf "${ROOTFSDIR}" + umount -l "${ROOTFSDIR}/dev" || true + umount -l "${ROOTFSDIR}/proc" || true + rm -rf "${ROOTFSDIR}" fi E="${@bb.utils.export_proxies(d)}" if [ ${IS_HOST} ]; then - sudo -E "${DEBOOTSTRAP}" --verbose \ - --variant=minbase \ - --include=locales \ - ${@get_distro_components_argument(d, True)} \ - ${DEBOOTSTRAP_KEYRING} \ - "${@get_distro_suite(d, True)}" \ - "${ROOTFSDIR}" \ - "${@get_distro_source(d, True)}" + ${DEBOOTSTRAP} --verbose \ + --variant=minbase \ + --include=locales \ + ${@get_distro_components_argument(d, True)} \ + ${DEBOOTSTRAP_KEYRING} \ + "${@get_distro_suite(d, True)}" \ + "${ROOTFSDIR}" \ + "${@get_distro_source(d, True)}" else - sudo -E "${DEBOOTSTRAP}" --verbose \ - --variant=minbase \ - --arch="${DISTRO_ARCH}" \ - --include=locales \ - ${@get_distro_components_argument(d, False)} \ - ${DEBOOTSTRAP_KEYRING} \ - "${@get_distro_suite(d, False)}" \ - "${ROOTFSDIR}" \ - "${@get_distro_source(d, False)}" + "${DEBOOTSTRAP}" --verbose \ + --variant=minbase \ + --arch="${DISTRO_ARCH}" \ + --include=locales \ + ${@get_distro_components_argument(d, False)} \ + ${DEBOOTSTRAP_KEYRING} \ + "${@get_distro_suite(d, False)}" \ + "${ROOTFSDIR}" \ + "${@get_distro_source(d, False)}" fi # Install apt config - sudo mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" - sudo install -v -m644 "${APTPREFS}" \ - "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" - sudo mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" - sudo install -v -m644 "${APTSRCS}" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - sudo rm -f "${ROOTFSDIR}/etc/apt/sources.list" - sudo mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" - sudo install -v -m644 "${WORKDIR}/isar-apt.conf" \ - "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" + mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" + install -v -m644 "${APTPREFS}" \ + "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" + mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" + install -v -m644 "${APTSRCS}" \ + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" + rm -f "${ROOTFSDIR}/etc/apt/sources.list" + mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d" + install -v -m644 "${WORKDIR}/isar-apt.conf" \ + "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf" if [ "${@get_distro_suite(d, True)}" = "stretch" ] && [ "${@get_host_release().split('.')[0]}" -lt "4" ]; then - sudo install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \ - "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" + install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \ + "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" fi # Set locale - sudo install -v -m644 "${WORKDIR}/locale" "${ROOTFSDIR}/etc/locale" + install -v -m644 "${WORKDIR}/locale" "${ROOTFSDIR}/etc/locale" - sudo sed -i '/en_US.UTF-8 UTF-8/s/^#//g' "${ROOTFSDIR}/etc/locale.gen" - sudo -E chroot "${ROOTFSDIR}" /usr/sbin/locale-gen + sed -i '/en_US.UTF-8 UTF-8/s/^#//g' "${ROOTFSDIR}/etc/locale.gen" + chroot "${ROOTFSDIR}" /usr/sbin/locale-gen # setup chroot - sudo install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" - sudo "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" + install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" + "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" # update APT - sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev - sudo mount -t proc none ${ROOTFSDIR}/proc + mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${ROOTFSDIR}/dev + mount -t proc none ${ROOTFSDIR}/proc E="${@bb.utils.export_proxies(d)}" export DEBIAN_FRONTEND=noninteractive - sudo -E chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y - sudo -E chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ - -o Debug::pkgProblemResolver=yes + chroot "${ROOTFSDIR}" /usr/bin/apt-get update -y + chroot "${ROOTFSDIR}" /usr/bin/apt-get dist-upgrade -y \ + -o Debug::pkgProblemResolver=yes # Finalize debootstrap by setting the link in deploy ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" -- 2.16.4