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)
29 lines
950 B
Diff
29 lines
950 B
Diff
diff -up os-prober-1.57/common.sh.bootpartnamefix os-prober-1.57/common.sh
|
|
--- os-prober-1.57/common.sh.bootpartnamefix 2013-02-03 23:56:39.585511891 +0330
|
|
+++ os-prober-1.57/common.sh 2013-02-05 19:42:14.652151904 +0330
|
|
@@ -246,7 +246,7 @@ linux_mount_boot () {
|
|
if [ "$bindfrom" != "$tmpmnt/boot" ]; then
|
|
if mount --bind "$bindfrom" "$tmpmnt/boot"; then
|
|
mounted=1
|
|
- bootpart="$1"
|
|
+ bootpart="$tmppart"
|
|
else
|
|
debug "failed to bind-mount $bindfrom onto $tmpmnt/boot"
|
|
fi
|
|
@@ -254,6 +254,15 @@ linux_mount_boot () {
|
|
fi
|
|
if [ "$mounted" ]; then
|
|
:
|
|
+ elif [ -e "$tmppart" ]; then
|
|
+ bootpart="$tmppart"
|
|
+ boottomnt="$tmppart"
|
|
+ elif [ -e "$tmpmnt/$tmppart" ]; then
|
|
+ bootpart="$tmppart"
|
|
+ boottomnt="$tmpmnt/$tmppart"
|
|
+ elif [ -e "/target/$tmppart" ]; then
|
|
+ bootpart="$tmppart"
|
|
+ boottomnt="/target/$tmppart"
|
|
elif [ -e "$1" ]; then
|
|
bootpart="$1"
|
|
boottomnt="$1"
|