1cc85085b1
(H.J. Lu) (bug #906847) - Fix naming of /boot partitions according to their fstab entry (bug #893472) - Don't generate .btrfsfix files which will be included in final rpm - Fix wrong boot partition set by linux-boot-prober when / and /boot are mounted (bug #906886) - Factor out 'logger', so that it is run once and logs are piped to it (John Reiser) (bug #875356)
25 lines
1008 B
Diff
25 lines
1008 B
Diff
diff -up os-prober-1.57/common.sh.mounted-partitions-fix os-prober-1.57/common.sh
|
|
--- os-prober-1.57/common.sh.mounted-partitions-fix 2013-02-05 20:58:03.041289214 +0330
|
|
+++ os-prober-1.57/common.sh 2013-02-05 20:58:03.044289177 +0330
|
|
@@ -123,7 +123,7 @@ parse_proc_mounts () {
|
|
set -f
|
|
set -- $line
|
|
set +f
|
|
- printf '%s %s %s\n' "$(mapdevfs "$1")" "$2" "$3"
|
|
+ printf '%s %s %s %s\n' "$(mapdevfs "$1")" "$2" "$3" "$1"
|
|
done
|
|
}
|
|
|
|
diff -up os-prober-1.57/linux-boot-prober.mounted-partitions-fix os-prober-1.57/linux-boot-prober
|
|
--- os-prober-1.57/linux-boot-prober.mounted-partitions-fix 2013-02-05 20:58:03.000000000 +0330
|
|
+++ os-prober-1.57/linux-boot-prober 2013-02-05 20:58:54.364647584 +0330
|
|
@@ -167,7 +167,7 @@ else
|
|
bootpart="${mountboot%% *}"
|
|
bootmounted="${mountboot#* }"
|
|
else
|
|
- bootpart="$partition"
|
|
+ bootpart="$(grep " $mpoint/boot " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 4)"
|
|
bootmounted=0
|
|
fi
|
|
for test in /usr/lib/linux-boot-probes/mounted/*; do
|