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

Collapse All | Expand All

(-)old/defaults/initrd.scripts (-4 / +22 lines)
Lines 818-823 Link Here
818
	local overlay=/mnt/overlay
818
	local overlay=/mnt/overlay
819
	local upperdir="${overlay}/.upper"
819
	local upperdir="${overlay}/.upper"
820
	local workdir="${overlay}/.work"
820
	local workdir="${overlay}/.work"
821
	local persist="${overlay}/.persist"
822
	local persist_dev=/mnt/persist
821
	local static=/mnt/livecd
823
	local static=/mnt/livecd
822
824
823
	run_debug_shell overlayfs
825
	run_debug_shell overlayfs
Lines 832-848 Link Here
832
834
833
	mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${static}"
835
	mount -t squashfs -o loop,ro "${CDROOT_PATH}/${LOOPEXT}${LOOP}" "${static}"
834
	mount -t tmpfs none "${overlay}"
836
	mount -t tmpfs none "${overlay}"
835
	mkdir "${upperdir}" "${workdir}"
837
	mkdir "${upperdir}" "${workdir}" "${persist}"
838
839
	if [ -n "${overlayfs_persist}" ]; then
840
		if [ -n "${overlayfs_persist_dev}" ]; then
841
			mkdir "${persist_dev}"
842
			findmediamount "persist" "${overlayfs_persist}" "PERSIST" "${persist_dev}" ${overlay_persist_dev}
843
			if [ -f "${persist_dev}/${overlayfs_persist}" ]; then
844
				persist_path="${persist_dev}/${overlayfs_persist}"
845
			fi
846
		elif [ -n "${ISOBOOT}" ] && [ -f "/mnt/iso/${overlayfs_persist}" ]; then
847
			persist_path="/mnt/iso/${overlayfs_persist}"
848
		fi
849
850
		if [ -n "${persist_path}" ]; then
851
			mount -t squashfs -o loop,ro "${persist_path}" "${persist}"
852
		fi
853
	fi
836
854
837
	is_union_modules overlayfs
855
	is_union_modules overlayfs
838
	run mount -t overlay overlay -o lowerdir="${static}${mod_path}",upperdir="${upperdir}",workdir="${workdir}" "${NEW_ROOT}"
856
	run mount -t overlay overlay -o lowerdir="${persist}:${static}${mod_path}",upperdir="${upperdir}",workdir="${workdir}" "${NEW_ROOT}"
839
857
840
	[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
858
	[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
841
	[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
859
	[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
842
860
843
	echo "overlay / overlay defaults 0 0" > "${NEW_ROOT}"/etc/fstab
861
	[ ! -f ${persist}/etc/fstab ] && echo "overlay / overlay defaults 0 0" > "${NEW_ROOT}"/etc/fstab
844
862
845
	for i in "${overlay}" "${static}"
863
	for i in "${overlay}" "${static}" "${persist}"
846
	do
864
	do
847
		run mount --bind "${i}" "${NEW_ROOT}${i}"
865
		run mount --bind "${i}" "${NEW_ROOT}${i}"
848
	done
866
	done
(-)old/defaults/linuxrc (+7 lines)
Lines 429-434 Link Here
429
				overlayfs_dev=${x#*=}
429
				overlayfs_dev=${x#*=}
430
			fi
430
			fi
431
		;;
431
		;;
432
		# Allow user to specify persistent image on top of image.squashfs
433
		overlayfs_persist\=*)
434
			overlayfs_persist=${x#*=}
435
		;;
436
		overlayfs_persist_dev\=*)
437
			overlayfs_persist_dev=${x#*=}
438
		;;
432
		# Allow user to specify the modules location
439
		# Allow user to specify the modules location
433
		overlayfs.modules\=*)
440
		overlayfs.modules\=*)
434
			overlayfs_modules_dir=${x#*=}
441
			overlayfs_modules_dir=${x#*=}

Return to bug 866959