Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 212794 | Differences between
and this patch

Collapse All | Expand All

(-)initrd.scripts.org (-4 / +11 lines)
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
Lines 385-397 Link Here
385
	if [ "${KV_2_6_OR_GREATER}" ]
392
	if [ "${KV_2_6_OR_GREATER}" ]
386
	then
393
	then
387
		cd /sys
394
		cd /sys
388
		[ "${DO_slowusb}" ] && sleep 10
395
		[ "${DO_slowusb}" ] && sdelay
389
		check_slowusb
396
		check_slowusb
390
		[ "${FORCE_slowusb}" ] && sleep 10
397
		[ "${FORCE_slowusb}" ] && sdelay
391
		good_msg 'Activating mdev'
398
		good_msg 'Activating mdev'
392
		runmdev
399
		runmdev
393
		[ "${DO_slowusb}" ] || \
400
		[ "${DO_slowusb}" ] || \
394
		[ "${FORCE_slowusb}" ] && sleep 20
401
		[ "${FORCE_slowusb}" ] && sdelay
395
		cd /
402
		cd /
396
	fi
403
	fi
397
}
404
}

Return to bug 212794