Attachment #848851 for bug #830655





	mountboot="$bootpart $mounted"
}

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

Lines 6-12 set -e Link Here

(-)a/linux-boot-prober (-1 / +1 lines)
6	newns "$@"	6	newns "$@"
7	require_tmpdir	7	require_tmpdir
8		8
9	grep "^/dev/" /proc/mounts \| parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true	9	list_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true
10		10
11	partition="$1"	11	partition="$1"
12		12

Lines 120-126 done Link Here

(-)a/os-prober (-2 / +1 lines)
120		120
121	# We need to properly canonicalize partitions with mount points and partitions	121	# We need to properly canonicalize partitions with mount points and partitions
122	# used in RAID	122	# used in RAID
123	grep "^/dev/" /proc/mounts \| parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true	123	list_mounts >"$OS_PROBER_TMP/mounted-map" \|\| true
124	: >"$OS_PROBER_TMP/swaps-map"	124	: >"$OS_PROBER_TMP/swaps-map"
125	if [ -f /proc/swaps ]; then	125	if [ -f /proc/swaps ]; then
126	grep "^/dev/" /proc/swaps \| parse_proc_swaps >"$OS_PROBER_TMP/swaps-map" \|\| true	126	grep "^/dev/" /proc/swaps \| parse_proc_swaps >"$OS_PROBER_TMP/swaps-map" \|\| true
127	-

Return to bug 830655

Lines 296-298 linux_mount_boot () { Link Here

(-)a/common.sh (+16 lines)
296		296
297	mountboot="$bootpart $mounted"	297	mountboot="$bootpart $mounted"
298	}	298	}
		299
		300	list_mounts() {
		301	if [ -f /proc/self/mountinfo ]; then
		302	local x dev mount devs found
		303	found=:
		304	while read -r x x dev x mount x; do
		305	if [ -L "/sys/dev/block/$dev" ]; then
		306	devs="/dev/`readlink \"/sys/dev/block/$dev\" \| rev \| cut -d/ -f1 \| rev`"
		307	printf '%s %s\n' "$(mapdevfs "$devs")" "$mount"
		308	found="return 0"
		309	fi
		310	done < /proc/self/mountinfo
		311	$found
		312	fi
		313	grep "^/dev/" /proc/mounts \| parse_proc_mounts
		314	}