Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jE769-00089J-5f for mharc-grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48894) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jE766-00087y-BX for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jE765-0008T1-D3 for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:10 -0400 Received: from cyberdimension.org ([2001:910:1314:ffff::1]:53664 helo=gnutoo.cyberdimension.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jE765-000824-42 for grub-devel@gnu.org; Tue, 17 Mar 2020 03:57:09 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id 7412e6bc; Tue, 17 Mar 2020 07:55:00 +0000 (UTC) Received: from primarylaptop.localdomain (localhost.localdomain [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id 7fdd3aa9; Tue, 17 Mar 2020 07:55:00 +0000 (UTC) From: Denis 'GNUtoo' Carikli To: Patrick Steinhardt , Daniel Kiper Cc: The development of GNU GRUB , Denis 'GNUtoo' Carikli Subject: [PATCHv2][ 2/6] cryptodisk: geli: unify grub_cryptodisk_dev function names Date: Tue, 17 Mar 2020 08:57:36 +0100 Message-Id: <20200317075740.5430-2-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317075740.5430-1-GNUtoo@cyberdimension.org> References: <20200317075740.5430-1-GNUtoo@cyberdimension.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:910:1314:ffff::1 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Mar 2020 07:57:11 -0000 Signed-off-by: Denis 'GNUtoo' Carikli --- grub-core/disk/geli.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/grub-core/disk/geli.c b/grub-core/disk/geli.c index e9d23299a..786682077 100644 --- a/grub-core/disk/geli.c +++ b/grub-core/disk/geli.c @@ -242,8 +242,7 @@ grub_util_get_geli_uuid (const char *dev) #endif static grub_cryptodisk_t -configure_ciphers (grub_disk_t disk, const char *check_uuid, - int boot_only) +geli_scan (grub_disk_t disk, const char *check_uuid, int boot_only) { grub_cryptodisk_t newdev; struct grub_geli_phdr header; @@ -580,7 +579,7 @@ recover_key (grub_disk_t source, grub_cryptodisk_t dev) } struct grub_cryptodisk_dev geli_crypto = { - .scan = configure_ciphers, + .scan = geli_scan, .recover_key = recover_key }; -- 2.25.1