00-crypt.sh: move ${CRYPTSETUP_BIN} variable from initrd.defaults

11 years ago · 6938105c74
parent ac3822ad30
commit 6938105c74
2 changed files with 2 additions and 2 deletions
--- 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)
--- 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"