|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
#!/bin/ash
|
|
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
. /etc/initrd.defaults
|
|
|
|
|
|
|
|
|
@ -341,7 +341,6 @@ findnfsmount() {
|
|
|
|
|
NFSIP=$(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2)
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Obtain NFSPATH
|
|
|
|
|
OPTIONS=$(busybox dmesg | grep rootpath | sed -e "s/,/ /g")
|
|
|
|
|
for OPTION in $OPTIONS
|
|
|
|
@ -433,11 +432,9 @@ find_real_device() {
|
|
|
|
|
check_loop() {
|
|
|
|
|
if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ]
|
|
|
|
|
then
|
|
|
|
|
|
|
|
|
|
bad_msg "Invalid loop location: ${LOOP}"
|
|
|
|
|
bad_msg 'Please export LOOP with a valid location, or reboot and pass a proper loop=...'
|
|
|
|
|
bad_msg 'kernel command line!'
|
|
|
|
|
|
|
|
|
|
run_shell
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
@ -689,7 +686,6 @@ cmdline_hwopts() {
|
|
|
|
|
# Shouldnt need to sort this as the following loop should figure out the
|
|
|
|
|
# duplicates and strip them out
|
|
|
|
|
#MY_HWOPTS=$(echo ${MY_HWOPTS}| sort)
|
|
|
|
|
|
|
|
|
|
for x in ${MY_HWOPTS}
|
|
|
|
|
do
|
|
|
|
|
FOUND=0
|
|
|
|
@ -1155,9 +1151,7 @@ openLUKS() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
startLUKS() {
|
|
|
|
|
|
|
|
|
|
# if key is set but key device isn't, find it
|
|
|
|
|
|
|
|
|
|
[ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \
|
|
|
|
|
&& sleep 6 && bootstrapKey "ROOT"
|
|
|
|
|
|
|
|
|
|