mirror of
git://slackware.nl/current.git
synced 2025-02-05 20:46:11 +01:00
8519278b64
a/kernel-generic-4.19.63-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.63-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.63-x86_64-1.txz: Upgraded. a/libgudev-233-x86_64-1.txz: Upgraded. a/os-prober-1.77-x86_64-2.txz: Rebuilt. Patched to fix lvm2 detection. Thanks to USUARIONUEVO. ap/man-db-2.8.6-x86_64-1.txz: Upgraded. ap/man-pages-5.02-noarch-1.txz: Upgraded. d/kernel-headers-4.19.63-x86-1.txz: Upgraded. d/re2c-1.2-x86_64-1.txz: Upgraded. k/kernel-source-4.19.63-noarch-1.txz: Upgraded. l/Mako-1.1.0-x86_64-1.txz: Upgraded. l/babl-0.1.70-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_59-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
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 @@
|
|
sed 's/\\011/ /g; s/\\012/\n/g; s/\\040/ /g; s/\\134/\\/g'
|
|
}
|
|
|
|
+ro_partition () {
|
|
+ if type blockdev >/dev/null 2>&1 && \
|
|
+ [ "$(blockdev --getro "$1")" = 0 ] && \
|
|
+ blockdev --setro "$1"; then
|
|
+ cleanup_ro_partitions="${cleanup_ro_partitions:+$cleanup_ro_partitions }$1"
|
|
+ trap cleanup EXIT HUP INT QUIT TERM
|
|
+ fi
|
|
+}
|
|
+
|
|
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
|
|
@@ -69,6 +69,15 @@
|
|
debug "mounted using GRUB, but unknown filesystem?"
|
|
type=fuseblk
|
|
fi
|
|
+else
|
|
+ ro_partition "$partition"
|
|
+ for type in $types $delaytypes; do
|
|
+ if mount -o ro -t "$type" "$partition" "$tmpmnt" 2>/dev/null; then
|
|
+ debug "mounted as $type filesystem"
|
|
+ mounted=1
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
fi
|
|
|
|
if [ "$mounted" ]; then
|