Make plymouth ask-for-password work as expected

cleanup-cruft
Fabio Erculiani 12 years ago
parent bea8085444
commit fb6fa7903d

@ -1044,7 +1044,7 @@ openLUKS() {
LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}") LUKS_DEVICE=$(find_real_device "${LUKS_DEVICE}")
setup_md_device ${LUKS_DEVICE} setup_md_device ${LUKS_DEVICE}
cryptsetup isLuks ${LUKS_DEVICE} /sbin/cryptsetup isLuks ${LUKS_DEVICE}
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT} bad_msg "The LUKS device ${LUKS_DEVICE} does not contain a LUKS header" ${CRYPT_SILENT}
@ -1130,7 +1130,7 @@ openLUKS() {
fi fi
fi fi
# At this point, keyfile or not, we're ready! # At this point, keyfile or not, we're ready!
crypt_exec "${gpg_cmd}cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}" crypt_exec "${gpg_cmd}/sbin/cryptsetup ${cryptsetup_options} luksOpen ${LUKS_DEVICE} ${LUKS_NAME}"
crypt_exec_ret=$? crypt_exec_ret=$?
[ -e /dev/tty.org ] \ [ -e /dev/tty.org ] \

@ -17,6 +17,7 @@ fi
mount -t proc -o noexec,nosuid,nodev proc /proc >/dev/null 2>&1 mount -t proc -o noexec,nosuid,nodev proc /proc >/dev/null 2>&1
mount -o remount,rw / >/dev/null 2>&1 mount -o remount,rw / >/dev/null 2>&1
mount -t tmpfs -o rw,nosuid,nodev,relatime,mode=755 none /run 2>&1 mount -t tmpfs -o rw,nosuid,nodev,relatime,mode=755 none /run 2>&1
mount -t tmpfs none /dev/shm 2>&1
# Set up symlinks # Set up symlinks
/bin/busybox --install -s /bin/busybox --install -s

@ -63,7 +63,7 @@ append_base_layout() {
rm -rf "${TEMP}/initramfs-base-temp" > /dev/null rm -rf "${TEMP}/initramfs-base-temp" > /dev/null
fi fi
mkdir -p ${TEMP}/initramfs-base-temp/dev mkdir -p ${TEMP}/initramfs-base-temp/dev/shm
mkdir -p ${TEMP}/initramfs-base-temp/bin mkdir -p ${TEMP}/initramfs-base-temp/bin
mkdir -p ${TEMP}/initramfs-base-temp/etc mkdir -p ${TEMP}/initramfs-base-temp/etc
mkdir -p ${TEMP}/initramfs-base-temp/usr mkdir -p ${TEMP}/initramfs-base-temp/usr

Loading…
Cancel
Save