|
Lines 92-97
Link Here
|
| 92 |
# Check for a block device to mount |
92 |
# Check for a block device to mount |
| 93 |
if [ -b "${x}" ] |
93 |
if [ -b "${x}" ] |
| 94 |
then |
94 |
then |
|
|
95 |
skip=0 |
| 96 |
bsn=`basename "${x}"` |
| 97 |
# |
| 98 |
# If disk and it has at least one partition, skip. |
| 99 |
# We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we |
| 100 |
# don't skip device mapper devices. Even the craziest scenario |
| 101 |
# deserves a fair chance. |
| 102 |
# |
| 103 |
for part in `ls /sys/block/${bsn}/${bsn}[0-9]* 2>/dev/null` |
| 104 |
do |
| 105 |
skip=1 |
| 106 |
break; |
| 107 |
done |
| 108 |
if [ ${skip} -eq 1 ] |
| 109 |
then |
| 110 |
continue |
| 111 |
fi |
| 95 |
good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT} |
112 |
good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT} |
| 96 |
|
113 |
|
| 97 |
# if [ "${media}" = "cdrom" ]; then |
114 |
# if [ "${media}" = "cdrom" ]; then |
|
Lines 281-290
Link Here
|
| 281 |
} |
298 |
} |
| 282 |
|
299 |
|
| 283 |
test_success() { |
300 |
test_success() { |
|
|
301 |
retcode=$? |
| 284 |
error_string=$1 |
302 |
error_string=$1 |
| 285 |
error_string="${error_string:-run command}" |
303 |
error_string="${error_string:-run command}" |
| 286 |
# If last command failed send error message and fall back to a shell |
304 |
# If last command failed send error message and fall back to a shell |
| 287 |
if [ "$?" != '0' ] |
305 |
if [ "$retcode" != '0' ] |
| 288 |
then |
306 |
then |
| 289 |
bad_msg 'Failed to $1; failing back to the shell...' |
307 |
bad_msg 'Failed to $1; failing back to the shell...' |
| 290 |
run_shell |
308 |
run_shell |
|
Lines 385-397
Link Here
|
| 385 |
if [ "${KV_2_6_OR_GREATER}" ] |
403 |
if [ "${KV_2_6_OR_GREATER}" ] |
| 386 |
then |
404 |
then |
| 387 |
cd /sys |
405 |
cd /sys |
| 388 |
[ "${DO_slowusb}" ] && sleep 10 |
406 |
[ "${DO_slowusb}" ] && sdelay |
| 389 |
check_slowusb |
407 |
check_slowusb |
| 390 |
[ "${FORCE_slowusb}" ] && sleep 10 |
408 |
[ "${FORCE_slowusb}" ] && sdelay |
| 391 |
good_msg 'Activating mdev' |
409 |
good_msg 'Activating mdev' |
| 392 |
runmdev |
410 |
runmdev |
| 393 |
[ "${DO_slowusb}" ] || \ |
411 |
[ "${DO_slowusb}" ] || \ |
| 394 |
[ "${FORCE_slowusb}" ] && sleep 20 |
412 |
[ "${FORCE_slowusb}" ] && sdelay |
| 395 |
cd / |
413 |
cd / |
| 396 |
fi |
414 |
fi |
| 397 |
} |
415 |
} |
