From ba46e5bb43d09666049aa6e242c77de5f83df0a1 Mon Sep 17 00:00:00 2001 From: Johannes Bauer Date: Fri, 25 Oct 2019 13:06:20 +0200 Subject: [PATCH] Adapt initramfs hooks Unlocking entity is now the client, not the server anymore. Change filenames and syntax in initramfs scripts to reflect both. --- initramfs/luksrku-hook | 6 +++--- initramfs/luksrku-script | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/initramfs/luksrku-hook b/initramfs/luksrku-hook index 9a38f89..39441a7 100755 --- a/initramfs/luksrku-hook +++ b/initramfs/luksrku-hook @@ -2,7 +2,7 @@ # # Initramfs-tools hook script for remote LUKS unlocking # -# Copyright 2016 Johannes Bauer +# Copyright 2016-2019 Johannes Bauer # Released under GPLv3 PREREQ="" @@ -21,8 +21,8 @@ esac . /usr/share/initramfs-tools/hook-functions -if [ ! -f /etc/luksrku-server.bin ]; then +if [ ! -f /etc/luksrku-client.bin ]; then exit 0 fi -cp /etc/luksrku-server.bin ${DESTDIR}/etc/ +cp /etc/luksrku-client.bin ${DESTDIR}/etc/ copy_exec /usr/local/sbin/luksrku /sbin diff --git a/initramfs/luksrku-script b/initramfs/luksrku-script index da43973..b254fde 100755 --- a/initramfs/luksrku-script +++ b/initramfs/luksrku-script @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016-2017 Johannes Bauer +# Copyright 2016-2019 Johannes Bauer # Released under GPLv3 PREREQ="lvm2" @@ -22,11 +22,11 @@ esac . /scripts/functions -if [ ! -f /etc/luksrku-server.bin ]; then +if [ ! -f /etc/luksrku-client.bin ]; then exit 0 fi configure_networking -/sbin/luksrku --server-mode -v -k /etc/luksrku-server.bin +/sbin/luksrku client -v /etc/luksrku-client.bin exit 0