diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 7e51f0d..33f0108 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1144,11 +1144,11 @@ open_luks() { fi # At this point a candidate key exists (either mounted before or not) good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT} - if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then + if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /usr/bin/gpg ] ; then [ -e /dev/tty ] && mv /dev/tty /dev/tty.org mknod /dev/tty c 5 1 cryptsetup_options="${cryptsetup_options} -d -" - gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" + gpg_cmd="/usr/bin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" else cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}" fi diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 6a26465..2ed62e5 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -544,7 +544,7 @@ append_gpg() { mkdir -p "${TEMP}/initramfs-gpg-temp/sbin/" print_info 1 "Including GPG support" - copy_binaries "${TEMP}/initramfs-gpg-temp" /sbin/gpg + copy_binaries "${TEMP}/initramfs-gpg-temp" /usr/bin/gpg cd "${TEMP}/initramfs-gpg-temp/" log_future_cpio_content