summaryrefslogtreecommitdiffstats
path: root/source/a/os-prober/os-prober.lvm2.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/os-prober/os-prober.lvm2.diff')
-rw-r--r--source/a/os-prober/os-prober.lvm2.diff25
1 files changed, 18 insertions, 7 deletions
diff --git a/source/a/os-prober/os-prober.lvm2.diff b/source/a/os-prober/os-prober.lvm2.diff
index 91f527256..a3fbf2c33 100644
--- a/source/a/os-prober/os-prober.lvm2.diff
+++ b/source/a/os-prober/os-prober.lvm2.diff
@@ -1,7 +1,18 @@
-diff -ru os-prober-1.77/common.sh os-prober-1.77.new/common.sh
---- os-prober-1.77/common.sh 2018-08-10 21:23:18.000000000 +0200
-+++ os-prober-1.77.new/common.sh 2019-08-03 23:37:48.466380378 +0200
-@@ -176,6 +176,15 @@
+diff -u -r --new-file os-prober-1.77.orig/common.sh os-prober-1.77/common.sh
+--- os-prober-1.77.orig/common.sh 2018-08-10 14:23:18.000000000 -0500
++++ os-prober-1.77/common.sh 2019-08-05 23:39:13.130356299 -0500
+@@ -4,6 +4,10 @@
+
+ cleanup_tmpdir=false
+ cleanup () {
++ local partition
++ for partition in $cleanup_ro_partitions; do
++ blockdev --setrw "$partition"
++ done
+ if $cleanup_tmpdir; then
+ rm -rf "$OS_PROBER_TMP"
+ fi
+@@ -176,6 +180,15 @@
sed 's/\\011/ /g; s/\\012/\n/g; s/\\040/ /g; s/\\134/\\/g'
}
@@ -17,9 +28,9 @@ diff -ru os-prober-1.77/common.sh os-prober-1.77.new/common.sh
find_label () {
local output
if type blkid >/dev/null 2>&1; then
-diff -ru os-prober-1.77/os-probes/common/50mounted-tests os-prober-1.77.new/os-probes/common/50mounted-tests
---- os-prober-1.77/os-probes/common/50mounted-tests 2018-08-10 21:23:18.000000000 +0200
-+++ os-prober-1.77.new/os-probes/common/50mounted-tests 2019-08-03 23:37:48.465380372 +0200
+diff -u -r --new-file os-prober-1.77.orig/os-probes/common/50mounted-tests os-prober-1.77/os-probes/common/50mounted-tests
+--- os-prober-1.77.orig/os-probes/common/50mounted-tests 2018-08-10 14:23:18.000000000 -0500
++++ os-prober-1.77/os-probes/common/50mounted-tests 2019-08-05 23:37:24.763351672 -0500
@@ -69,6 +69,15 @@
debug "mounted using GRUB, but unknown filesystem?"
type=fuseblk