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 C95D0138334 for ; Fri, 1 Mar 2019 06:00:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D40CDE086B; Fri, 1 Mar 2019 06:00:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 A7847E086B for ; Fri, 1 Mar 2019 06:00:24 +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 3E5B3335CF4 for ; Fri, 1 Mar 2019 06:00:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA3CA556 for ; Fri, 1 Mar 2019 06:00:19 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1551419934.8aa79ee17291ca2bef5c9117b14d4553afe00fde.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 8aa79ee17291ca2bef5c9117b14d4553afe00fde X-VCS-Branch: master Date: Fri, 1 Mar 2019 06:00:19 +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: d48c5beb-1354-4c6e-a5de-601e6fdd6de9 X-Archives-Hash: dda34499ebacdd2219678e84c66a09c1 commit: 8aa79ee17291ca2bef5c9117b14d4553afe00fde Author: Louis Sautier gmail com> AuthorDate: Sat Jan 5 01:11:26 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Mar 1 05:58:54 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8aa79ee1 Fix inconsistent case for ROOT/SWAP.encrypted flag filenames openLUKS() creates files using upper case names, not lower case. Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index f8f9825..a88ed60 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1472,12 +1472,12 @@ startLUKS() { /sbin/ifconfig $(echo "${IP}" | awk -F":" '{print $6}' ) 0.0.0.0 fi - if [ -e /root.decrypted ]; then - rm /root.decrypted + if [ -e /ROOT.decrypted ]; then + rm /ROOT.decrypted fi - if [ -e /swap.decrypted ]; then - rm /swap.decrypted + if [ -e /SWAP.decrypted ]; then + rm /SWAP.decrypted fi }