From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C1E2613888F for ; Mon, 5 Oct 2015 16:11:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51DFBE07E8; Mon, 5 Oct 2015 16:11:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F006DE07E8 for ; Mon, 5 Oct 2015 16:11:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1E17340771 for ; Mon, 5 Oct 2015 16:11:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8985674E for ; Mon, 5 Oct 2015 16:11:16 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1444061291.1558ad2b9ebf319b85876a940d31d513bf21324f.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/bootmisc.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 1558ad2b9ebf319b85876a940d31d513bf21324f X-VCS-Branch: master Date: Mon, 5 Oct 2015 16:11:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2b7ae232-8882-44ee-90f0-966fe8d90253 X-Archives-Hash: 6ce7faa0e2fc247ba13dd0bd1e47655e commit: 1558ad2b9ebf319b85876a940d31d513bf21324f Author: William Hubbs gmail com> AuthorDate: Mon Oct 5 16:08:11 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Mon Oct 5 16:08:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1558ad2b bootmisc: only remove temp directory if umount is successful Change the clean_run function to only remove the temp directory if the umount was successful. X-Gentoo-Bug: 561230 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=561230 init.d/bootmisc.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in index 13f2389..952475d 100644 --- a/init.d/bootmisc.in +++ b/init.d/bootmisc.in @@ -136,8 +136,7 @@ clean_run() dir=$(mktemp -d) if [ -n "$dir" -a -d $dir -a -w $dir ]; then mount --bind / $dir && rm -rf $dir/run/* || rc=1 - umount $dir - rm -rf $dir + umount $dir && rmdir $dir else rc=1 fi