pool/os-prober
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
ec03b6538c
os-prober/os-prober-1.49-grub2-mount.patch

65 lines
2.9 KiB
Diff
Raw Normal View History

Accepting request 265202 from home:scarabeus_iv - 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
2014-12-18 15:15:54 +01:00
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 @@
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
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"
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
- if type grub-mount >/dev/null 2>&1 && \
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
- grub-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
+ if type grub2-mount >/dev/null 2>&1 && \
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
+ grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
mounted=1
else
ro_partition "$boottomnt"
Accepting request 265202 from home:scarabeus_iv - 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
2014-12-18 15:15:54 +01:00
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 @@
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
fi
mounted=
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
-if type grub-mount >/dev/null 2>&1 && \
- type grub-probe >/dev/null 2>&1 && \
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
+if type grub2-mount >/dev/null 2>&1 && \
+ type grub2-probe >/dev/null 2>&1 && \
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
+ grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
mounted=1
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
- type="$(grub-probe -d "$partition" -t fs)"
+ type="$(grub2-probe -d "$partition" -t fs)"
[ "$type" ] || type=fuseblk
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
else
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
ro_partition "$partition"
Accepting request 265202 from home:scarabeus_iv - 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
2014-12-18 15:15:54 +01:00
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 @@
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
fi
mounted=
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
-if type grub-mount >/dev/null 2>&1 && \
- type grub-probe >/dev/null 2>&1 && \
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
- grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
+if type grub2-mount >/dev/null 2>&1 && \
+ type grub2-probe >/dev/null 2>&1 && \
Accepting request 149432 from home:arvidjaar:bnc:799457:grub-mount - In openSUSE grub-mount is called grub2-mount It may fix bnc#767272. OBS-URL: https://build.opensuse.org/request/show/149432 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=16
2013-01-22 05:50:36 +01:00
+ grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
mounted=1
Accepting request 179592 from home:arvidjaar:grub2-next Companion to new grub2. Probably should not be accepted standalone, as it has at least one small patch that depends on new code in grub2. OBS-URL: https://build.opensuse.org/request/show/179592 OBS-URL: https://build.opensuse.org/package/show/Base:System/os-prober?expand=0&rev=27
2013-06-19 04:22:25 +02:00
- type="$(grub-probe -d "$partition" -t fs)" || true
+ type="$(grub2-probe -d "$partition" -t fs)" || true
if [ "$type" ]; then
debug "mounted using GRUB $type filesystem driver"
else
Accepting request 265202 from home:scarabeus_iv - 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
2014-12-18 15:15:54 +01:00
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.
Reference in New Issue Copy Permalink