From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6982225001537601536 X-Received: by 2002:ac2:5d4c:: with SMTP id w12mr20389535lfd.494.1625675946995; Wed, 07 Jul 2021 09:39:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:508b:: with SMTP id f11ls3894710lfm.2.gmail; Wed, 07 Jul 2021 09:39:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVFSdTFjx7t9aNL7N/web1SD2aqVjvpXPV4g5e4olTeRRHqqKaRGjiSX/q7FldYVb5WS5D X-Received: by 2002:a19:614c:: with SMTP id m12mr15405374lfk.119.1625675946005; Wed, 07 Jul 2021 09:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625675946; cv=none; d=google.com; s=arc-20160816; b=J+9xTz594N43ANPh0QGAWVUk7ocR9zvR+JJ8ZbsFsSnnIbo9I7EIcB5Fd6GndOmPYO UA4PjDAQu29jpqi+WL0NHgk/KlUG/STrDHK5aGy49scIx9NUunQkEgz++IGaXjEOYozO NPgjyHBU6qxbuu91jxRD2g8WGmk4ENhrAMi0n6DQRN/Su4gy+tRFgYVWv9/v0zwc/WHS SJQxXl+j8zQhrXv3EPqZXULSszp5sTkglBLWeLlQTz/ajHRyobEslGXzvUcssjg9wVKI /h4GQ05hmJgMSvmJbCoISbDXAM2Ey1fWa4QMNadAMng+xMDAYmdLcPvrpSdqNlo20Kc4 RW2Q== 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=vjnopRyDtUo2apslkzcfAfh8MotfvCGNTQwJmEFsH/Q=; b=GdNamqVrCS5xtsZveZ63u7Ij9UwK1JwEXc+iVpXll8hubjNouZzhBjjFewbmTmDB7i Opk6N/tUcsZctSLB/9+hV9ty73MqUDrQLWNBRCjVE6vZPknGHHec1uAw8R40ZophS00p ThloBoVj+xp8X/8+zgHfFf5eewoTQiCVXutrgYYpakyL1NQfbzCIluo6sD50BU5+YuvG YN5Nv1hmWtcoKend6jJNJqzwm2yhot23qOWDTplKYTExFDyInAh2cFq0+zmaqkjQ5XSY 4vnRZlmfthJJe/GetH0YvthSWCaRTAcJIBxHTRqRmofdPw6guRYUC2O3KcTZqDpaqG/g wuvA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id z4si806142lfs.0.2021.07.07.09.39.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Jul 2021 09:39:05 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-191-69-214-37.mgts.dynamic.pppoe.byfly.by [37.214.69.191] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 167GcxMR003642 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 7 Jul 2021 18:39:04 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 3/5] dpkg: Remove unmount loop Date: Wed, 7 Jul 2021 19:38:49 +0300 Message-Id: <20210707163851.204296-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707163851.204296-1-amikan@ilbers.de> References: <20210707163851.204296-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: 8sTGc0sdopLT Remove while loop when trying to unmount WORKDIR. Any failures of umount should be investigated to fix the root cause. Also make dpkg_undo_mounts do not fail if dpkg_do_mounts was not called or it was called twice. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 97661a6..6c84f3a 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -154,16 +154,11 @@ dpkg_do_mounts() { } dpkg_undo_mounts() { - i=1 - while ! sudo umount ${BUILDROOT}; do - sleep 0.1 - i=`expr $i + 1` - if [ $i -gt 100 ]; then - bbwarn "${BUILDROOT}: Couldn't unmount, retrying..." - i=1 - fi - done - sudo rmdir ${BUILDROOT} + buildchroot_undo_mounts + + mountpoint -q '${BUILDROOT}' && \ + sudo umount ${BUILDROOT} && \ + sudo rmdir ${BUILDROOT} || true } # Placeholder for actual dpkg_runbuild() implementation -- 2.25.1