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 F336C138335 for ; Thu, 18 Jul 2019 15:32:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AE16E07F6; Thu, 18 Jul 2019 15:32:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 178D5E07DB for ; Thu, 18 Jul 2019 15:32:33 +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 2EC81347E03 for ; Thu, 18 Jul 2019 15:32:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCDB06FF for ; Thu, 18 Jul 2019 15:32:30 +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: <1563463817.7aa2e795e8bfb6fecb7e659617c98c5e7db845a5.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_funcs.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 7aa2e795e8bfb6fecb7e659617c98c5e7db845a5 X-VCS-Branch: master Date: Thu, 18 Jul 2019 15:32:30 +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: 112e3f6e-2281-49c1-ba42-6ef77d09bd79 X-Archives-Hash: f4844a2b79ed1fe9eed86545372fbc9f commit: 7aa2e795e8bfb6fecb7e659617c98c5e7db845a5 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Jul 18 15:30:17 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Jul 18 15:30:17 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7aa2e795 gen_funcs.sh: restore_boot_mount_state(): Delete .bootdir.no_boot_partition only when present Fixes 8458d98a ("Rework --mountboot handling") Signed-off-by: Thomas Deutschmann gentoo.org> gen_funcs.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gen_funcs.sh b/gen_funcs.sh index c453962..31e4a6c 100755 --- a/gen_funcs.sh +++ b/gen_funcs.sh @@ -1410,14 +1410,14 @@ restore_boot_mount_state() { if [ -f "${TEMP}/.bootdir.no_boot_partition" ] then msg="mount: >> '${BOOTDIR}' is not a mountpoint; Nothing to restore ..." + + rm "${TEMP}/.bootdir.no_boot_partition" \ + || gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!" fi print_info 5 '' 1 0 print_info 5 "${msg}" - rm "${TEMP}/.bootdir.no_boot_partition" \ - || gen_die "Failed to remove bootdir state file '${TEMP}/.bootdir.no_boot_partition'!" - return fi }