Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at 2013-01-29 07:01:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/os-prober (Old) and /work/SRC/openSUSE:Factory/.os-prober.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "os-prober", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes 2013-01-20 13:04:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-01-29 07:01:38.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Jan 19 19:12:20 UTC 2013 - [email protected] + +- os-prober-1.49-grub2-mount.patch (bnc#767272) + * In openSUSE grub-mount is called grub2-mount + +------------------------------------------------------------------- New: ---- os-prober-1.49-grub2-mount.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ --- /var/tmp/diff_new_pack.jJtVtO/_old 2013-01-29 07:01:40.000000000 +0100 +++ /var/tmp/diff_new_pack.jJtVtO/_new 2013-01-29 07:01:40.000000000 +0100 @@ -40,6 +40,8 @@ Patch3: os-prober-1.49-fix-grub2.cfg-parsing.patch # PATCH-FIX-OPENSUSE: Do not try to mount LVM2 PV [bnc#798604] Patch4: os-prober-1.49-skip-LVM2_member.patch +# PATCH-FIX-OPENSUSE: Use correct name for grub2-mount +Patch5: os-prober-1.49-grub2-mount.patch Requires: /bin/grep Requires: /bin/sed @@ -63,6 +65,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make %{?_smp_mflags} CC="%__cc" CFLAGS="%{optflags}" ++++++ os-prober-1.49-grub2-mount.patch ++++++ From: Andrey Borzenkov <[email protected]> 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/common.sh =================================================================== --- os-prober.orig/common.sh +++ os-prober/common.sh @@ -259,8 +259,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 which grub-mount >/dev/null 2>&1 && \ - grub-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then + if which grub2-mount >/dev/null 2>&1 && \ + grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then mounted=1 else ro_partition "$boottomnt" 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 @@ -34,8 +34,8 @@ if [ ! -d "$tmpmnt" ]; then fi mounted= -if which grub-mount >/dev/null 2>&1 && \ - grub-mount "$partition" "$tmpmnt" 2>/dev/null; then +if which grub2-mount >/dev/null 2>&1 && \ + grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then mounted=1 type=fuseblk else Index: os-prober/os-probes/common/50mounted-tests =================================================================== --- os-prober.orig/os-probes/common/50mounted-tests +++ os-prober/os-probes/common/50mounted-tests @@ -49,8 +49,8 @@ if [ ! -d "$tmpmnt" ]; then fi mounted= -if which grub-mount >/dev/null 2>&1 && \ - grub-mount "$partition" "$tmpmnt" 2>/dev/null; then +if which grub2-mount >/dev/null 2>&1 && \ + grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then debug "mounted using GRUB" mounted=1 type=fuseblk 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 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. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
