diff options
| author |   Enno Tensing <tenno@suij.in> | 2024-05-17 20:08:41 +0200 |
|---|---|---|
| committer |   Ben Kohler <bkohler@gentoo.org> | 2024-05-21 10:50:15 -0500 |
| commit | 80f9bed892f17cb69eaab7ac9a1fa547384c4927 (patch) | |
| tree | 568ac0e935fd33a39e3e4c589c31bccdc8ec4346 /sys-boot/os-prober/files | |
| parent | net-misc/freerdp: add 2.11.7 (diff) | |
| download | gentoo-80f9bed892f17cb69eaab7ac9a1fa547384c4927.tar.gz gentoo-80f9bed892f17cb69eaab7ac9a1fa547384c4927.tar.bz2 gentoo-80f9bed892f17cb69eaab7ac9a1fa547384c4927.zip | |
sys-boot/os-prober: Make boot-detected-twice patch POSIX sh compliant
This versions modfies the patch added by -r2 to be POSIX sh compliant.
For this we just replace the '==' in line 15 with '-eq'.
Closes: https://bugs.gentoo.org/932098
Signed-off-by: Enno Tensing <tenno@suij.in>
Closes: https://github.com/gentoo/gentoo/pull/36725
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'sys-boot/os-prober/files')
| -rw-r--r-- | sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch new file mode 100644 index 000000000000..58e592ae7e8e --- /dev/null +++ b/sys-boot/os-prober/files/os-prober-1.81-boot-detected-twice-v3.patch @@ -0,0 +1,57 @@ +diff --git a/common.sh b/common.sh +index cc7a335..820caea 100644 +--- a/common.sh ++++ b/common.sh +@@ -326,3 +326,26 @@ umount() { + fi + } + ++list_mounts() { ++ if [ -f /proc/self/mountinfo ]; then ++ local x dev mount devs found mountinfo_placeholders ++ found=: ++ ++ # mountinfo may have 10 or 11 fields depending on mount namespaces ++ if [ $(head -n1 /proc/self/mountinfo | wc -w) -eq 10 ]; then ++ mountinfo_placeholders="x x" ++ else ++ mountinfo_placeholders="x x x" ++ fi ++ ++ while read -r x x dev x mount ${mountinfo_placeholders} 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 ++} +diff --git a/linux-boot-prober b/linux-boot-prober +index bacf219..804d9fe 100755 +--- a/linux-boot-prober ++++ b/linux-boot-prober +@@ -17,7 +17,7 @@ bootmnt= + bootsv= + bootuuid= + +-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" || true ++list_mounts >"$OS_PROBER_TMP/mounted-map" || true + + if [ -z "$1" ]; then + ERR=y +diff --git a/os-prober b/os-prober +index b76d85b..8b0c89b 100755 +--- a/os-prober ++++ b/os-prober +@@ -128,7 +128,7 @@ done + + # We need to properly canonicalize partitions with mount points and partitions + # used in RAID +-grep "^/dev/" /proc/mounts | parse_proc_mounts >"$OS_PROBER_TMP/mounted-map" || true ++list_mounts >"$OS_PROBER_TMP/mounted-map" || true + : >"$OS_PROBER_TMP/swaps-map" + if [ -f /proc/swaps ]; then + grep "^/dev/" /proc/swaps | parse_proc_swaps >"$OS_PROBER_TMP/swaps-map" || true |