|
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 |
# if disk and it has at least one partition, skip. |
| 96 |
bsn=`basename "${x}"` |
| 97 |
if [ -e "/sys/block/${bsn}" -a -b "${x}1" ] |
| 98 |
then |
| 99 |
continue |
| 100 |
fi |
| 95 |
good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT} |
101 |
good_msg "Attempting to mount media:- ${x}" ${CRYPT_SILENT} |
| 96 |
|
102 |
|
| 97 |
# if [ "${media}" = "cdrom" ]; then |
103 |
# if [ "${media}" = "cdrom" ]; then |
|
Lines 281-290
Link Here
|
| 281 |
} |
287 |
} |
| 282 |
|
288 |
|
| 283 |
test_success() { |
289 |
test_success() { |
|
|
290 |
retcode=$? |
| 284 |
error_string=$1 |
291 |
error_string=$1 |
| 285 |
error_string="${error_string:-run command}" |
292 |
error_string="${error_string:-run command}" |
| 286 |
# If last command failed send error message and fall back to a shell |
293 |
# If last command failed send error message and fall back to a shell |
| 287 |
if [ "$?" != '0' ] |
294 |
if [ "$retcode" != '0' ] |
| 288 |
then |
295 |
then |
| 289 |
bad_msg 'Failed to $1; failing back to the shell...' |
296 |
bad_msg 'Failed to $1; failing back to the shell...' |
| 290 |
run_shell |
297 |
run_shell |
