Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.0:Staging:A
os-prober
os-prober-1.49-grub2-mount.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File os-prober-1.49-grub2-mount.patch of Package os-prober
Index: os-prober/common.sh =================================================================== --- os-prober.orig/common.sh +++ os-prober/common.sh @@ -302,8 +302,8 @@ linux_mount_boot () { 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" - if type grub-mount >/dev/null 2>&1 && \ - grub-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then + if type grub2-mount >/dev/null 2>&1 && \ + grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then mounted=1 elif dm_device="$(do_dmsetup osprober-linux "$boottomnt")" && [ "$dm_device" ]; then if mountinfo=`mount -o ro "$dm_device" "$tmpmnt/boot" -t "$3"`; then Index: os-prober/linux-boot-probes/common/50mounted-tests =================================================================== --- os-prober.orig/linux-boot-probes/common/50mounted-tests +++ os-prober/linux-boot-probes/common/50mounted-tests @@ -55,11 +55,11 @@ fi mounted= dm_devices= -if type grub-mount >/dev/null 2>&1 && \ - type grub-probe >/dev/null 2>&1 && \ - grub-mount "$partition" "$tmpmnt" 2>/dev/null; then +if type grub2-mount >/dev/null 2>&1 && \ + type grub2-probe >/dev/null 2>&1 && \ + grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then mounted=1 - type="$(grub-probe -d "$partition" -t fs)" + type="$(grub2-probe -d "$partition" -t fs)" [ "$type" ] || type=fuseblk elif dm_device="$(do_dmsetup osprober-linux "$partition")" && \ [ "$dm_device" ]; then Index: os-prober/os-probes/common/50mounted-tests =================================================================== --- os-prober.orig/os-probes/common/50mounted-tests +++ os-prober/os-probes/common/50mounted-tests @@ -66,11 +66,11 @@ if [ ! -d "$tmpmnt" ]; then fi mounted= -if type grub-mount >/dev/null 2>&1 && \ - type grub-probe >/dev/null 2>&1 && \ - grub-mount "$partition" "$tmpmnt" 2>/dev/null; then +if type grub2-mount >/dev/null 2>&1 && \ + type grub2-probe >/dev/null 2>&1 && \ + grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then mounted=1 - 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 Index: os-prober/os-probes/init/common/10filesystems =================================================================== --- os-prober.orig/os-probes/init/common/10filesystems +++ os-prober/os-probes/init/common/10filesystems @@ -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.
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor