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

Collapse All | Expand All

(-)linuxrc.orig (-14 / +3 lines)
Lines 173-179 Link Here
173
			NFSROOT=`parse_opt "${x}"`
173
			NFSROOT=`parse_opt "${x}"`
174
		;;
174
		;;
175
		crypt_root\=*)
175
		crypt_root\=*)
176
			CRYPT_ROOT=`parse_opt "${x}"`
176
			LUKS_ROOT=`parse_opt "${x}"`
177
		;;
177
		;;
178
	esac
178
	esac
179
done
179
done
Lines 226-244 Link Here
226
# Scan volumes
226
# Scan volumes
227
startVolumes
227
startVolumes
228
228
229
# Iinitialize encrypted root device
229
# Iinitialize LUKS root device
230
if [ -n "${CRYPT_ROOT}" ]
230
startLUKS
231
then
232
	cryptsetup luksOpen ${CRYPT_ROOT} root || exit -1
233
234
	if [ -n "${REAL_ROOT}" ]
235
	then
236
		# Rescan volumes
237
		startVolumes
238
	else
239
		REAL_ROOT="/dev/mapper/root"
240
	fi
241
fi
242
231
243
# Set up unionfs
232
# Set up unionfs
244
mkdir -p ${NEW_ROOT}
233
mkdir -p ${NEW_ROOT}

Return to bug 152441