denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make root_trim work with crypt_root_key

Browse Source 
Keep options already set for cryptsetup when using crypt_root_key*
cleanup-cruft
Peter Hjalmarsson 13 years ago
parent 3219730c44
commit e779547b72
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
defaults/initrd.scripts
Unescape View File

@ -904,10 +904,10 @@ openLUKS() {
if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
[ -e /dev/tty ] && mv /dev/tty /dev/tty.org [ -e /dev/tty ] && mv /dev/tty /dev/tty.org
mknod /dev/tty c 5 1 mknod /dev/tty c 5 1
cryptsetup_options="-d -" cryptsetup_options="${cryptsetup_options} -d -"
gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |" gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
else else
cryptsetup_options="-d ${mntkey}${LUKS_KEY}" cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
fi fi
fi fi
# At this point, keyfile or not, we're ready! # At this point, keyfile or not, we're ready!

Write Preview
Loading…
Cancel
Save