pool/os-prober
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 265202 from home:scarabeus_iv

Browse Source 
- Version bujmp to 1.65:
  * use latest in debian to be up par patch wise
  * Drop reiserfs, it's no longer supported.
    - we actually still support it as we patch this class away
      anyway, but still they have it in their changes...
  * Add ppc64el support.  Closes: #752416.
  * Recognise the new ignore_uefi flag from partman-efi.
- Refresh all patches to still apply:
  * os-prober-1.49-grub2-mount.patch
  * os-prober-call-dmraid-once.patch
  * os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
- Always delete all the .orig files as sometimes even upstream
  put them to tarball :)

OBS-URL: https://build.opensuse.org/request/show/265202
OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=47
This commit is contained in:
Marcus Meissner
2014-12-18 14:15:54 +00:00
committed by Git OBS Bridge
parent cc70b6df24
commit f596597b43
7 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
os-prober-1.49-grub2-mount.patch
View File

@@ -1,34 +1,7 @@
From: Andrey Borzenkov <arvidjaar@gmail.com>
Subject: replace grub-mount with grub2-mount everywhere
References: bnc#799457, bnc#767272
We use grub2-mount, not grub-mount. As shown in bnc#799457,
grub2-mount may access filesystem even when kernel driver
will refuse it. os-prober makes devices read-only to prevent
accidental damage, so kernel driver fails if log replay is needed
but cannot be performed.
This may likely fix bnc#767272
Index: os-prober-1.57/os-probes/init/common/10filesystems
===================================================================
--- os-prober-1.57.orig/os-probes/init/common/10filesystems
+++ os-prober-1.57/os-probes/init/common/10filesystems
@@ -3,7 +3,7 @@
set +e # ignore errors from modprobe
FILESYSTEMS='ext2 ext3 ext4 reiserfs xfs jfs msdos vfat ntfs minix hfs hfsplus qnx4 ufs btrfs'
-# fuse is needed to make grub-mount work.
+# fuse is needed to make grub2-mount work.
FILESYSTEMS="$FILESYSTEMS fuse"
# The Ubuntu kernel udebs put a number of filesystem modules in
# fs-{core,secondary}-modules. It's fairly cheap to check for these too.
Index: os-prober-1.57/common.sh
===================================================================
--- os-prober-1.57.orig/common.sh
+++ os-prober-1.57/common.sh
@@ -259,8 +259,8 @@ linux_mount_boot () {
diff -urN os-prober.old/common.sh os-prober/common.sh
--- os-prober.old/common.sh 2014-12-14 19:04:07.711368751 +0100
+++ os-prober/common.sh 2014-12-14 19:04:29.792443896 +0100
@@ -259,8 +259,8 @@
debug "found boot partition $1 for linux system on $partition, but cannot map to existing device"
else
debug "found boot partition $bootpart for linux system on $partition"
@@ -39,11 +12,10 @@ Index: os-prober-1.57/common.sh
mounted=1
else
ro_partition "$boottomnt"
Index: os-prober-1.57/linux-boot-probes/common/50mounted-tests
===================================================================
--- os-prober-1.57.orig/linux-boot-probes/common/50mounted-tests
+++ os-prober-1.57/linux-boot-probes/common/50mounted-tests
@@ -34,11 +34,11 @@ if [ ! -d "$tmpmnt" ]; then
diff -urN os-prober.old/linux-boot-probes/common/50mounted-tests os-prober/linux-boot-probes/common/50mounted-tests
--- os-prober.old/linux-boot-probes/common/50mounted-tests 2014-12-14 19:04:07.711368751 +0100
+++ os-prober/linux-boot-probes/common/50mounted-tests 2014-12-14 19:04:29.792443896 +0100
@@ -34,11 +34,11 @@
fi
mounted=
@@ -59,11 +31,10 @@ Index: os-prober-1.57/linux-boot-probes/common/50mounted-tests
[ "$type" ] || type=fuseblk
else
ro_partition "$partition"
Index: os-prober-1.57/os-probes/common/50mounted-tests
===================================================================
--- os-prober-1.57.orig/os-probes/common/50mounted-tests
+++ os-prober-1.57/os-probes/common/50mounted-tests
@@ -49,11 +49,11 @@ if [ ! -d "$tmpmnt" ]; then
diff -urN os-prober.old/os-probes/common/50mounted-tests os-prober/os-probes/common/50mounted-tests
--- os-prober.old/os-probes/common/50mounted-tests 2014-12-14 19:04:07.712368755 +0100
+++ os-prober/os-probes/common/50mounted-tests 2014-12-14 19:04:29.793443899 +0100
@@ -46,11 +46,11 @@
fi
mounted=
@@ -79,3 +50,15 @@ Index: os-prober-1.57/os-probes/common/50mounted-tests
if [ "$type" ]; then
debug "mounted using GRUB $type filesystem driver"
else
diff -urN os-prober.old/os-probes/init/common/10filesystems os-prober/os-probes/init/common/10filesystems
--- os-prober.old/os-probes/init/common/10filesystems 2014-12-14 19:04:07.713368758 +0100
+++ os-prober/os-probes/init/common/10filesystems 2014-12-14 19:04:54.182526874 +0100
@@ -3,7 +3,7 @@
set +e # ignore errors from modprobe
FILESYSTEMS='ext2 ext3 ext4 xfs jfs msdos vfat ntfs minix hfs hfsplus qnx4 ufs btrfs'
-# fuse is needed to make grub-mount work.
+# fuse is needed to make grub2-mount work.
FILESYSTEMS="$FILESYSTEMS fuse"
# The Ubuntu kernel udebs put a number of filesystem modules in
# fs-{core,secondary}-modules. It's fairly cheap to check for these too.