Attachment #859591 for bug #830655




	fi
}

list_mounts() {
	if [ -f /proc/self/mountinfo ]; then
		local x dev mount devs found
		found=:
		while sed 's/\(\(shared\)|\(master\)|\(propagate_from\)|\(unbindable\)\(\:\d+\)?\s+\)*-/-/g' \
				| read -r x x dev x mount x x fs x; do
			if [ -L "/sys/dev/block/$dev" ]; then
				devs="/dev/`readlink \"/sys/dev/block/$dev\" | rev | cut -d/ -f1 | rev`"
				printf '%s %s %s\n' "$(mapdevfs "$devs")" "$mount" "$fs"
				found="return 0"
			fi
		done < /proc/self/mountinfo
		$found
	fi
	grep "^/dev/" /proc/mounts | parse_proc_mounts
}

Lines 17-23 Link Here

(-)o/linux-boot-prober (-1 / +1 lines)
17	bootsv=	17	bootsv=
18	bootuuid=	18	bootuuid=
19		19
20	grep "^/dev/" /proc/mounts \| parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true	20	list_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true
21		21
22	if [ -z "$1" ]; then	22	if [ -z "$1" ]; then
23	ERR=y	23	ERR=y

Lines 128-134 Link Here

(-)o/os-prober (-1 / +1 lines)
128		128
129	# We need to properly canonicalize partitions with mount points and partitions	129	# We need to properly canonicalize partitions with mount points and partitions
130	# used in RAID	130	# used in RAID
131	grep "^/dev/" /proc/mounts \| parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true	131	list_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true
132	: >"$OS_PROBER_TMP/swaps-map"	132	: >"$OS_PROBER_TMP/swaps-map"
133	if [ -f /proc/swaps ]; then	133	if [ -f /proc/swaps ]; then
134	grep "^/dev/" /proc/swaps \| parse_proc_swaps >"$OS_PROBER_TMP/swaps-map" \|\| true	134	grep "^/dev/" /proc/swaps \| parse_proc_swaps >"$OS_PROBER_TMP/swaps-map" \|\| true

Return to bug 830655

Lines 326-328 Link Here

(-)o/common.sh (+16 lines)
326	fi	326	fi
327	}	327	}
328		328
		329	list_mounts() {
		330	if [ -f /proc/self/mountinfo ]; then
		331	local x dev mount devs found
		332	found=:
		333	while sed 's/\(\(shared\)\|\(master\)\|\(propagate_from\)\|\(unbindable\)\(\:\d+\)?\s+\)*-/-/g' \
		334	\| read -r x x dev x mount x x fs x; do
		335	if [ -L "/sys/dev/block/$dev" ]; then
		336	devs="/dev/`readlink \"/sys/dev/block/$dev\" \| rev \| cut -d/ -f1 \| rev`"
		337	printf '%s %s %s\n' "$(mapdevfs "$devs")" "$mount" "$fs"
		338	found="return 0"
		339	fi
		340	done < /proc/self/mountinfo
		341	$found
		342	fi
		343	grep "^/dev/" /proc/mounts \| parse_proc_mounts
		344	}