Attachment #211005 for bug #294268

View | Details | Raw Unified | Return to bug 294268
Collapse All | Expand All





	if [ "$#" -gt "0" ]
	then

		[ ! -d "${mntdir}" ] && mkdir -p ${mntdir} 2>/dev/null >/dev/null
		if [ ! -z ${ISOBOOT} ]; then
			mntcddir="${mntdir%${media}}iso"
			if [ ! -f ${mntcddir} ]; then
				mkdir ${mntcddir}
			fi
		else
			mntcddir=${mntdir}
		fi

		for x in $*
		do

#				else
#					mount -r -t auto ${x} ${mntdir} &>/dev/null
#				fi
				mount -r -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
				if [ "$?" = '0' ]
				then
				if [ ! -z ${ISOBOOT} ]; then
					if [ -f ${mntcddir}/${ISOBOOT} ]; then
						mount -o loop ${mntcddir}/${ISOBOOT} ${mntdir}
						if [ "$?" = "0" ]; then
							good_msg "iso mounted on ${mntdir}"
						fi
					fi
				fi
					
					# Check for the media
					if [ -f "${mntdir}/${recon}" ]
					then

						good_msg "Media found on ${x}" ${CRYPT_SILENT}
						break
					else
						umount ${mntcddir}
					fi
				fi
			fi

Lines 80-85 do Link Here

(-)original-genkernel/defaults/linuxrc (+3 lines)
80	looptype\=*)	80	looptype\=*)
81	LOOPTYPE=`parse_opt "${x}"`	81	LOOPTYPE=`parse_opt "${x}"`
82	;;	82	;;
		83	isoboot\=*)
		84	ISOBOOT=`parse_opt "${x}"`
		85	;;
83	# Start Volume manager options	86	# Start Volume manager options
84	dolvm)	87	dolvm)
85	USE_LVM_NORMAL=1	88	USE_LVM_NORMAL=1

Return to bug 294268

Lines 72-79 findmediamount() { Link Here

(-)original-genkernel/defaults/initrd.scripts (-3 / +19 lines)
72		72
73	if [ "$#" -gt "0" ]	73	if [ "$#" -gt "0" ]
74	then	74	then
75
76	[ ! -d "${mntdir}" ] && mkdir -p ${mntdir} 2>/dev/null >/dev/null	75	[ ! -d "${mntdir}" ] && mkdir -p ${mntdir} 2>/dev/null >/dev/null
		76	if [ ! -z ${ISOBOOT} ]; then
		77	mntcddir="${mntdir%${media}}iso"
		78	if [ ! -f ${mntcddir} ]; then
		79	mkdir ${mntcddir}
		80	fi
		81	else
		82	mntcddir=${mntdir}
		83	fi
77		84
78	for x in $*	85	for x in $*
79	do	86	do
Lines 104-112 findmediamount() { Link Here
104	# else	113	# else
105	# mount -r -t auto ${x} ${mntdir} &>/dev/null	114	# mount -r -t auto ${x} ${mntdir} &>/dev/null
106	# fi	115	# fi
107	mount -r -t ${CDROOT_TYPE} ${x} ${mntdir} >/dev/null 2>&1	116	mount -r -t ${CDROOT_TYPE} ${x} ${mntcddir} >/dev/null 2>&1
108	if [ "$?" = '0' ]	117	if [ "$?" = '0' ]
109	then	118	then
		119	if [ ! -z ${ISOBOOT} ]; then
		120	if [ -f ${mntcddir}/${ISOBOOT} ]; then
		121	mount -o loop ${mntcddir}/${ISOBOOT} ${mntdir}
		122	if [ "$?" = "0" ]; then
		123	good_msg "iso mounted on ${mntdir}"
		124	fi
		125	fi
		126	fi
		127
110	# Check for the media	128	# Check for the media
111	if [ -f "${mntdir}/${recon}" ]	129	if [ -f "${mntdir}/${recon}" ]
112	then	130	then
Lines 115-121 findmediamount() { Link Here
115	good_msg "Media found on ${x}" ${CRYPT_SILENT}	133	good_msg "Media found on ${x}" ${CRYPT_SILENT}
116	break	134	break
117	else	135	else
118	umount ${mntdir}	136	umount ${mntcddir}
119	fi	137	fi
120	fi	138	fi
121	fi	139	fi