From 6938105c747a65285245afd98630ca6a38be237a Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 20 Oct 2013 11:11:10 +0200 Subject: [PATCH] 00-crypt.sh: move ${CRYPTSETUP_BIN} variable from initrd.defaults --- defaults/initrd.d/00-crypt.sh | 2 ++ defaults/initrd.defaults | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/defaults/initrd.d/00-crypt.sh b/defaults/initrd.d/00-crypt.sh index a0dc45e..892c0ed 100755 --- a/defaults/initrd.d/00-crypt.sh +++ b/defaults/initrd.d/00-crypt.sh @@ -5,6 +5,8 @@ . /etc/initrd.d/00-splash.sh . /etc/initrd.d/00-fsdev.sh +CRYPTSETUP_BIN="/sbin/cryptsetup" + _bootstrap_key() { local ltype="${1}" local keydevs=$(device_list) diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index 40db2b7..441ed8c 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -67,8 +67,6 @@ PLYMOUTHD_BIN="/sbin/plymouthd" PLYMOUTH_BIN="/bin/plymouth" [ ! -e "${PLYMOUTH_BIN}" ] && PLYMOUTH_BIN="/usr/bin/plymouth" -CRYPTSETUP_BIN="/sbin/cryptsetup" - REAL_ROOT="" CONSOLE="/dev/console" NEW_ROOT="/newroot"