From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6677870985578807296 X-Received: by 2002:a1c:be06:: with SMTP id o6mr1785230wmf.19.1554812999619; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:b406:: with SMTP id d6ls899930wmf.2.canary-gmail; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwc4Ema+eEMjvstDJCgJF7TRU4QVrwDRwqs2QvEJX66l0hbzl7zNOjwJtTbkf39Jb59hB0/ X-Received: by 2002:a1c:de0a:: with SMTP id v10mr1781086wmg.12.1554812999187; Tue, 09 Apr 2019 05:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554812999; cv=none; d=google.com; s=arc-20160816; b=TGH5UCA/ONnP75VYACPoE8v7hubiBFawhqxl3TQVNZpXo795ghpx33g3fIJKp4F9rw tUQeoslMVKLCCY8tyITCxC/KDlJBNyU6+AW/Mi8+BnUNguZo9UdnzWW/Or67A3kZKS2L KVfgD9sR5lasIo5+f1D7+2LaTQzuCnLY7Nm95e2r8Zii+LQ5X0csgrqzifWYV+3UmeRI B39TTLLXzbE8FZvRfeRa2breI+OXz0cljL4ubNgqw0ZJEbEue/UZpD77PZrjkqwWJCVg lykYlk3bJhX7ZJjRslf65phtdQ4VF+yGrUQPSjmt4O6CdSJGJwTpLwyYbFDGDEgfq/OH v1pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=gauWpqEYyibtmkHrS2337+781mVn5hCrl/poHuf92FM=; b=02PLW56lO9PtJtm32aPF9wznyT7AIxdGWY38156hmx1BklbBKNbaGnhlkY+iV8sGlu rq+tlp4S1g1c6Od5XPsLYBLf5TBbAnsN+q/0olMnOv36/c8KNJHDxri/EtgmAT+W0R+y /BdcAPYGZhVYWpF64Hm5KnJaXDN8OAhsUHz8Ro0w80hOf5i0Urs8QRcy3xB6OZK74Hfj 00FsKAbbcHd4e4GFTyPBvnvnvpgXnaf3uKLBGIBTCfb9UDS3RxYoCtymCm8IOeB5tYtE E/lT303KuC329CeDwE1IcyHIbk4BkOjxnZlmURYFR9Jdzf5lCGJ7Z5MbAMJOm4N6gGm3 Wl2Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id p14si824563wmh.2.2019.04.09.05.29.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Apr 2019 05:29:59 -0700 (PDT) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x39CTwvg011059 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 9 Apr 2019 14:29:58 +0200 Received: from ring.ppmd.siemens.net (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x39CTvkD031413; Tue, 9 Apr 2019 14:29:58 +0200 From: claudius.heine.ext@siemens.com To: isar-users@googlegroups.com Cc: Claudius Heine Subject: [PATCH v2 4/8] meta/classes/buildchroot: add check before each mounting and quotes Date: Tue, 9 Apr 2019 14:29:11 +0200 Message-Id: <20190409122915.14249-5-claudius.heine.ext@siemens.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190409122915.14249-1-claudius.heine.ext@siemens.com> References: <20190409122915.14249-1-claudius.heine.ext@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: o3MKtWF60eK4 From: Claudius Heine Signed-off-by: Claudius Heine --- meta/classes/buildchroot.bbclass | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass index c017b25..1a87bf4 100644 --- a/meta/classes/buildchroot.bbclass +++ b/meta/classes/buildchroot.bbclass @@ -25,18 +25,21 @@ buildchroot_do_mounts() { sudo -s <<'EOSUDO' ( flock 9 set -e - if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then - mount --bind ${REPO_ISAR_DIR}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt - mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads - mount --rbind /dev ${BUILDCHROOT_DIR}/dev - mount --make-rslave ${BUILDCHROOT_DIR}/dev - mount -t proc none ${BUILDCHROOT_DIR}/proc - mount --rbind /sys ${BUILDCHROOT_DIR}/sys - mount --make-rslave ${BUILDCHROOT_DIR}/sys - fi + mountpoint -q '${BUILDCHROOT_DIR}/isar-apt' || + mount --bind '${REPO_ISAR_DIR}/${DISTRO}' '${BUILDCHROOT_DIR}/isar-apt' + mountpoint -q '${BUILDCHROOT_DIR}/downloads' || + mount --bind '${DL_DIR}' '${BUILDCHROOT_DIR}/downloads' + mountpoint -q '${BUILDCHROOT_DIR}/dev' || + mount --rbind /dev '${BUILDCHROOT_DIR}/dev' + mount --make-rslave '${BUILDCHROOT_DIR}/dev' + mountpoint -q '${BUILDCHROOT_DIR}/proc' || + mount -t proc none '${BUILDCHROOT_DIR}/proc' + mountpoint -q '${BUILDCHROOT_DIR}/sys' || + mount --rbind /sys '${BUILDCHROOT_DIR}/sys' + mount --make-rslave '${BUILDCHROOT_DIR}/sys' # Refresh /etc/resolv.conf at this chance - cp -L /etc/resolv.conf ${BUILDCHROOT_DIR}/etc - ) 9>${MOUNT_LOCKFILE} + cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc' + ) 9>'${MOUNT_LOCKFILE}' EOSUDO } -- 2.20.1