From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AE24138334 for ; Sun, 13 Oct 2019 16:01:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3029E0848; Sun, 13 Oct 2019 16:01:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCF43E0848 for ; Sun, 13 Oct 2019 16:01:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A717034BA06 for ; Sun, 13 Oct 2019 16:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 305D183D for ; Sun, 13 Oct 2019 16:00:58 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1570975983.b0b13eb38269ac502ace11b6a99414a1b6122d44.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b0b13eb38269ac502ace11b6a99414a1b6122d44 X-VCS-Branch: master Date: Sun, 13 Oct 2019 16:00:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 16dc132f-316b-4951-886d-9c2826c59b3d X-Archives-Hash: 2ae84dfe487c8cf8382aabbb8b0f5f03 commit: b0b13eb38269ac502ace11b6a99414a1b6122d44 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Oct 13 03:50:59 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Oct 13 14:13:03 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b0b13eb3 initrd.scripts: openLUKS(): fix $mntkey cleanup Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 7184cfd..c016662 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1835,7 +1835,7 @@ openLUKS() { run umount "${mntkey}" >/dev/null 2>&1 fi - [ -d "${mntkey}" ] run rmdir -p "${mntkey}" >/dev/null 2>&1 + [ -d "${mntkey}" ] && run rmdir -p "${mntkey}" >/dev/null 2>&1 } iface_name() {