commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2020-09-21 17:04:32

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new.4249 (New)


Package is "os-prober"

Mon Sep 21 17:04:32 2020 rev:54 rq:835224 version:1.77

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2020-08-27 
14:42:05.777226284 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new.4249/os-prober.changes
2020-09-21 17:05:53.543055252 +0200
@@ -1,0 +2,10 @@
+Tue Sep 15 21:35:51 UTC 2020 - Dirk Mueller 
+
+- update to 1.77:
+  * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
+  * Add CI configuration for gitlab
+  * Change priority of os-prober binary package to optional, since
+"Priority: extra" is now deprecated.
+  * Remove trailing whitespaces from changelog file, to fix lintian tag.
+
+---

Old:

  os-prober-1.76.tar.bz2

New:

  os-prober-1.77.tar.bz2



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.q1XmHV/_old  2020-09-21 17:05:58.679059869 +0200
+++ /var/tmp/diff_new_pack.q1XmHV/_new  2020-09-21 17:05:58.683059873 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   os-prober
-Version:1.76
+Version:1.77
 Release:0
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0-or-later

++ os-prober-1.76.tar.bz2 -> os-prober-1.77.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-prober-1.76/debian/.gitlab-ci.yml 
new/os-prober-1.77/debian/.gitlab-ci.yml
--- old/os-prober-1.76/debian/.gitlab-ci.yml1970-01-01 01:00:00.0 
+0100
+++ new/os-prober-1.77/debian/.gitlab-ci.yml2018-12-23 19:57:19.0 
+0100
@@ -0,0 +1,17 @@
+build:
+  stage: build
+
+  before_script:
+- apt update && apt -y install devscripts git-buildpackage
+- mk-build-deps --tool "apt -y -o Debug::pkgProblemResolver=yes 
--no-install-recommends" --install -r debian/control
+
+  script:
+- git checkout $CI_COMMIT_REF_NAME
+- git pull
+- gbp buildpackage -uc -us --git-ignore-branch
+- mkdir build
+- mv ../*.udeb build/
+
+  artifacts:
+paths:
+  - build/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-prober-1.76/debian/changelog 
new/os-prober-1.77/debian/changelog
--- old/os-prober-1.76/debian/changelog 2017-06-28 07:28:03.0 +0200
+++ new/os-prober-1.77/debian/changelog 2018-12-23 19:57:19.0 +0100
@@ -1,3 +1,20 @@
+os-prober (1.77) unstable; urgency=medium
+
+  [ Cyril Brulebois ]
+  * Update Vcs-{Browser,Git} to point to salsa (alioth's replacement).
+
+  [ Philip Hands ]
+  * Add CI configuration for gitlab
+
+  [ Colin Watson ]
+  * Change priority of os-prober binary package to optional, since
+"Priority: extra" is now deprecated.
+
+  [ Holger Wansing ]
+  * Remove trailing whitespaces from changelog file, to fix lintian tag.
+
+ -- Holger Wansing   Sun, 23 Dec 2018 19:52:58 +0100
+
 os-prober (1.76) unstable; urgency=medium
 
   [ Cyril Brulebois ]
@@ -281,7 +298,7 @@
 
   [ Joey Hess ]
   * Avoid false positives in MS-DOS detection by also looking for
-autoexec.bat. Closes: #663540 
+autoexec.bat. Closes: #663540
 
   [ Colin Watson ]
   * When using grub-mount, pass the GRUB filesystem type to individual tests
@@ -395,7 +412,7 @@
   * Fix Windows Vista and Windows Recovery Environment partitions
 recognition. (Thanks, Bouke Bunnik)
 Closes: #589676, LP: #476625
-  * Allow recognition of recent MINIX installations. 
+  * Allow recognition of recent MINIX installations.
 Thanks to Feiran Zheng
 Closes: #592924
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-prober-1.76/debian/control 
new/os-prober-1.77/debian/control
--- old/os-prober-1.76/debian/control   2017-06-28 07:28:03.0 +0200
+++ new/os-prober-1.77/debian/control   2018-12-23 19:57:19.0 +0100
@@ -5,8 +5,8 @@
 Uploaders: Colin Watson , Christian Perrier 
, Steve McIntyre <93...@debian.org>
 Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.15.7)
 Standards-Version: 3.9.4
-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/os-prober.git
-Vcs-Git: https://anonscm.debian.org/git/d-i/os-prober.git
+Vcs-Browser: https://salsa.debian.org/installer-team/os-prober
+Vcs-Git: https://salsa.debian.org/installer-team/os-prober.git
 
 Package: os-prober-udeb
 Package-Type: udeb
@@ -21,7 +21,6 @@
 Package: os-prober
 Architecture: any
 Section: utils
-Priority: extra
 Depends: ${shlibs:Depends}, 

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2020-08-27 14:42:05

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new.3399 (New)


Package is "os-prober"

Thu Aug 27 14:42:05 2020 rev:53 rq:829948 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2019-09-07 
11:24:25.578503274 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new.3399/os-prober.changes
2020-08-27 14:42:05.777226284 +0200
@@ -1,0 +2,7 @@
+Thu Aug 27 08:39:13 UTC 2020 - Dominique Leuenberger 
+
+- Install os-prober files to %{_prefix}/lib: os-prober and all its
+  subscripts have /usr/lib hardcoded, so changing the location on
+  the fly is no good idea (boo#1175815).
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.kCw6Hq/_old  2020-08-27 14:42:06.577225541 +0200
+++ /var/tmp/diff_new_pack.kCw6Hq/_new  2020-08-27 14:42:06.581225537 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0-or-later
 Group:  System/Boot
-Url:https://salsa.debian.org/installer-team/os-prober
+URL:https://salsa.debian.org/installer-team/os-prober
 Source0:
https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2
 Source1:COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
@@ -134,7 +134,7 @@
 install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name}
 
 install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir}
-install -m 0755 -Dp newns %{buildroot}%{_libexecdir}/newns
+install -m 0755 -Dp newns %{buildroot}%{_prefix}/lib/newns
 install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh
 
 %ifarch m68k
@@ -152,24 +152,24 @@
 
 for probes in os-probes os-probes/mounted os-probes/init \
   linux-boot-probes linux-boot-probes/mounted; do
-install -m 755 -d %{buildroot}%{_libexecdir}/$probes
-cp -a $probes/common/* %{buildroot}%{_libexecdir}/$probes
+install -m 755 -d %{buildroot}%{_prefix}/lib/$probes
+cp -a $probes/common/* %{buildroot}%{_prefix}/lib/$probes
 if [ -e "$probes/$ARCH" ]; then
-cp -a $probes/$ARCH/* %{buildroot}%{_libexecdir}/$probes
+cp -a $probes/$ARCH/* %{buildroot}%{_prefix}/lib/$probes
 fi
 done
 if [ "$ARCH" = x86 ]; then
 install -m 755 -p os-probes/mounted/powerpc/20macosx \
-%{buildroot}%{_libexecdir}/os-probes/mounted
+%{buildroot}%{_prefix}/lib/os-probes/mounted
 fi
 
 %files
 %defattr(-,root,root,-)
 %doc README TODO debian/copyright debian/changelog COPYING-note.txt
 %{_bindir}/*
-%{_libexecdir}/linux-boot-probes
-%{_libexecdir}/newns
-%{_libexecdir}/os-probes
+%{_prefix}/lib/linux-boot-probes
+%{_prefix}/lib/newns
+%{_prefix}/lib/os-probes
 %{_datadir}/%{name}
 %{_localstatedir}/lib/%{name}
 

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2019-09-07 11:24:24

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new.7948 (New)


Package is "os-prober"

Sat Sep  7 11:24:24 2019 rev:52 rq:726443 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2019-04-30 
12:55:40.978203213 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new.7948/os-prober.changes
2019-09-07 11:24:25.578503274 +0200
@@ -1,0 +2,16 @@
+Tue Aug 13 08:12:58 UTC 2019 - Michael Chang 
+
+- Fix duplicated distro detected on btrfs multiple device (bsc#1142858)
+  * os-prober-btrfs-multiple-device.patch
+
+---
+Tue Aug 13 07:48:14 UTC 2019 - Michael Chang 
+
+- Update URL for downloading source archive from Debain Salsa server
+  * os-prober.spec
+- Added
+  * os-prober-1.76.tar.bz2
+- Removed
+  * os-prober_1.76.tar.xz
+
+---

Old:

  os-prober_1.76.tar.xz

New:

  os-prober-1.76.tar.bz2
  os-prober-btrfs-multiple-device.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.AjwSJZ/_old  2019-09-07 11:24:26.314503172 +0200
+++ /var/tmp/diff_new_pack.AjwSJZ/_new  2019-09-07 11:24:26.318503172 +0200
@@ -23,7 +23,7 @@
 License:GPL-2.0-or-later
 Group:  System/Boot
 Url:https://salsa.debian.org/installer-team/os-prober
-Source0:%{name}_%{version}.tar.xz
+Source0:
https://salsa.debian.org/installer-team/os-prober/-/archive/%{version}/%{name}-%{version}.tar.bz2
 Source1:COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
 # can be automatically generated for it
@@ -73,6 +73,8 @@
 # PATCH-FIX-OPENSUSE: os-prober isn't compatible with transactional update 
(boo#1125729)
 # PATCH-FIX-OPENSUSE: os-prober deletes subvolume on btrfs disk (boo#1130669)
 Patch28:os-prober-use-tmp-over-var-lib-for-transient-files.patch
+# PATCH-FIX-OPENSUSE: Two TW selections is shown in GRUB after installing 
system with multi-device Btrfs (bsc#1142858)
+Patch29:os-prober-btrfs-multiple-device.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -118,6 +120,7 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-btrfs-multiple-device.patch ++
Index: os-prober-1.76/os-prober
===
--- os-prober-1.76.orig/os-prober
+++ os-prober-1.76/os-prober
@@ -161,6 +161,15 @@ fi
 
 : >"$OS_PROBER_TMP/btrfs-vols"
 
+btrfsrootdev=$(sed -n -e 
's!\([^\s]\+\)\s\+\(/\|/target/boot\|/target\)\s\+btrfs!\1!p;ta;b;:a;q' 
"$OS_PROBER_TMP/mounted-map")
+if [ -n "$btrfsrootdev" ] ; then
+   if btrfsrootdev="$(mapdevfs "$btrfsrootdev")"; then
+   btrfsrootdevuuid=$(blkid -o value -s UUID "$btrfsrootdev")
+   debug "btrfs is mounted as root, uuid: $btrfsrootdevuuid"
+   echo "$btrfsrootdevuuid" >>"$OS_PROBER_TMP/btrfs-vols"
+   fi
+fi
+
 for partition in $(partitions); do
if ! mapped="$(mapdevfs "$partition")"; then
log "Device '$partition' does not exist; skipping"
@@ -183,13 +192,9 @@ for partition in $(partitions); do
# be handled by 50mounted-tests so we can do a subvol only once.
type=$(blkid -o value -s TYPE $mapped || true)
if [ "$type" = btrfs ]; then
-   mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head 
-n1 | cut -d " " -f 2)
-   mpoint="$(unescape_mount "$mpoint")"
-   if [ "$mpoint" = "/target/boot" ] || [ "$mpoint" = "/target" ] 
|| [ "$mpoint" = "/" ]; then
-   continue
-   fi
uuid=$(blkid -o value -s UUID $mapped)
if grep -q "^$uuid" "$OS_PROBER_TMP/btrfs-vols" ; then
+   debug "skipped btrfs partition=$partition uuid=$uuid"
continue
fi
debug "btrfs volume uuid=$uuid partition=$partition"

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2019-04-30 12:55:39

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new.5536 (New)


Package is "os-prober"

Tue Apr 30 12:55:39 2019 rev:51 rq:697791 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2019-03-14 
14:54:06.175772300 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new.5536/os-prober.changes
2019-04-30 12:55:40.978203213 +0200
@@ -1,0 +2,6 @@
+Tue Apr 23 07:42:32 UTC 2019 - mchang 
+
+- Fix accidental deletion of btrfs subvolume (boo#1130669)
+  * os-prober-use-tmp-over-var-lib-for-transient-files.patch
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.FcsJNK/_old  2019-04-30 12:55:42.202204411 +0200
+++ /var/tmp/diff_new_pack.FcsJNK/_new  2019-04-30 12:55:42.202204411 +0200
@@ -71,6 +71,7 @@
 # PATCH-FIX-OPENSUSE: os-prober unconditionally pulls btrfsprogs (boo#1118279)
 Patch27:os-prober-make-btrfsprogs-optional.patch
 # PATCH-FIX-OPENSUSE: os-prober isn't compatible with transactional update 
(boo#1125729)
+# PATCH-FIX-OPENSUSE: os-prober deletes subvolume on btrfs disk (boo#1130669)
 Patch28:os-prober-use-tmp-over-var-lib-for-transient-files.patch
 Requires:   /bin/grep
 Requires:   /bin/sed

++ os-prober-use-tmp-over-var-lib-for-transient-files.patch ++
--- /var/tmp/diff_new_pack.FcsJNK/_old  2019-04-30 12:55:42.274204482 +0200
+++ /var/tmp/diff_new_pack.FcsJNK/_new  2019-04-30 12:55:42.274204482 +0200
@@ -9,6 +9,12 @@
 file for the caculation.
 
 https://en.opensuse.org/openSUSE:Packaging_for_transactional-updates
+
+v2:
+- Fix accidental deletion of btrfs subvolume (boo#1130669).
+- Fix detection of btrfs boot subvolume if its /etc/fstab entry contains
+  leading slash for subvol= mount option.
+
 ---
  common.sh| 37 ++--
  linux-boot-prober|  2 +-
@@ -17,10 +23,10 @@
  os-probes/common/50mounted-tests |  2 +-
  5 files changed, 19 insertions(+), 27 deletions(-)
 
-diff --git a/common.sh b/common.sh
-index 19d2668..d73718c 100644
 a/common.sh
-+++ b/common.sh
+Index: os-prober-1.76/common.sh
+===
+--- os-prober-1.76.orig/common.sh
 os-prober-1.76/common.sh
 @@ -21,31 +21,26 @@ require_tmpdir() {
fi
  }
@@ -69,36 +75,125 @@
  }
  
  progname=
-diff --git a/linux-boot-prober b/linux-boot-prober
-index 243fd6c..4d0f5e8 100755
 a/linux-boot-prober
-+++ b/linux-boot-prober
-@@ -7,7 +7,7 @@ newns "$@"
+Index: os-prober-1.76/linux-boot-prober
+===
+--- os-prober-1.76.orig/linux-boot-prober
 os-prober-1.76/linux-boot-prober
+@@ -7,11 +7,6 @@ newns "$@"
  require_tmpdir
  ERR="n"
  
 -tmpmnt=/var/lib/os-prober/mount
-+tmpmnt="$OS_PROBER_TMP/mount"
- if [ ! -d "$tmpmnt" ]; then
-   mkdir "$tmpmnt"
+-if [ ! -d "$tmpmnt" ]; then
+-  mkdir "$tmpmnt"
+-fi
+-
+ mounted=
+ bootmnt=
+ bootsv=
+@@ -45,23 +40,21 @@ if [ "x$ERR" != xn ]; then
  fi
-diff --git a/linux-boot-probes/common/50mounted-tests 
b/linux-boot-probes/common/50mounted-tests
-index 84c3ced..7c9c717 100755
 a/linux-boot-probes/common/50mounted-tests
-+++ b/linux-boot-probes/common/50mounted-tests
-@@ -42,7 +42,7 @@ elif [ -z "$types" ]; then
+ 
+ if [ "$type" = btrfs ]; then
++  tmpmnt="$(mktemp -d /tmp/linux-boot-prober.XX)"
+   # handle all of the btrfs stuff here
+   if [ ! -e "/proc/self/mountinfo" ]; then
+   warn "/proc/self/mountinfo does not exist, exiting"
+-  umount "$tmpmnt" 2>/dev/null
+   rmdir "$tmpmnt" 2>/dev/null
+   exit 1
+   fi
+   mpoint=$(grep "btrfs" /proc/self/mountinfo | grep " /$subvol " | grep " 
$partition " | cut -d ' ' -f 5)
+   if [ "$mpoint" = "/" ]; then
+   warn "specifying active root not valid, exiting"
+-  umount "$tmpmnt" 2>/dev/null
+   rmdir "$tmpmnt" 2>/dev/null
+   exit 1
+   fi
+   if [ "$mpoint" = "$tmpmnt" ]; then
+   warn "btrfs subvol=$subvool, UUID=$UUID, already mounted on 
$tmpmnt **ERROR**"
+-  umount "$tmpmnt" 2>/dev/null
+   rmdir "$tmpmnt" 2>/dev/null
+   exit 1
+   fi
+@@ -74,8 +67,6 @@ if [ "$type" = btrfs ]; then
+ 
+   if ! mount $opts -t btrfs -U $UUID "$tmpmnt" 2>/dev/null; then
+   warn "error mounting btrfs subvol=$subvol UUID=$UUID"
+-

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2019-03-14 14:54:04

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new.28833 (New)


Package is "os-prober"

Thu Mar 14 14:54:04 2019 rev:50 rq:684190 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-12-19 
13:26:26.913160318 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new.28833/os-prober.changes   
2019-03-14 14:54:06.175772300 +0100
@@ -1,0 +2,15 @@
+Tue Mar 12 06:47:59 UTC 2019 - mchang 
+
+- Update URL to current development project in Debian Salsa server.
+- Update the Source0 to use local compressed archive since the remote URL is
+  not reliable to access, causing trouble to the factory-auto checker reporting
+  error as not valid one.
+  * os-prober.spec 
+
+---
+Thu Mar  7 08:56:53 UTC 2019 - mchang 
+
+- os-prober isn't compatible with transactional update (boo#1125729)
+  * os-prober-use-tmp-over-var-lib-for-transient-files.patch
+
+---

New:

  os-prober-use-tmp-over-var-lib-for-transient-files.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.7HRjWG/_old  2019-03-14 14:54:07.239772136 +0100
+++ /var/tmp/diff_new_pack.7HRjWG/_new  2019-03-14 14:54:07.243772135 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -22,8 +22,8 @@
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0-or-later
 Group:  System/Boot
-Url:http://kitenet.net/~joey/code/os-prober/
-Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.xz
+Url:https://salsa.debian.org/installer-team/os-prober
+Source0:%{name}_%{version}.tar.xz
 Source1:COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
 # can be automatically generated for it
@@ -70,6 +70,8 @@
 Patch26:os-prober-multiple-initrd.patch
 # PATCH-FIX-OPENSUSE: os-prober unconditionally pulls btrfsprogs (boo#1118279)
 Patch27:os-prober-make-btrfsprogs-optional.patch
+# PATCH-FIX-OPENSUSE: os-prober isn't compatible with transactional update 
(boo#1125729)
+Patch28:os-prober-use-tmp-over-var-lib-for-transient-files.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -114,6 +116,7 @@
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 find . -name \*.orig -delete
 
 %build
@@ -121,6 +124,9 @@
 
 %install
 install -m 0755 -d %{buildroot}%{_bindir}
+# See also boo#1125729, we no longer use /var/lib/os-prober for runtime
+# temporary files, but to keep compatible with upstream runtime we still keep
+# it in place.
 install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name}
 
 install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir}

++ os-prober-use-tmp-over-var-lib-for-transient-files.patch ++
>From 2ed7c3ae98aa671d504eba254fdd89ea26fe15c8 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Thu, 7 Mar 2019 16:31:19 +0800
Subject: [PATCH] Use /tmp over /var/lib for transient files

Create transient mount point in directory /tmp rather than /var/lib
which is not available during transactional update. Also clean up the
count_last_label function for not relying on /var/lib/os-prober/labels
file for the caculation.

https://en.opensuse.org/openSUSE:Packaging_for_transactional-updates
---
 common.sh| 37 ++--
 linux-boot-prober|  2 +-
 linux-boot-probes/common/50mounted-tests |  2 +-
 os-prober|  3 ---
 os-probes/common/50mounted-tests |  2 +-
 5 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/common.sh b/common.sh
index 19d2668..d73718c 100644
--- a/common.sh
+++ b/common.sh
@@ -21,31 +21,26 @@ require_tmpdir() {
   fi
 }
 
-count_for() {
-  _labelprefix="$1"
-  _result=$(grep "^${_labelprefix} " /var/lib/os-prober/labels 

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-12-19 13:26:15

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new.28833 (New)


Package is "os-prober"

Wed Dec 19 13:26:15 2018 rev:49 rq:657083 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-11-06 
15:33:39.639768698 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new.28833/os-prober.changes   
2018-12-19 13:26:26.913160318 +0100
@@ -1,0 +2,6 @@
+Tue Dec 11 07:30:19 UTC 2018 - mch...@suse.com
+
+- Don't hard require btrfsprogs by downgrading it to suggests (boo#1118279)
+  * os-prober-make-btrfsprogs-optional.patch
+
+---

New:

  os-prober-make-btrfsprogs-optional.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.tD54M0/_old  2018-12-19 13:26:27.537159558 +0100
+++ /var/tmp/diff_new_pack.tD54M0/_new  2018-12-19 13:26:27.541159554 +0100
@@ -68,15 +68,17 @@
 Patch25:os-prober-05efi-blkid.patch
 # PATCH-FIX-OPENSUSE: UEFI Grub does not insert Arch Linux entry correctly 
(boo#1101942)
 Patch26:os-prober-multiple-initrd.patch
+# PATCH-FIX-OPENSUSE: os-prober unconditionally pulls btrfsprogs (boo#1118279)
+Patch27:os-prober-make-btrfsprogs-optional.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
-Requires:   btrfsprogs
 Requires:   coreutils
 Requires:   udev
 Requires:   util-linux
 Recommends: dmraid
 Suggests:   lvm2
+Suggests:   btrfsprogs
 %if 0%{?suse_version} >= 1315
 # For logger utility
 Requires:   util-linux-systemd
@@ -111,6 +113,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-make-btrfsprogs-optional.patch ++
Index: os-prober-1.76/os-probes/common/50mounted-tests
===
--- os-prober-1.76.orig/os-probes/common/50mounted-tests
+++ os-prober-1.76/os-probes/common/50mounted-tests
@@ -151,11 +151,20 @@ if [ "$types" = btrfs ]; then
rmdir "$tmpmnt" || true
exit 1
fi
-   # besides regular subvols, get ro and snapshot so thet can be excluded
-subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e 
s!^\/!!)
-rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' -f 9 | 
sed -e s!^\/!!)
-sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' -f 14 | 
sed -e s!^\/!!)
-defaultvol=$(btrfs subvolume get-default "$tmpmnt" | cut -d ' ' -f 9)
+
+   if type btrfs >/dev/null 2>&1; then
+   # besides regular subvols, get ro and snapshot so thet can be 
excluded
+   subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | 
sed -e s!^\/!!)
+   rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' 
-f 9 | sed -e s!^\/!!)
+   sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' 
-f 14 | sed -e s!^\/!!)
+   defaultvol=$(btrfs subvolume get-default "$tmpmnt" | cut -d ' ' 
-f 9)
+   else
+   subvols=""
+   rosubvols=""
+   sssubvols=""
+   defaultvol=""
+   fi
+
 if ! umount "$tmpmnt"; then
 warn "failed to umount btrfs volume on $tmpmnt"
 rmdir "$tmpmnt" || true

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-11-06 15:32:59

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Tue Nov  6 15:32:59 2018 rev:48 rq:645858 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-10-22 
11:02:51.728299641 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-11-06 
15:33:39.639768698 +0100
@@ -1,0 +2,7 @@
+Wed Oct 31 07:08:10 UTC 2018 - mch...@suse.com
+
+- Fix missing grub-probe command that caused linux-boot-probe to abort
+  prematurely. It is a mistake while rebasing patch to 1.76 (bsc#1113615)
+  * os-prober-1.49-grub2-mount.patch 
+
+---



Other differences:
--
++ os-prober-1.49-grub2-mount.patch ++
--- /var/tmp/diff_new_pack.xINrQh/_old  2018-11-06 15:33:40.179767879 +0100
+++ /var/tmp/diff_new_pack.xINrQh/_new  2018-11-06 15:33:40.179767879 +0100
@@ -17,7 +17,7 @@
 ===
 --- os-prober-1.76.orig/linux-boot-probes/common/50mounted-tests
 +++ os-prober-1.76/linux-boot-probes/common/50mounted-tests
-@@ -48,11 +48,12 @@ if [ ! -d "$tmpmnt" ]; then
+@@ -48,11 +48,11 @@ if [ ! -d "$tmpmnt" ]; then
  fi
  
  mounted=
@@ -28,7 +28,7 @@
 +   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="$(grub-probe -d "$partition" -t fs)"
 +  type="$(grub2-probe -d "$partition" -t fs)"
[ "$type" ] || type=fuseblk
  fi

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-10-22 11:02:38

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Mon Oct 22 11:02:38 2018 rev:47 rq:641127 version:1.76

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-10-09 
15:53:05.366359352 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-10-22 
11:02:51.728299641 +0200
@@ -1,0 +2,13 @@
+Mon Oct  8 10:01:45 UTC 2018 - mch...@suse.com
+
+- Version bump to 1.76:
+  * Fix check on ID_PART_ENTRY_SCHEME, to look for "dos" instead of "msdos"
+  * Remove code using device mapper
+  * This also removes the dependency on dmsetup
+- Rediff
+  * os-prober-1.49-grub2-mount.patch
+  * os-prober-accept-ESP-on-IMSM.patch
+  * os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
+  * os-prober-fix-btrfs-subvol-mounted-tests.patch
+
+---

Old:

  os-prober_1.74.tar.xz

New:

  os-prober_1.76.tar.xz



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.xVSv2k/_old  2018-10-22 11:02:52.952298584 +0200
+++ /var/tmp/diff_new_pack.xVSv2k/_new  2018-10-22 11:02:52.952298584 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   os-prober
-Version:1.74
+Version:1.76
 Release:0
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0-or-later
@@ -77,7 +77,6 @@
 Requires:   util-linux
 Recommends: dmraid
 Suggests:   lvm2
-Recommends: dmsetup
 %if 0%{?suse_version} >= 1315
 # For logger utility
 Requires:   util-linux-systemd
@@ -89,7 +88,7 @@
 distributions can be added easily.
 
 %prep
-%setup -q -n os-prober
+%setup -q
 cp %{SOURCE1} .
 %patch0 -p1
 %patch1 -p1

++ os-prober-1.49-grub2-mount.patch ++
--- /var/tmp/diff_new_pack.xVSv2k/_old  2018-10-22 11:02:52.988298553 +0200
+++ /var/tmp/diff_new_pack.xVSv2k/_new  2018-10-22 11:02:52.988298553 +0200
@@ -1,8 +1,8 @@
-Index: os-prober/common.sh
+Index: os-prober-1.76/common.sh
 ===
 os-prober.orig/common.sh
-+++ os-prober/common.sh
-@@ -302,8 +302,8 @@ linux_mount_boot () {
+--- os-prober-1.76.orig/common.sh
 os-prober-1.76/common.sh
+@@ -279,8 +279,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"
@@ -11,16 +11,16 @@
 +  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
+   fi
+   fi
+Index: os-prober-1.76/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
+--- os-prober-1.76.orig/linux-boot-probes/common/50mounted-tests
 os-prober-1.76/linux-boot-probes/common/50mounted-tests
+@@ -48,11 +48,12 @@ if [ ! -d "$tmpmnt" ]; then
+ 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
@@ -28,16 +28,16 @@
 +   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="$(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
+ fi
+ 
+Index: os-prober-1.76/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 

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-10-09 15:52:15

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Tue Oct  9 15:52:15 2018 rev:46 rq:639760 version:1.74

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-06-18 
13:49:15.727514228 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-10-09 
15:53:05.366359352 +0200
@@ -1,0 +2,6 @@
+Tue Jul 31 09:16:55 UTC 2018 - mch...@suse.com
+
+- UEFI Grub does not insert Arch Linux entry correctly (boo#1101942)
+  * os-prober-multiple-initrd.patch
+
+---

New:

  os-prober-multiple-initrd.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.zdACuu/_old  2018-10-09 15:53:05.918358699 +0200
+++ /var/tmp/diff_new_pack.zdACuu/_new  2018-10-09 15:53:05.918358699 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 Version:1.74
 Release:0
 Summary:Probes disks on the system for installed operating systems
-License:GPL-2.0+
+License:GPL-2.0-or-later
 Group:  System/Boot
 Url:http://kitenet.net/~joey/code/os-prober/
 Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.xz
@@ -66,6 +66,8 @@
 Patch24:os-prober-linux-distro-parse-os-release.patch
 # PATCH-FIX-OPENSUSE: Windows 10 is not listed in the grub menu (bsc#1076779)
 Patch25:os-prober-05efi-blkid.patch
+# PATCH-FIX-OPENSUSE: UEFI Grub does not insert Arch Linux entry correctly 
(boo#1101942)
+Patch26:os-prober-multiple-initrd.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -109,6 +111,7 @@
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-multiple-initrd.patch ++
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -19,11 +19,11 @@ entry_result () {
# if path is not relative to subvolume make it relative
kernel=${kernel#${bsv}}
kernelfile=$kernel
-   initrd=${initrd#${bsv}}
+   initrd=`echo $initrd | sed -e "s!^${bsv}!!" -e 
"s!\\(\\s\\)${bsv}!\\1!g"`
if [ "x$GRUB_FS" != "xbtrfs" -o 
"x${SUSE_BTRFS_SNAPSHOT_BOOTING}" != "xtrue" ]; then
# absolute path needed: prepend subvolume if $kernel isn't 
empty
kernel=${kernel:+${bsv}}${kernel}
-   initrd=${initrd:+${bsv}}${initrd}
+   initrd=`echo $initrd | sed -e "s!\\(\\S\\+\\)!${bsv}\\1!g"`
fi
# assumed: rootsv != bootsv if rootsv isn't ancestor of bootsv
[ "$partition" != "$bootpart" -o "$rootsv" != "$bootsv" ] && 
kernelfile="/boot${kernelfile}"
@@ -105,10 +105,11 @@ parse_grub_menu () {
fi
;;
initrd|initrdefi|initrd16)
-   initrd="$(echo "$2" | sed 's/(.*)//')"
+   shift
+   initrd="$(echo "$@" | sed 's/(\S*)//g')"
# Initrd same.
if [ "$partition" != "$bootpart" -a "$type" != 
"btrfs" ]; then
-   initrd="/boot$initrd"
+   initrd=`echo $initrd | sed -e 
's!\(\S\+\)!/boot\1!g'`
fi
;;
"}")

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-06-18 13:49:06

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Mon Jun 18 13:49:06 2018 rev:45 rq:616818 version:1.74

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-03-01 
12:06:54.884023726 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-06-18 
13:49:15.727514228 +0200
@@ -1,0 +2,6 @@
+Thu Jun 14 07:11:24 UTC 2018 - josef.moell...@suse.com
+
+- Rather than Recommend lvm2 merely Suggest it.
+  [bsc#1026766, os-prober.spec]
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.5oHbcx/_old  2018-06-18 13:49:17.955431877 +0200
+++ /var/tmp/diff_new_pack.5oHbcx/_new  2018-06-18 13:49:17.959431730 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -74,7 +74,7 @@
 Requires:   udev
 Requires:   util-linux
 Recommends: dmraid
-Recommends: lvm2
+Suggests:   lvm2
 Recommends: dmsetup
 %if 0%{?suse_version} >= 1315
 # For logger utility

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-03-01 12:06:53

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Thu Mar  1 12:06:53 2018 rev:44 rq:580557 version:1.74

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-02-25 
11:32:54.611210405 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-03-01 
12:06:54.884023726 +0100
@@ -1,0 +2,7 @@
+Mon Feb 26 07:34:02 UTC 2018 - mch...@suse.com
+
+- Use blkid to bailout udevinfo for db not imported in chroot
+  environment (bsc#1076779)
+  * os-prober-05efi-blkid.patch
+
+---

New:

  os-prober-05efi-blkid.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.jC1xS0/_old  2018-03-01 12:06:55.528000613 +0100
+++ /var/tmp/diff_new_pack.jC1xS0/_new  2018-03-01 12:06:55.532000470 +0100
@@ -64,6 +64,8 @@
 Patch23:os-prober-linux-distro-avoid-expensive-ld-file-test.patch
 # PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465)
 Patch24:os-prober-linux-distro-parse-os-release.patch
+# PATCH-FIX-OPENSUSE: Windows 10 is not listed in the grub menu (bsc#1076779)
+Patch25:os-prober-05efi-blkid.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -106,6 +108,7 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-05efi-blkid.patch ++
Index: os-prober/os-probes/mounted/x86/05efi
===
--- os-prober.orig/os-probes/mounted/x86/05efi
+++ os-prober/os-probes/mounted/x86/05efi
@@ -46,6 +46,13 @@ if type udevinfo > /dev/null 2>&1; then
fi
fi
 
+   # udev may not work in chroot as its db may not be there, bailout that 
by blkid (bsc#1076779)
+   if [ -z "$ID_PART_ENTRY_TYPE" -a -z "$ID_PART_ENTRY_SCHEME" ] &&
+   type blkid > /dev/null 2>&1; then
+   debug "fallback to blkid"
+   eval "$(blkid -p -o udev "$partition" | grep -E 
'^(ID_PART_ENTRY_(TYPE|SCHEME))=')"
+   fi
+
debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME"
debug "$partition partition type is $ID_PART_ENTRY_TYPE"
 

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-02-25 11:32:53

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Sun Feb 25 11:32:53 2018 rev:43 rq:579378 version:1.74

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2018-02-05 
10:44:56.858954509 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-02-25 
11:32:54.611210405 +0100
@@ -1,0 +2,6 @@
+Fri Feb 23 04:40:59 UTC 2018 - mch...@suse.com
+
+- revert os-prober-05efi-udevinfo.patch as it messed up with strings
+  that could be named differently in which even with non ascil characters. 
+
+---

Old:

  os-prober-05efi-udevinfo.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.1kycJY/_old  2018-02-25 11:32:56.123155501 +0100
+++ /var/tmp/diff_new_pack.1kycJY/_new  2018-02-25 11:32:56.123155501 +0100
@@ -64,8 +64,6 @@
 Patch23:os-prober-linux-distro-avoid-expensive-ld-file-test.patch
 # PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465)
 Patch24:os-prober-linux-distro-parse-os-release.patch
-# PATCH-FIX-OPENSUSE: Windows 10 is not listed in the grub menu (bsc#1076779)
-Patch25:os-prober-05efi-udevinfo.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -108,7 +106,6 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 find . -name \*.orig -delete
 
 %build

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2018-02-05 10:44:55

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Mon Feb  5 10:44:55 2018 rev:42 rq:571875 version:1.74

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2017-03-05 
17:58:21.911703907 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2018-02-05 
10:44:56.858954509 +0100
@@ -1,0 +2,6 @@
+Wed Jan 31 09:46:34 UTC 2018 - mch...@suse.com
+
+- Fix Windows not listed in grub menu after install or upgrade (bsc#1076779)
+  * os-prober-05efi-udevinfo.patch
+
+---

New:

  os-prober-05efi-udevinfo.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.VKUZZg/_old  2018-02-05 10:44:57.842908440 +0100
+++ /var/tmp/diff_new_pack.VKUZZg/_new  2018-02-05 10:44:57.842908440 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -64,6 +64,8 @@
 Patch23:os-prober-linux-distro-avoid-expensive-ld-file-test.patch
 # PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465)
 Patch24:os-prober-linux-distro-parse-os-release.patch
+# PATCH-FIX-OPENSUSE: Windows 10 is not listed in the grub menu (bsc#1076779)
+Patch25:os-prober-05efi-udevinfo.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -106,6 +108,7 @@
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-05efi-udevinfo.patch ++
Index: os-prober/os-probes/mounted/x86/05efi
===
--- os-prober.orig/os-probes/mounted/x86/05efi
+++ os-prober/os-probes/mounted/x86/05efi
@@ -28,7 +28,7 @@ if type udevadm > /dev/null 2>&1; then
 fi
 
 if type udevinfo > /dev/null 2>&1; then
-   eval "$(udevinfo -q property -n "$partition" | grep -E 
'^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME))=')"
+   eval "$(udevinfo -q property -n "$partition" | sed -n -e 
's/\(.*\)=\(.*\)/\1="\2"/p' | grep -E 
'^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME)|PARTNAME)=')"
debug "$partition container is '$MD_CONTAINER'"
 
# Skip virtual devices unless they are known SW-RAID
@@ -48,13 +48,16 @@ if type udevinfo > /dev/null 2>&1; then
 
debug "$partition partition scheme is $ID_PART_ENTRY_SCHEME"
debug "$partition partition type is $ID_PART_ENTRY_TYPE"
+   debug "$partition partition name is $PARTNAME"
 
if [ -z "$ID_PART_ENTRY_TYPE" -o -z "$ID_PART_ENTRY_SCHEME" -o \
\( "$ID_PART_ENTRY_SCHEME" != gpt -a "$ID_PART_ENTRY_SCHEME" != 
dos \) -o \
\( "$ID_PART_ENTRY_SCHEME" = gpt -a "$ID_PART_ENTRY_TYPE" != 
c12a7328-f81f-11d2-ba4b-00a0c93ec93b \) -o \
\( "$ID_PART_ENTRY_SCHEME" = dos -a "$ID_PART_ENTRY_TYPE" != 
0xef \) ]; then
-   debug "$partition is not a ESP partition: exiting"
-   exit 1
+   if [ -z "$PARTNAME" -o  "$PARTNAME" != "EFI system partition" 
]; then
+   debug "$partition is not a ESP partition: exiting"
+   exit 1
+   fi
fi
 else
debug "udevinfo and udevadm missing - cannot check partition type"

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2017-03-05 17:57:52

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Sun Mar  5 17:57:52 2017 rev:41 rq:461777 version:1.74

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2017-02-22 
13:51:03.669436948 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2017-03-05 
17:58:21.911703907 +0100
@@ -1,0 +2,9 @@
+Wed Mar  1 04:58:40 UTC 2017 - mch...@suse.com
+
+- Fix btrfs 1.74 regression in detection btrfs, the do_unmount has to be
+  skipped for btrfs as it removes tmp mount point of which btrfs is making
+  use (bsc#1024196)
+  * modify os-prober-btrfs-absolute-subvol.patch
+  * rediff os-prober-btrfs-always-detect-default.patch
+
+---



Other differences:
--
++ os-prober-btrfs-absolute-subvol.patch ++
--- /var/tmp/diff_new_pack.E8XIsj/_old  2017-03-05 17:58:22.783580500 +0100
+++ /var/tmp/diff_new_pack.E8XIsj/_new  2017-03-05 17:58:22.787579934 +0100
@@ -1,8 +1,8 @@
-Index: os-prober-1.61/os-probes/common/50mounted-tests
+Index: os-prober/os-probes/common/50mounted-tests
 ===
 os-prober-1.61.orig/os-probes/common/50mounted-tests
-+++ os-prober-1.61/os-probes/common/50mounted-tests
-@@ -58,9 +58,7 @@ mounted=
+--- os-prober.orig/os-probes/common/50mounted-tests
 os-prober/os-probes/common/50mounted-tests
+@@ -72,9 +72,7 @@ mounted=
  
  if [ "$types" = btrfs ]; then
partition="$BTRFSDEV"
@@ -13,7 +13,20 @@
 type grub2-probe >/dev/null 2>&1 && \
 grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
mounted=1
-@@ -114,9 +112,9 @@ if [ "$types" = btrfs ]; then
+@@ -110,7 +108,11 @@ if [ "$mounted" ]; then
+   fi
+   done
+ fi
+-do_unmount
++
++if [ "$types" != "btrfs" ]; then
++  do_unmount
++  exit 1
++fi
+ 
+ # all btrfs processing here.  Handle both unmounted and
+ # mounted subvolumes.
+@@ -125,9 +127,9 @@ if [ "$types" = btrfs ]; then
exit 1
fi
# besides regular subvols, get ro and snapshot so thet can be excluded

++ os-prober-btrfs-always-detect-default.patch ++
--- /var/tmp/diff_new_pack.E8XIsj/_old  2017-03-05 17:58:22.799578236 +0100
+++ /var/tmp/diff_new_pack.E8XIsj/_new  2017-03-05 17:58:22.799578236 +0100
@@ -20,9 +20,9 @@
 ===
 --- os-prober.orig/os-probes/common/50mounted-tests
 +++ os-prober/os-probes/common/50mounted-tests
-@@ -113,6 +113,47 @@ if [ "$mounted" ]; then
+@@ -114,6 +114,47 @@ if [ "$types" != "btrfs" ]; then
+   exit 1
  fi
- do_unmount
  
 +probe_subvol ()
 +{
@@ -68,7 +68,7 @@
  # all btrfs processing here.  Handle both unmounted and
  # mounted subvolumes.
  if [ "$types" = btrfs ]; then
-@@ -135,45 +176,23 @@ if [ "$types" = btrfs ]; then
+@@ -136,45 +177,23 @@ if [ "$types" = btrfs ]; then
  rmdir "$tmpmnt" || true
  exit 1
  fi

commit os-prober for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2017-02-22 13:51:02

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2016-11-16 
13:46:49.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2017-02-22 
13:51:03.669436948 +0100
@@ -1,0 +2,33 @@
+Fri Feb 10 08:45:28 UTC 2017 - mch...@suse.com
+
+- Version bump to 1.74:
+  * Add support for Mageia
+  * Improve logging of mounting and setting partitions to ro/rw
+  * Use a read-only device-mapper entry if possible rather than setting the
+underlying device to read-only.
+Note that this introduces a dependency on dmsetup on Linux architectures.
+  * Remove the "blockdev --setro" code path entirely, since the read-only
+device-mapper arrangement supersedes it and should be safer
+  * Make the yaboot parser more tolerant about the syntax of "append" options
+  * Disable debugging if OS_PROBER_DISABLE_DEBUG is set
+  * Replace basename/dirname with shell string processing
+  * Fix typos in README
+  * Add Devuan detection
+  * Work harder to avoid trying to mount extended partitions
+  * Drop " (loader)" suffixes on Microsoft operating systems
+  * Add support for 4MLinux
+  * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
+- Rediff
+ * os-prober-1.49-grub2-mount.patch
+ * os-prober-EFI-openSUSEfy.patch
+ * os-prober-btrfs-always-detect-default.patch
+ * os-prober-btrfsfix.patch
+ * os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
+ * os-prober-fix-btrfs-subvol-mounted-tests.patch
+ * os-prober-linux-distro-avoid-expensive-ld-file-test.patch
+ * os-prober-linux-distro-parse-os-release.patch
+- Remove patches; fixed on upstream release
+ * os-prober-call-dmraid-once.patch
+ * os-prober-1.49-skip-LVM2_member.patch
+
+---

Old:

  os-prober-1.49-skip-LVM2_member.patch
  os-prober-call-dmraid-once.patch
  os-prober_1.70.tar.xz

New:

  os-prober_1.74.tar.xz



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.4Xokpd/_old  2017-02-22 13:51:04.541312851 +0100
+++ /var/tmp/diff_new_pack.4Xokpd/_new  2017-02-22 13:51:04.541312851 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   os-prober
-Version:1.70
+Version:1.74
 Release:0
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0+
@@ -32,8 +32,6 @@
 Patch1: os-prober-SUSE.patch
 # PATCH-FIX-OPENSUSE: Fix parsing of grub.cfg [bnc#796919]
 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
 # PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006)
@@ -52,8 +50,6 @@
 Patch13:os-prober-fix-btrfs-subvol-mounted-tests.patch
 # PATCH-FIX-SLE: fix os-prober creates many unusuable entries on multipath 
disk (bnc#875327)
 Patch14:os-prober-skip-part-on-multipath.patch
-# PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for 
every partition (bnc#883453)
-Patch15:os-prober-call-dmraid-once.patch
 # PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation 
(bsc#892364)
 Patch17:Improve-btrfs-handling-on-os-probing-for-grub2.patch
 # PATCH-FIX-SLE: fix os-prober mount error, no such file or directory 
(bsc#931955)
@@ -77,6 +73,7 @@
 Requires:   util-linux
 Recommends: dmraid
 Recommends: lvm2
+Recommends: dmsetup
 %if 0%{?suse_version} >= 1315
 # For logger utility
 Requires:   util-linux-systemd
@@ -88,12 +85,11 @@
 distributions can be added easily.
 
 %prep
-%setup -q
+%setup -q -n os-prober
 cp %{SOURCE1} .
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch7 -p1
 %patch8 -p1
@@ -103,7 +99,6 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1

++ os-prober-1.49-grub2-mount.patch ++
--- /var/tmp/diff_new_pack.4Xokpd/_old  2017-02-22 13:51:04.593305450 +0100
+++ /var/tmp/diff_new_pack.4Xokpd/_new  2017-02-22 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2016-11-16 13:46:48

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2016-10-06 
12:30:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2016-11-16 
13:46:49.0 +0100
@@ -1,0 +2,10 @@
+Tue Nov 15 09:03:26 UTC 2016 - mch...@suse.com
+
+- The wildcard test for ld.so is inaccurate, slow and sometimes hangs a
+  long time with grub2-mount. Disable it becuase it does quite opposite
+  it was intended to do, that is having an inital quick filter for non
+  linux partition to speed things up. (bsc#1008444)
+  * modified os-prober-linux-distro-avoid-expensive-ld-file-test.patch
+  * refresh os-prober-linux-distro-parse-os-release.patch
+
+---



Other differences:
--
++ os-prober-linux-distro-avoid-expensive-ld-file-test.patch ++
--- /var/tmp/diff_new_pack.kgVFL3/_old  2016-11-16 13:46:50.0 +0100
+++ /var/tmp/diff_new_pack.kgVFL3/_new  2016-11-16 13:46:50.0 +0100
@@ -2,124 +2,19 @@
 ===
 --- os-prober-1.70.orig/os-probes/mounted/common/90linux-distro
 +++ os-prober-1.70/os-probes/mounted/common/90linux-distro
-@@ -10,6 +10,113 @@ type="$3"
+@@ -10,135 +10,121 @@ type="$3"
  uuid="$4"
  subvol="$5"
  
-+if [ -e "$dir/etc/debian_version" ]; then
-+  short="Debian"
-+  long="$(printf "Debian GNU/Linux (%s)\n" "$(cat 
"$dir/etc/debian_version")")"
-+# RPM derived distributions may also have a redhat-release or
-+# mandrake-release, so check their files first.
-+elif [ -e "$dir/etc/altlinux-release" ]; then
-+  short="ALTLinux"
-+  long="$(cat "$dir/etc/altlinux-release")"
-+elif [ -e "$dir/etc/magic-release" ]; then
-+  short="Magic"
-+  long="$(cat "$dir/etc/magic-release")"
-+elif [ -e "$dir/etc/blackPanther-release" ]; then
-+  short="blackPanther"
-+  long="$(cat "$dir/etc/blackPanther-release")"
-+elif [ -e "$dir/etc/ark-release" ]; then
-+  short="Ark"
-+  long="$(cat "$dir/etc/ark-release")"
-+elif [ -e "$dir/etc/arch-release" ]; then
-+  short="Arch"
-+  long="$(cat "$dir/etc/arch-release")"
-+elif [ -e "$dir/etc/asplinux-release" ]; then
-+  short="ASPLinux"
-+  long="$(cat "$dir/etc/asplinux-release")"
-+elif [ -e "$dir/etc/lvr-release" ]; then
-+  short="LvR"
-+  long="$(cat "$dir/etc/lvr-release")"
-+elif [ -e "$dir/etc/caos-release" ]; then
-+  short="cAos"
-+  long="$(cat "$dir/etc/caos-release")"
-+elif [ -e "$dir/etc/aurox-release" ]; then
-+  short="Aurox"
-+  long="$(cat "$dir/etc/aurox-release")"
-+elif [ -e "$dir/etc/engarde-release" ]; then
-+  short="EnGarde"
-+  long="$(cat "$dir/etc/engarde-release")"
-+elif [ -e "$dir/etc/vine-release" ]; then
-+  short="Vine"
-+  long="$(cat "$dir/etc/vine-release")"
-+elif [ -e "$dir/etc/whitebox-release" ]; then
-+  short="WhiteBox"
-+  long="$(cat "$dir/etc/whitebox-release")"
-+elif [ -e "$dir/etc/pld-release" ]; then
-+  short="PLD"
-+  long="$(cat "$dir/etc/pld-release")"
-+elif [ -e "$dir/etc/startcom-release" ]; then
-+  short="StartCom"
-+  long="$(cat "$dir/etc/startcom-release")"
-+elif [ -e "$dir/etc/trustix-release" ]; then
-+  short="Trustix"
-+  long="$(cat "$dir/etc/trustix-release")"
-+elif [ -e "$dir/etc/openna-release" ]; then
-+  short="OpenNA"
-+  long="$(cat "$dir/etc/openna-release")"
-+elif [ -e "$dir/etc/conectiva-release" ]; then
-+  short="Conectiva"
-+  long="$(cat "$dir/etc/conectiva-release")"
-+elif [ -e "$dir/etc/mandrake-release" ]; then
-+  short="Mandrake"
-+  long="$(cat "$dir/etc/mandrake-release")"
-+elif [ -e "$dir/etc/fedora-release" ]; then
-+  short="Fedora"
-+  long="$(cat "$dir/etc/fedora-release")"
-+elif [ -e "$dir/etc/redhat-release" ]; then
-+  short="RedHat"
-+  long="$(cat "$dir/etc/redhat-release")"
-+elif [ -e "$dir/etc/SuSE-release" ]; then
-+  short="SUSE"
-+  long="$(head -n 1 "$dir/etc/SuSE-release")"
-+elif [ -e "$dir/etc/gentoo-release" ]; then
-+  short="Gentoo"
-+  long="$(cat "$dir/etc/gentoo-release")"
-+elif [ -e "$dir/etc/cobalt-release" ]; then
-+  short="Cobalt"
-+  long="$(cat "$dir/etc/cobalt-release")"
-+elif [ -e "$dir/etc/yellowdog-release" ]; then
-+  short="YellowDog"
-+  long="$(cat "$dir/etc/yellowdog-release")"
-+elif [ -e "$dir/etc/turbolinux-release" ]; then
-+  short="Turbolinux"
-+  

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2016-10-06 12:30:45

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2016-09-27 
13:41:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2016-10-06 
12:30:46.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct  4 08:28:26 UTC 2016 - mch...@suse.com
+
+- Handle /etc/os-release symlink (bsc#997465)
+  * refresh os-prober-linux-distro-parse-os-release.patch
+
+---



Other differences:
--
++ os-prober-linux-distro-parse-os-release.patch ++
--- /var/tmp/diff_new_pack.RhVjK2/_old  2016-10-06 12:30:47.0 +0200
+++ /var/tmp/diff_new_pack.RhVjK2/_new  2016-10-06 12:30:47.0 +0200
@@ -2,10 +2,21 @@
 ===
 --- os-prober-1.70.orig/os-probes/mounted/common/90linux-distro
 +++ os-prober-1.70/os-probes/mounted/common/90linux-distro
-@@ -117,6 +117,9 @@ elif [ -e "$dir/etc/lfs-release" ]; then
+@@ -117,6 +117,20 @@ elif [ -e "$dir/etc/lfs-release" ]; then
  elif [ -e "$dir/etc/meego-release" ]; then
short="MeeGo"
long="$(head -1 "$dir/etc/meego-release")"
++elif [ -L "$dir/etc/os-release" ]; then
++  RELPATH=$(readlink -f "$dir/etc/os-release")
++  if readlink "$dir/etc/os-release" | grep -q '^/'; then
++  RELPATH="$dir$RELPATH"
++  fi
++  if [ -f "$RELPATH" ]; then
++  short=$(sed -n "/^NAME=/{s@\"\(.*\)\"@\1@;t 1;s@'\(.*\)'@\1@;: 
1;s@^[^=]\+=@@;p;b}" "$RELPATH")
++  long="$short $(sed -n "/^VERSION=/{s@\"\(.*\)\"@\1@;t 
1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}" "$RELPATH")"
++  else
++  exit 1
++  fi
 +elif [ -e "$dir/etc/os-release" ]; then
 +  short=$(sed -n "/^NAME=/{s@\"\(.*\)\"@\1@;t 1;s@'\(.*\)'@\1@;: 
1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)
 +  long="$short $(sed -n "/^VERSION=/{s@\"\(.*\)\"@\1@;t 
1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)"

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2016-09-27 13:41:46

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-12-27 
01:57:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2016-09-27 
13:41:48.0 +0200
@@ -1,0 +2,6 @@
+Wed Sep 14 04:46:42 UTC 2016 - mch...@suse.com
+
+- Parse /etc/os-release for openSUSE Tumbleweed (bsc#997465)
+  * os-prober-linux-distro-parse-os-release.patch
+
+---

New:

  os-prober-linux-distro-parse-os-release.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.AwvzW4/_old  2016-09-27 13:41:49.0 +0200
+++ /var/tmp/diff_new_pack.AwvzW4/_new  2016-09-27 13:41:49.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -66,6 +66,8 @@
 Patch22:os-prober-btrfs-always-detect-default.patch
 # PATCH-FIX-OPENSUSE: y2base runs at 100% cpu busy from beginning in 
installation of files to completion (bsc#953987)
 Patch23:os-prober-linux-distro-avoid-expensive-ld-file-test.patch
+# PATCH-FIX-OPENSUSE: Leap does not recognize Tumbleweed any more (bsc#997465)
+Patch24:os-prober-linux-distro-parse-os-release.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -108,6 +110,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-linux-distro-parse-os-release.patch ++
Index: os-prober-1.70/os-probes/mounted/common/90linux-distro
===
--- os-prober-1.70.orig/os-probes/mounted/common/90linux-distro
+++ os-prober-1.70/os-probes/mounted/common/90linux-distro
@@ -117,6 +117,9 @@ elif [ -e "$dir/etc/lfs-release" ]; then
 elif [ -e "$dir/etc/meego-release" ]; then
short="MeeGo"
long="$(head -1 "$dir/etc/meego-release")"
+elif [ -e "$dir/etc/os-release" ]; then
+   short=$(sed -n "/^NAME=/{s@\"\(.*\)\"@\1@;t 1;s@'\(.*\)'@\1@;: 
1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)
+   long="$short $(sed -n "/^VERSION=/{s@\"\(.*\)\"@\1@;t 
1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}" $dir/etc/os-release)"
 # This test is inaccurate, but given separate / and /boot partitions and the
 # fact that only some architectures have ld-linux.so, I can't see anything
 # better. Make sure this test has a high number so that more accurate tests

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-12-27 01:57:55

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-11-12 
19:38:55.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-12-27 
01:57:56.0 +0100
@@ -1,0 +2,13 @@
+Thu Dec 17 10:14:04 UTC 2015 - mch...@suse.com
+
+- The ld file tests cost too much as it transversed all files in 
+  the given wildcard directory and path, we should avoid when not
+  necessary. (bsc#953987)
+  * added os-prober-linux-distro-avoid-expensive-ld-file-test.patch
+- Fix missing linux16/initrd16 parsing in entry result
+- Fix kernelfile path if separate boot partition on btrfs 
+  * modified Improve-btrfs-handling-on-os-probing-for-grub2.patch
+- fix os-prober failed to detect os in btrfs root tree (bsc#957018)
+  * added os-prober-btrfs-always-detect-default.patch
+
+---

New:

  os-prober-btrfs-always-detect-default.patch
  os-prober-linux-distro-avoid-expensive-ld-file-test.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.leJEJN/_old  2015-12-27 01:57:57.0 +0100
+++ /var/tmp/diff_new_pack.leJEJN/_new  2015-12-27 01:57:57.0 +0100
@@ -62,6 +62,10 @@
 Patch19:os-prober-40grub-check-grub2.patch
 # PATCH-FIX-OPENSUSE: detect os on default subvolume in snapshot (bsc#954225)
 Patch21:os-prober-btrfs-snapshot-detection.patch
+# PATCH-FIX-OPENSUSE: os-prober update broke Linux detection (bsc#957018)
+Patch22:os-prober-btrfs-always-detect-default.patch
+# PATCH-FIX-OPENSUSE: y2base runs at 100% cpu busy from beginning in 
installation of files to completion (bsc#953987)
+Patch23:os-prober-linux-distro-avoid-expensive-ld-file-test.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -102,6 +106,8 @@
 %patch18 -p1
 %patch19 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
 find . -name \*.orig -delete
 
 %build

++ Improve-btrfs-handling-on-os-probing-for-grub2.patch ++
--- /var/tmp/diff_new_pack.leJEJN/_old  2015-12-27 01:57:57.0 +0100
+++ /var/tmp/diff_new_pack.leJEJN/_new  2015-12-27 01:57:57.0 +0100
@@ -28,14 +28,20 @@
identical to the fs path).
 
 Signed-off-by: Egbert Eich 
+
+v2:
+a. Fix missing linux16/initrd16 parsing in entry result
+b. Fix kernelfile path if separate boot partition on btrfs 
+
+Signed-off-by: Michael Chang 
 ---
  linux-boot-probes/mounted/common/40grub2 | 16 +---
  1 file changed, 13 insertions(+), 3 deletions(-)
 
-diff --git a/linux-boot-probes/mounted/common/40grub2 
b/linux-boot-probes/mounted/common/40grub2
-index b548585..ccdbebb 100755
 a/linux-boot-probes/mounted/common/40grub2
-+++ b/linux-boot-probes/mounted/common/40grub2
+Index: os-prober-1.61/linux-boot-probes/mounted/common/40grub2
+===
+--- os-prober-1.61.orig/linux-boot-probes/mounted/common/40grub2
 os-prober-1.61/linux-boot-probes/mounted/common/40grub2
 @@ -14,9 +14,19 @@ bootsv="$6"
  found_item=0
  
@@ -59,3 +65,30 @@
else
kernelfile=$kernel
fi
+@@ -81,7 +91,7 @@ parse_grub_menu () {
+   ignore_item=1
+   fi
+   ;;
+-  linux|linuxefi)
++  linux|linuxefi|linux16)
+   # Hack alert: sed off any (hdn,n) but
+   # assume the kernel is on the same
+   # partition.
+@@ -90,14 +100,14 @@ parse_grub_menu () {
+   parameters="$@"
+   # Systems with a separate /boot will not have
+   # the path to the kernel in grub.cfg.
+-  if [ "$partition" != "$bootpart" ]; then
++  if [ "$partition" != "$bootpart" -a "$type" != 
"btrfs" ]; then
+   kernel="/boot$kernel"
+   fi
+   ;;
+-  initrd|initrdefi)
++  initrd|initrdefi|initrd16)
+   initrd="$(echo "$2" | sed 's/(.*)//')"
+   # Initrd same.
+-  if [ "$partition" != "$bootpart" ]; then
++  if [ "$partition" != 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-11-12 19:38:54

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-10-12 
10:00:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-11-12 
19:38:55.0 +0100
@@ -1,0 +2,17 @@
+Tue Nov 10 00:32:40 UTC 2015 - p.drou...@gmail.com
+
+- Update to version 1.70
+  * Fix hurd-any support: Test for /servers instead of /servers/exec
+to avoid starting an translator in the mounted system. Also, 
+/hurd/init might be phased out at some point (Closes: #802053).
+- Remove patches; fixed on upstream release
+  * os-prober-grep-for-windows-bcd-file.patch
+  * os-prober-properly-detect-Windows-10.patch
+
+---
+Mon Nov  9 10:32:31 UTC 2015 - lnus...@suse.de
+
+- detect os on default subvolume in snapshot (bsc#954225)
+  (os-prober-btrfs-snapshot-detection.patch)
+
+---

Old:

  os-prober-grep-for-windows-bcd-file.patch
  os-prober-properly-detect-Windows-10.patch
  os-prober_1.65.tar.xz

New:

  os-prober-btrfs-snapshot-detection.patch
  os-prober_1.70.tar.xz



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.UwEBru/_old  2015-11-12 19:38:57.0 +0100
+++ /var/tmp/diff_new_pack.UwEBru/_new  2015-11-12 19:38:57.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:   os-prober
-Version:1.65
+Version:1.70
 Release:0
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0+
@@ -54,16 +54,14 @@
 Patch14:os-prober-skip-part-on-multipath.patch
 # PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for 
every partition (bnc#883453)
 Patch15:os-prober-call-dmraid-once.patch
-# PATCH-FIX-UPSTREAM: fix os-prober misinterprets Windows 8 to be Vista 
(bsc#910654)
-Patch16:os-prober-grep-for-windows-bcd-file.patch
 # PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation 
(bsc#892364)
 Patch17:Improve-btrfs-handling-on-os-probing-for-grub2.patch
 # PATCH-FIX-SLE: fix os-prober mount error, no such file or directory 
(bsc#931955)
 Patch18:os-prober-btrfs-absolute-subvol.patch
 # PATCH-FIX-OPENSUSE: also skip legacy grub if /boot/grub2/grub.cfg is present
 Patch19:os-prober-40grub-check-grub2.patch
-# PATCH-FIX-UPSTREAM: fix os-prober is missing support for Windows 10 
detection (bsc#947487)
-Patch20:os-prober-properly-detect-Windows-10.patch
+# PATCH-FIX-OPENSUSE: detect os on default subvolume in snapshot (bsc#954225)
+Patch21:os-prober-btrfs-snapshot-detection.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -84,7 +82,7 @@
 distributions can be added easily.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 cp %{SOURCE1} .
 %patch0 -p1
 %patch1 -p1
@@ -100,11 +98,10 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
+%patch21 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-btrfs-snapshot-detection.patch ++
Index: os-prober/os-probes/common/50mounted-tests
===
--- os-prober.orig/os-probes/common/50mounted-tests
+++ os-prober/os-probes/common/50mounted-tests
@@ -115,6 +115,7 @@ if [ "$types" = btrfs ]; then
 subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e 
s!^\/!!)
 rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' -f 9 | 
sed -e s!^\/!!)
 sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' -f 14 | 
sed -e s!^\/!!)
+defaultvol=$(btrfs subvolume get-default "$tmpmnt" | cut -d ' ' -f 9)
 if ! umount "$tmpmnt"; then
 warn "failed to umount btrfs volume on $tmpmnt"
 rmdir "$tmpmnt" || true
@@ -127,11 +128,13 @@ if [ "$types" = btrfs ]; then
found=
 for subvol in $subvols; do
debug "begin btrfs processing for $UUID subvol=$subvol"
-   if echo "$rosubvols" | grep -q 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-10-12 10:00:00

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is "os-prober"

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-08-07 
00:17:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-10-12 
10:00:01.0 +0200
@@ -1,0 +2,9 @@
+Thu Oct  1 07:24:12 UTC 2015 - mch...@suse.com
+
+- replace os-prober-grep-for-windows-bcd-file.patch by upstream's version
+  * modified os-prober-grep-for-windows-bcd-file.patch
+- include patch from upstream to fix os-prober is missing support for
+  Windows 10 (bsc#947487)
+  * added os-prober-properly-detect-Windows-10.patch
+
+---

New:

  os-prober-properly-detect-Windows-10.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.YtN9rr/_old  2015-10-12 10:00:02.0 +0200
+++ /var/tmp/diff_new_pack.YtN9rr/_new  2015-10-12 10:00:02.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -54,7 +54,7 @@
 Patch14:os-prober-skip-part-on-multipath.patch
 # PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for 
every partition (bnc#883453)
 Patch15:os-prober-call-dmraid-once.patch
-# PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista 
(bsc#910654)
+# PATCH-FIX-UPSTREAM: fix os-prober misinterprets Windows 8 to be Vista 
(bsc#910654)
 Patch16:os-prober-grep-for-windows-bcd-file.patch
 # PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation 
(bsc#892364)
 Patch17:Improve-btrfs-handling-on-os-probing-for-grub2.patch
@@ -62,6 +62,8 @@
 Patch18:os-prober-btrfs-absolute-subvol.patch
 # PATCH-FIX-OPENSUSE: also skip legacy grub if /boot/grub2/grub.cfg is present
 Patch19:os-prober-40grub-check-grub2.patch
+# PATCH-FIX-UPSTREAM: fix os-prober is missing support for Windows 10 
detection (bsc#947487)
+Patch20:os-prober-properly-detect-Windows-10.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -102,6 +104,7 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-grep-for-windows-bcd-file.patch ++
--- /var/tmp/diff_new_pack.YtN9rr/_old  2015-10-12 10:00:02.0 +0200
+++ /var/tmp/diff_new_pack.YtN9rr/_new  2015-10-12 10:00:02.0 +0200
@@ -1,31 +1,64 @@
-Index: os-prober/os-probes/mounted/x86/20microsoft
-===
 os-prober.orig/os-probes/mounted/x86/20microsoft
-+++ os-prober/os-probes/mounted/x86/20microsoft
+From 15dec5c28b77b6db1492e42e25946cd7ae7a7885 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois 
+Date: Fri, 10 Jul 2015 00:59:38 +0200
+Subject: [PATCH] Add -a flag to grep -qs for Windows Vista detection (Closes:
+ #791383).
+
+It appears the file isn't always considered as a text file, so this should be
+more robust. Thanks to Gianluigi Tiesi for the report and the suggestion.
+---
+ debian/changelog  |  9 +
+ os-probes/mounted/x86/20microsoft | 14 +++---
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/debian/changelog b/debian/changelog
+index 195a3f2..1643099 100644
+--- a/debian/changelog
 b/debian/changelog
+@@ -1,3 +1,12 @@
++os-prober (1.66) UNRELEASED; urgency=medium
++
++  * Add -a flag to grep -qs for Windows Vista detection. It appears the
++file isn't always considered as a text file, so this should be more
++robust. Thanks to Gianluigi Tiesi for the report and the suggestion
++(Closes: #791383).
++
++ -- Cyril Brulebois   Fri, 10 Jul 2015 00:56:21 +0200
++
+ os-prober (1.65) unstable; urgency=medium
+ 
+   [ Steve McIntyre ]
+diff --git a/os-probes/mounted/x86/20microsoft 
b/os-probes/mounted/x86/20microsoft
+index 6fb3cc5..af83f40 100755
+--- a/os-probes/mounted/x86/20microsoft
 b/os-probes/mounted/x86/20microsoft
 @@ -31,19 +31,19 @@ if item_in_dir -q bootmgr "$2"; then
for boot in $(item_in_dir boot "$2"); do
bcd=$(item_in_dir bcd "$2/$boot")
if [ -n "$bcd" ]; then
 -  if grep -qs "W.i.n.d.o.w.s. .8" "$2/$boot/$bcd"; then

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-08-07 00:17:00

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-07-05 
17:51:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-08-07 
00:17:01.0 +0200
@@ -1,0 +2,7 @@
+Sun Aug  2 15:14:55 UTC 2015 - arvidj...@gmail.com
+
+- add os-prober-40grub-check-grub2.patch
+  * also skip legacy grub if /boot/grub2/grub.cfg is present, not only
+/boot/grub/grub.cfg
+
+---

New:

  os-prober-40grub-check-grub2.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.NaDFv9/_old  2015-08-07 00:17:02.0 +0200
+++ /var/tmp/diff_new_pack.NaDFv9/_new  2015-08-07 00:17:02.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -60,6 +60,8 @@
 Patch17:Improve-btrfs-handling-on-os-probing-for-grub2.patch
 # PATCH-FIX-SLE: fix os-prober mount error, no such file or directory 
(bsc#931955)
 Patch18:os-prober-btrfs-absolute-subvol.patch
+# PATCH-FIX-OPENSUSE: also skip legacy grub if /boot/grub2/grub.cfg is present
+Patch19:os-prober-40grub-check-grub2.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -99,6 +101,7 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-40grub-check-grub2.patch ++
From: Andrei Borzenkov arvidj...@gmail.com
Subject: Also skip legacy grub if grub2 is found

Check for grub.cfg also in /boot/grub2, not only in /boot/grub.
Index: os-prober/linux-boot-probes/mounted/x86/40grub
===
--- os-prober.orig/linux-boot-probes/mounted/x86/40grub
+++ os-prober/linux-boot-probes/mounted/x86/40grub
@@ -95,7 +95,9 @@ fi
 
 if [ $grubconf ]  \
([ ! -e $mpoint/boot/grub/grub.cfg ] || \
-[ $mpoint/boot/grub/$grubconf -nt $mpoint/boot/grub/grub.cfg ]); then
+[ $mpoint/boot/grub/$grubconf -nt $mpoint/boot/grub/grub.cfg ])  \
+   ([ ! -e $mpoint/boot/grub2/grub.cfg ] || \
+[ $mpoint/boot/grub/$grubconf -nt $mpoint/boot/grub2/grub.cfg ]); then
debug parsing $grubconf
parse_grub_menu $mpoint $partition $bootpart  
$mpoint/boot/grub/$grubconf
 fi

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-07-05 17:51:10

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-06-03 
08:20:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-07-05 
17:51:11.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun 18 10:24:05 UTC 2015 - mch...@suse.com
+
+- add os-prober-btrfs-absolute-subvol.patch
+  * fix os-prober mount error, no such file or directory (bsc#931955)
+
+---

New:

  os-prober-btrfs-absolute-subvol.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.pqQz5h/_old  2015-07-05 17:51:12.0 +0200
+++ /var/tmp/diff_new_pack.pqQz5h/_new  2015-07-05 17:51:12.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -58,6 +58,8 @@
 Patch16:os-prober-grep-for-windows-bcd-file.patch
 # PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation 
(bsc#892364)
 Patch17:Improve-btrfs-handling-on-os-probing-for-grub2.patch
+# PATCH-FIX-SLE: fix os-prober mount error, no such file or directory 
(bsc#931955)
+Patch18:os-prober-btrfs-absolute-subvol.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -96,6 +98,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-btrfs-absolute-subvol.patch ++
Index: os-prober-1.61/os-probes/common/50mounted-tests
===
--- os-prober-1.61.orig/os-probes/common/50mounted-tests
+++ os-prober-1.61/os-probes/common/50mounted-tests
@@ -58,9 +58,7 @@ mounted=
 
 if [ $types = btrfs ]; then
partition=$BTRFSDEV
-fi
-
-if type grub2-mount /dev/null 21  \
+elif type grub2-mount /dev/null 21  \
type grub2-probe /dev/null 21  \
grub2-mount $partition $tmpmnt 2/dev/null; then
mounted=1
@@ -114,9 +112,9 @@ if [ $types = btrfs ]; then
exit 1
fi
# besides regular subvols, get ro and snapshot so thet can be excluded
-subvols=$(btrfs subvolume list $tmpmnt | cut -d ' ' -f 9)
-rosubvols=$(btrfs subvolume list -r $tmpmnt | cut -d ' ' -f 9)
-sssubvols=$(btrfs subvolume list -s $tmpmnt | cut -d ' ' -f 14)
+subvols=$(btrfs subvolume list -a $tmpmnt | cut -d ' ' -f 9 | sed -e 
s!^\FS_TREE\/!!)
+rosubvols=$(btrfs subvolume list -r -a $tmpmnt | cut -d ' ' -f 9 | 
sed -e s!^\FS_TREE\/!!)
+sssubvols=$(btrfs subvolume list -s -a $tmpmnt | cut -d ' ' -f 14 | 
sed -e s!^\FS_TREE\/!!)
 if ! umount $tmpmnt; then
 warn failed to umount btrfs volume on $tmpmnt
 rmdir $tmpmnt || true

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-06-03 08:20:03

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-05-16 
19:00:53.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-06-03 
08:20:05.0 +0200
@@ -1,0 +2,13 @@
+Mon Jun  1 07:16:32 UTC 2015 - mch...@suse.com
+
+- Deleted os-prober-btrfsfix-trim-leading-subvol.patch: supersceded
+  by Improve-btrfs-handling-on-os-probing-for-grub2.patch 
+
+---
+Fri May 29 07:14:40 UTC 2015 - e...@suse.com
+
+- Improve-btrfs-handling-on-os-probing-for-grub2.patch
+  * Improve btrfs handling on os-probing for grub2 (bsc#892364)
+- Replaces: os-prober-btrfsfix-trim-leading-subvol.patch
+
+---

Old:

  os-prober-btrfsfix-trim-leading-subvol.patch

New:

  Improve-btrfs-handling-on-os-probing-for-grub2.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.jGldhV/_old  2015-06-03 08:20:05.0 +0200
+++ /var/tmp/diff_new_pack.jGldhV/_new  2015-06-03 08:20:05.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -57,7 +57,7 @@
 # PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista 
(bsc#910654)
 Patch16:os-prober-grep-for-windows-bcd-file.patch
 # PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation 
(bsc#892364)
-Patch17:os-prober-btrfsfix-trim-leading-subvol.patch
+Patch17:Improve-btrfs-handling-on-os-probing-for-grub2.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe

++ Improve-btrfs-handling-on-os-probing-for-grub2.patch ++
From: Egbert Eich e...@suse.de
Date: Fri May 29 08:55:21 2015 +0200
Subject: Improve btrfs handling on os-probing for grub2
Patch-mainline: never

References: bsc#892364
Signed-off-by: Egbert Eich e...@suse.com

Currently probing of a grub2 config file is broken if
the root/boot fs is btrfs. This is due to a patch picked
from Fedora which attempts to determine the location of
the kernel and probe for it.
This code has meanwhile changed on Fedora, however the
new version works no better than the old one.
It is possible that this code works under very special
circumstances of the Fedora system, however it is by no
means valid.
Our goal is to
a. determine the location of the kernel in the mounted fs
   regardless whether the grub2 config specifies an absolute
   or relative path to the kernel file.
b. Prepend the correct prefix if grub2_btrfs expects an
   absolute path (either because the current grub2 fs isn't
   btrfs or absolute path addressing is explicitely requested).
c. Attempt to handle the location of the kernel file correctly
   if this lives on a separate btrfs subvolume.
   (Currently this only works if the path to this subvolume is
   identical to the fs path).

Signed-off-by: Egbert Eich e...@suse.de
---
 linux-boot-probes/mounted/common/40grub2 | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/linux-boot-probes/mounted/common/40grub2 
b/linux-boot-probes/mounted/common/40grub2
index b548585..ccdbebb 100755
--- a/linux-boot-probes/mounted/common/40grub2
+++ b/linux-boot-probes/mounted/common/40grub2
@@ -14,9 +14,19 @@ bootsv=$6
 found_item=0
 
 entry_result () {
-   if [ x$type = xbtrfs -a $rootsv = $bootsv ]; then
-   # trim off the leading subvol
-   kernelfile=$(echo $kernel | cut -d '/' -f 2- | cut -d '/' -f 
2-)
+   if [ x$type = xbtrfs ]; then
+   bsv=${bootsv:+/}${bootsv}
+   # if path is not relative to subvolume make it relative
+   kernel=${kernel#${bsv}}
+   kernelfile=$kernel
+   initrd=${initrd#${bsv}}
+   if [ x$GRUB_FS != xbtrfs -o 
x${SUSE_BTRFS_SNAPSHOT_BOOTING} != xtrue ]; then
+   # absolute path needed: prepend subvolume if $kernel isn't 
empty
+   kernel=${kernel:+${bsv}}${kernel}
+   initrd=${initrd:+${bsv}}${initrd}
+   fi
+   # assumed: rootsv != bootsv if rootsv isn't ancestor of bootsv
+   [ $partition != 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-05-16 19:00:50

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2015-01-27 
12:35:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-05-16 
19:00:53.0 +0200
@@ -1,0 +2,6 @@
+Wed May 13 15:45:30 UTC 2015 - mch...@suse.com
+
+- os-prober-btrfsfix-trim-leading-subvol.patch
+  * fix os-prober fails to detect other SLES12 installation (bsc#892364)
+
+---

New:

  os-prober-btrfsfix-trim-leading-subvol.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.90FlaU/_old  2015-05-16 19:00:54.0 +0200
+++ /var/tmp/diff_new_pack.90FlaU/_new  2015-05-16 19:00:54.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -56,6 +56,8 @@
 Patch15:os-prober-call-dmraid-once.patch
 # PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista 
(bsc#910654)
 Patch16:os-prober-grep-for-windows-bcd-file.patch
+# PATCH-FIX-SLE: fix os-prober fails to detect other SLES12 installation 
(bsc#892364)
+Patch17:os-prober-btrfsfix-trim-leading-subvol.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -93,6 +95,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-btrfsfix-trim-leading-subvol.patch ++
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -16,7 +16,7 @@ found_item=0
 entry_result () {
if [ x$type = xbtrfs -a $rootsv = $bootsv ]; then
# trim off the leading subvol
-   kernelfile=$(echo $kernel | cut -d '/' -f 2- | cut -d '/' -f 
2-)
+   kernelfile=$(echo $kernel | sed -e s!^/${rootsv}/!!)
else
kernelfile=$kernel
fi

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2015-01-27 12:35:25

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2014-12-21 
12:03:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2015-01-27 
12:35:27.0 +0100
@@ -1,0 +2,6 @@
+Mon Jan 26 09:35:55 UTC 2015 - mch...@suse.com
+
+- add os-prober-grep-for-windows-bcd-file.patch
+  * fix os-prober misinterprets Windows 8 to be Vista (bsc#910654)
+
+---

New:

  os-prober-grep-for-windows-bcd-file.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.F4wR25/_old  2015-01-27 12:35:28.0 +0100
+++ /var/tmp/diff_new_pack.F4wR25/_new  2015-01-27 12:35:28.0 +0100
@@ -54,6 +54,8 @@
 Patch14:os-prober-skip-part-on-multipath.patch
 # PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for 
every partition (bnc#883453)
 Patch15:os-prober-call-dmraid-once.patch
+# PATCH-FIX-OPENSUSE: fix os-prober misinterprets Windows 8 to be Vista 
(bsc#910654)
+Patch16:os-prober-grep-for-windows-bcd-file.patch
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
@@ -90,6 +92,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 find . -name \*.orig -delete
 
 %build

++ os-prober-grep-for-windows-bcd-file.patch ++
Index: os-prober/os-probes/mounted/x86/20microsoft
===
--- os-prober.orig/os-probes/mounted/x86/20microsoft
+++ os-prober/os-probes/mounted/x86/20microsoft
@@ -31,19 +31,19 @@ if item_in_dir -q bootmgr $2; then
for boot in $(item_in_dir boot $2); do
bcd=$(item_in_dir bcd $2/$boot)
if [ -n $bcd ]; then
-   if grep -qs W.i.n.d.o.w.s. .8 $2/$boot/$bcd; then
+   if grep -qs --text W.i.n.d.o.w.s. .8 $2/$boot/$bcd; 
then
long=Windows 8 (loader)
-   elif grep -qs W.i.n.d.o.w.s. .7 $2/$boot/$bcd; then
+   elif grep -qs --text W.i.n.d.o.w.s. .7 
$2/$boot/$bcd; then
long=Windows 7 (loader)
-   elif grep -qs W.i.n.d.o.w.s. .V.i.s.t.a 
$2/$boot/$bcd; then
+   elif grep -qs --text W.i.n.d.o.w.s. .V.i.s.t.a 
$2/$boot/$bcd; then
long=Windows Vista (loader)
-   elif grep -qs W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. 
.R.2. $2/$boot/$bcd; then
+   elif grep -qs --text W.i.n.d.o.w.s. .S.e.r.v.e.r. 
.2.0.0.8. .R.2. $2/$boot/$bcd; then
long=Windows Server 2008 R2 (loader)
-   elif grep -qs W.i.n.d.o.w.s. .S.e.r.v.e.r. .2.0.0.8. 
$2/$boot/$bcd; then
+   elif grep -qs --text W.i.n.d.o.w.s. .S.e.r.v.e.r. 
.2.0.0.8. $2/$boot/$bcd; then
long=Windows Server 2008 (loader)
-   elif grep -qs W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. 
.E.n.v.i.r.o.n.m.e.n.t $2/$boot/$bcd; then
+   elif grep -qs --text W.i.n.d.o.w.s. .R.e.c.o.v.e.r.y. 
.E.n.v.i.r.o.n.m.e.n.t $2/$boot/$bcd; then
long=Windows Recovery Environment (loader)
-   elif grep -qs W.i.n.d.o.w.s. .S.e.t.u.p 
$2/$boot/$bcd; then
+   elif grep -qs --text W.i.n.d.o.w.s. .S.e.t.u.p 
$2/$boot/$bcd; then
long=Windows Recovery Environment (loader)
else
long=Windows Vista (loader)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2014-12-21 12:04:19

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2014-08-30 
16:03:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-12-21 
12:03:08.0 +0100
@@ -1,0 +2,17 @@
+Sun Dec 14 18:16:40 UTC 2014 - tchva...@suse.com
+
+- 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 :)
+
+---

Old:

  os-prober_1.61.tar.gz

New:

  os-prober_1.65.tar.xz



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.T97Eof/_old  2014-12-21 12:03:10.0 +0100
+++ /var/tmp/diff_new_pack.T97Eof/_new  2014-12-21 12:03:10.0 +0100
@@ -17,14 +17,13 @@
 
 
 Name:   os-prober
-Version:1.61
+Version:1.65
 Release:0
 Summary:Probes disks on the system for installed operating systems
 License:GPL-2.0+
 Group:  System/Boot
-
 Url:http://kitenet.net/~joey/code/os-prober/
-Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz
+Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.xz
 Source1:COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
 # can be automatically generated for it
@@ -55,16 +54,15 @@
 Patch14:os-prober-skip-part-on-multipath.patch
 # PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for 
every partition (bnc#883453)
 Patch15:os-prober-call-dmraid-once.patch
-
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
 Requires:   btrfsprogs
 Requires:   coreutils
-Recommends: dmraid
-Recommends: lvm2
 Requires:   udev
 Requires:   util-linux
+Recommends: dmraid
+Recommends: lvm2
 %if 0%{?suse_version} = 1315
 # For logger utility
 Requires:   util-linux-systemd
@@ -76,8 +74,8 @@
 distributions can be added easily.
 
 %prep
-%setup -q -n %{name}-%{version}
-cp %SOURCE1 .
+%setup -q -n %{name}
+cp %{SOURCE1} .
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -92,9 +90,10 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+find . -name \*.orig -delete
 
 %build
-make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}
+make %{?_smp_mflags} CC=gcc CFLAGS=%{optflags}
 
 %install
 install -m 0755 -d %{buildroot}%{_bindir}
@@ -113,7 +112,7 @@
 %ifarch sparc sparc64
 ARCH=sparc
 %endif
-%ifarch %{ix86} x86_64
+%ifarch %ix86 x86_64
 ARCH=x86
 %endif
 

++ os-prober-1.49-grub2-mount.patch ++
--- /var/tmp/diff_new_pack.T97Eof/_old  2014-12-21 12:03:10.0 +0100
+++ /var/tmp/diff_new_pack.T97Eof/_new  2014-12-21 12:03:10.0 +0100
@@ -1,34 +1,7 @@
-From: Andrey Borzenkov arvidj...@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

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2014-08-30 16:03:30

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2014-06-26 
08:00:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-08-30 
16:03:31.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 19 11:15:57 UTC 2014 - mch...@suse.com
+
+- requires util-linux-systemd (bnc#892337)
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.qechuJ/_old  2014-08-30 16:03:33.0 +0200
+++ /var/tmp/diff_new_pack.qechuJ/_new  2014-08-30 16:03:33.0 +0200
@@ -65,6 +65,10 @@
 Recommends: lvm2
 Requires:   udev
 Requires:   util-linux
+%if 0%{?suse_version} = 1315
+# For logger utility
+Requires:   util-linux-systemd
+%endif
 
 %description
 This package detects other OSes available on a system and outputs the results

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2014-06-26 08:00:23

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2014-06-19 
13:08:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-06-26 
08:00:33.0 +0200
@@ -1,0 +2,7 @@
+Fri Jun 20 20:42:01 UTC 2014 - je...@suse.com
+
+- add os-prober-call-dmraid-once.patch
+  * fix os-prober: dmraid is called without a device list for every
+partition (bnc#883453)
+
+---

New:

  os-prober-call-dmraid-once.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.XlqsN5/_old  2014-06-26 08:00:34.0 +0200
+++ /var/tmp/diff_new_pack.XlqsN5/_new  2014-06-26 08:00:34.0 +0200
@@ -53,6 +53,8 @@
 Patch13:os-prober-fix-btrfs-subvol-mounted-tests.patch
 # PATCH-FIX-SLE: fix os-prober creates many unusuable entries on multipath 
disk (bnc#875327)
 Patch14:os-prober-skip-part-on-multipath.patch
+# PATCH-FIX-SLE: fix os-prober: dmraid is called without a device list for 
every partition (bnc#883453)
+Patch15:os-prober-call-dmraid-once.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -85,6 +87,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-call-dmraid-once.patch ++
From: Jeff Mahoney je...@suse.com
Subject: os-prober: call dmraid -r *once*
References: bnc#883453

os-prober calls dmraid -r -c unqualifed for every partition and then greps
the result. dmraid -r -c without a device list will scan every device
on the system. Every time. The results will not differ between runs.

This patch saves the results and performs the grep afterward.

Signed-off-by: Jeff Mahoney je...@suse.com
---
 os-prober |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- a/os-prober
+++ b/os-prober
@@ -14,11 +14,17 @@ log_output () {
fi
 }
 
+: $OS_PROBER_TMP/dmraid-map
+DMRAID=$(type dmraid /dev/null 21 || true)
+if [ -n $DMRAID ]; then
+   dmraid -r -c $OS_PROBER_TMP/dmraid-map
+fi
+
 on_sataraid () {
type dmraid /dev/null 21 || return 1
local parent=${1%/*}
local device=/dev/${parent##*/}
-   if dmraid -r -c | grep -q $device; then
+   if grep -q $device $OS_PROBER_TMP/dmraid-map; then
return 0
fi
return 1
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2014-06-19 13:08:38

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2014-06-02 
07:02:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-06-19 
13:08:45.0 +0200
@@ -1,0 +2,8 @@
+Sat May 31 20:49:32 UTC 2014 - crrodrig...@opensuse.org
+
+- Neither dmraid nor lvm are mandatory components to get a 
+ working systemd but this package is, since it is required by grub2.
+ Downgrade the requires to recommends so lvm2/dmraid can be uninstalled
+ without rendering the system unusable.
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.A3BiCt/_old  2014-06-19 13:08:46.0 +0200
+++ /var/tmp/diff_new_pack.A3BiCt/_new  2014-06-19 13:08:46.0 +0200
@@ -59,8 +59,8 @@
 Requires:   /sbin/modprobe
 Requires:   btrfsprogs
 Requires:   coreutils
-Requires:   dmraid
-Requires:   lvm2
+Recommends: dmraid
+Recommends: lvm2
 Requires:   udev
 Requires:   util-linux
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2014-06-02 07:02:57

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2014-01-23 
15:50:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-06-02 
07:02:59.0 +0200
@@ -1,0 +2,7 @@
+Thu May 29 08:26:40 UTC 2014 - mch...@suse.com
+
+- add os-prober-skip-part-on-multipath.patch
+  * fix os-prober creates many unusuable entries on multipath disk
+(bnc#875327)
+
+---

New:

  os-prober-skip-part-on-multipath.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.ahtiWB/_old  2014-06-02 07:03:00.0 +0200
+++ /var/tmp/diff_new_pack.ahtiWB/_new  2014-06-02 07:03:00.0 +0200
@@ -51,6 +51,8 @@
 Patch12:os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
 # PATCH-FIX-OPENSUSE: fix os-prober entries for distro on btrfs root-fs not 
created (bnc#846003)
 Patch13:os-prober-fix-btrfs-subvol-mounted-tests.patch
+# PATCH-FIX-SLE: fix os-prober creates many unusuable entries on multipath 
disk (bnc#875327)
+Patch14:os-prober-skip-part-on-multipath.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -82,6 +84,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-skip-part-on-multipath.patch ++
Index: os-prober-1.61/os-prober
===
--- os-prober-1.61.orig/os-prober
+++ os-prober-1.61/os-prober
@@ -24,6 +24,29 @@ on_sataraid () {
return 1
 }
 
+mp_disks=UNDEF
+on_multipath () {
+   type multipath /dev/null 21 || return 1
+   local parent=${1%/*}
+   local device=${parent##*/}
+
+   if [ $mp_disks = UNDEF ]; then
+   mp_disks=`multipath -d -l | sed -n -e 
's/^.\+[0-9]\+:[0-9]\+:[0-9]\+:[0-9]\+ \([^ ]\+\) .*/\1/p'`
+   fi
+
+   if [ -z $mp_disks ]; then
+   return 1
+   fi
+
+   for i in $mp_disks; do
+   if [ $device = $i ]; then
+   debug $1: part of multipath disk $i
+   return 0
+   fi
+   done
+   return 1
+}
+
 partitions () {
# Exclude partitions that have whole_disk sysfs attribute set.
if [ -d /sys/block ]; then
@@ -31,7 +54,7 @@ partitions () {
# Serial ATA RAID disk.
for part in /sys/block/*/*[0-9]; do
if [ -f $part/start ]  \
-  [ ! -f $part/whole_disk ]  ! on_sataraid $part; 
then
+  [ ! -f $part/whole_disk ]  ! on_sataraid $part 
 ! on_multipath $part; then
name=$(echo ${part##*/} | sed 's,[!.],/,g')
if [ -e /dev/$name ]; then
echo /dev/$name
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2014-01-17 11:05:29

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2013-12-23 
22:17:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2014-01-23 
15:50:54.0 +0100
@@ -1,0 +2,6 @@
+Wed Jan 15 15:59:02 UTC 2014 - arvidj...@gmail.com
+
+- fix os-prober-btrfsfix.patch - current btrfs subvolume list -s
+  adds some extra fields. Adjust field number to get subvolume name.
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.BR7nRj/_old  2014-01-23 15:50:54.0 +0100
+++ /var/tmp/diff_new_pack.BR7nRj/_new  2014-01-23 15:50:54.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -55,12 +55,12 @@
 Requires:   /bin/grep
 Requires:   /bin/sed
 Requires:   /sbin/modprobe
+Requires:   btrfsprogs
 Requires:   coreutils
 Requires:   dmraid
 Requires:   lvm2
 Requires:   udev
 Requires:   util-linux
-Requires:   btrfsprogs
 
 %description
 This package detects other OSes available on a system and outputs the results

++ os-prober-btrfsfix.patch ++
--- /var/tmp/diff_new_pack.BR7nRj/_old  2014-01-23 15:50:54.0 +0100
+++ /var/tmp/diff_new_pack.BR7nRj/_new  2014-01-23 15:50:54.0 +0100
@@ -314,7 +314,7 @@
 +  # besides regular subvols, get ro and snapshot so thet can be excluded
 +subvols=$(btrfs subvolume list $tmpmnt | cut -d ' ' -f 9)
 +rosubvols=$(btrfs subvolume list -r $tmpmnt | cut -d ' ' -f 9)
-+sssubvols=$(btrfs subvolume list -s $tmpmnt | cut -d ' ' -f 9)
++sssubvols=$(btrfs subvolume list -s $tmpmnt | cut -d ' ' -f 14)
 +if ! umount $tmpmnt; then
 +warn failed to umount btrfs volume on $tmpmnt
 +rmdir $tmpmnt || true

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-12-23 22:17:04

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2013-12-10 
17:44:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-12-23 
22:17:05.0 +0100
@@ -1,0 +2,9 @@
+Wed Dec 18 04:16:03 UTC 2013 - mch...@suse.com
+
+- add os-prober-fix-btrfs-subvol-mounted-tests.patch
+  * move btrfs subvolume mounted tests after regualr rootfs tree
+tests to make sure that root and subvolume fs tree are tested.
+  * the test order is just a preference, assuming that distribution
+are installed to root fs tree more likely than to a subvolume.
+
+---

New:

  os-prober-fix-btrfs-subvol-mounted-tests.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.HYFIfF/_old  2013-12-23 22:17:06.0 +0100
+++ /var/tmp/diff_new_pack.HYFIfF/_new  2013-12-23 22:17:06.0 +0100
@@ -49,6 +49,8 @@
 Patch11:os-prober-accept-ESP-on-IMSM.patch
 # PATCH-FIX-OPENSUSE: don't modprobe all file system modules and don't test 
mount on unknown partition (bnc#851722)
 Patch12:os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
+# PATCH-FIX-OPENSUSE: fix os-prober entries for distro on btrfs root-fs not 
created (bnc#846003)
+Patch13:os-prober-fix-btrfs-subvol-mounted-tests.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -79,6 +81,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-fix-btrfs-subvol-mounted-tests.patch ++
Index: os-prober-1.61/os-probes/common/50mounted-tests
===
--- os-prober-1.61.orig/os-probes/common/50mounted-tests
+++ os-prober-1.61/os-probes/common/50mounted-tests
@@ -56,10 +56,54 @@ fi
 
 mounted=
 
-# all btrfs processing here.  Handle both unmounted and
-# mounted subvolumes.
 if [ $types = btrfs ]; then
partition=$BTRFSDEV
+fi
+
+if type grub2-mount /dev/null 21  \
+   type grub2-probe /dev/null 21  \
+   grub2-mount $partition $tmpmnt 2/dev/null; then
+   mounted=1
+   type=$(grub2-probe -d $partition -t fs) || true
+   if [ $type ]; then
+   debug mounted using GRUB $type filesystem driver
+   else
+   debug mounted using GRUB, but unknown filesystem?
+   type=fuseblk
+   fi
+else
+   ro_partition $partition
+   for type in $types; 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
+   for test in /usr/lib/os-probes/mounted/*; do
+   debug running subtest $test
+   if [ -f $test ]  [ -x $test ]; then
+   if $test $partition $tmpmnt $type; then
+   debug os found by subtest $test
+   if ! umount $tmpmnt; then
+   warn failed to umount $tmpmnt
+   fi
+   rmdir $tmpmnt || true
+   exit 0
+   fi
+   fi
+   done
+   if ! umount $tmpmnt; then
+   warn failed to umount $tmpmnt
+   fi
+fi
+
+# all btrfs subvol processing here.  Handle both unmounted and
+# mounted subvolumes.
+if [ $types = btrfs ]; then
debug begin btrfs processing for $UUID
# note that the btrfs volume must not be mounted ro
if mount -t btrfs -U $UUID $tmpmnt  2/dev/null; then
@@ -117,52 +161,9 @@ if [ $types = btrfs ]; then
fi
fi
done
-   rmdir $tmpmnt || true
if [ $found ]; then
+   rmdir $tmpmnt || true
exit 0
-   else
-   exit 1
-   fi
-fi
-
-if type grub2-mount /dev/null 21  \
-   type grub2-probe /dev/null 21  \
-   grub2-mount $partition $tmpmnt 2/dev/null; then
-   mounted=1
-   type=$(grub2-probe -d $partition -t fs) || true
-   if [ $type ]; then
-   debug mounted using GRUB $type filesystem driver
-   else
-   debug mounted using GRUB, but unknown filesystem?
-   type=fuseblk
-   fi
-else
-   ro_partition $partition
-   for type in 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-12-10 17:44:19

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2013-11-10 
15:07:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-12-10 
17:44:20.0 +0100
@@ -1,0 +2,9 @@
+Fri Dec  6 09:21:55 UTC 2013 - mch...@suse.com
+
+- add os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
+  * don't modprobe that many kernel file system modules before mount
+as mount will take care that for us (bnc#782689)
+  * don't test mount on partitions without any known file system
+detected (bnc#851722) 
+
+---

New:

  os-prober-dont-load-all-fs-module-and-dont-test-mount.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.WGMeMp/_old  2013-12-10 17:44:21.0 +0100
+++ /var/tmp/diff_new_pack.WGMeMp/_new  2013-12-10 17:44:21.0 +0100
@@ -47,6 +47,8 @@
 Patch10:os-prober-EFI-openSUSEfy.patch
 # PATCH-FIX-OPENSUSE: accept ESP on IMSM MD raid (bnc#818871)
 Patch11:os-prober-accept-ESP-on-IMSM.patch
+# PATCH-FIX-OPENSUSE: don't modprobe all file system modules and don't test 
mount on unknown partition (bnc#851722)
+Patch12:os-prober-dont-load-all-fs-module-and-dont-test-mount.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -76,6 +78,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-dont-load-all-fs-module-and-dont-test-mount.patch ++
Index: os-prober-1.61/os-probes/common/50mounted-tests
===
--- os-prober-1.61.orig/os-probes/common/50mounted-tests
+++ os-prober-1.61/os-probes/common/50mounted-tests
@@ -40,19 +40,13 @@ elif [ -z $types ]; then
debug $1 is a LUKS partition; skipping
exit 0
fi
-   for type in $(grep -v nodev /proc/filesystems); do
-   # hfsplus filesystems are mountable as hfs. Try hfs last so
-   # that we can tell the difference.
-   if [ $type = hfs ]; then
-   delaytypes=${delaytypes:+$delaytypes }$type
-   elif [ $type = fuseblk ]; then
-   if type ntfs-3g /dev/null 21; then
-   types=${types:+$types }ntfs-3g
-   fi
-   else
-   types=${types:+$types }$type
-   fi
-   done
+
+   # Simply skip such partition is better than trying to detect
+   # it by blinded test mounts with all kinds of kernel file system,
+   # that would lead to unwanted consequence like kernel oops and
+   # risk to corrupt your system and data.
+   debug $1 is a partition without file system; skipping
+   exit 0
 fi
 
 tmpmnt=/var/lib/os-prober/mount
@@ -144,7 +138,7 @@ if type grub2-mount /dev/null 21  \
fi
 else
ro_partition $partition
-   for type in $types $delaytypes; do
+   for type in $types; do
if mount -o ro -t $type $partition $tmpmnt 2/dev/null; 
then
debug mounted as $type filesystem
mounted=1
Index: os-prober-1.61/os-probes/init/common/10filesystems
===
--- os-prober-1.61.orig/os-probes/init/common/10filesystems
+++ os-prober-1.61/os-probes/init/common/10filesystems
@@ -1,39 +1,21 @@
 #!/bin/sh
 # Make sure filesystems are available.
-set +e # ignore errors from modprobe
+set -e
 
-FILESYSTEMS='ext2 ext3 ext4 reiserfs xfs jfs msdos vfat ntfs minix hfs hfsplus 
qnx4 ufs btrfs'
-# 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.
-FILESYSTEMS=$FILESYSTEMS fs-core fs-secondary
-
-if [ ! -e /var/lib/os-prober/modules ]; then
-   # Check for anna-install to make it easier to use os-prober outside
-   # d-i.
-   if type anna-install /dev/null 21  [ -d /lib/debian-installer ]; 
then
-   for fs in $FILESYSTEMS; do
-   ANNA_QUIET=1 DEBIAN_FRONTEND=none \
-   log-output -t os-prober \
-   anna-install $fs-modules || true
-   done
-   depmod -a /dev/null 21 || true
-   fi
+# Make sure fuse is 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-11-10 15:07:26

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2013-08-28 
21:16:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-11-10 
15:07:27.0 +0100
@@ -1,0 +2,5 @@
+Thu Nov  7 07:01:44 UTC 2013 - mch...@suse.com
+
+- add require btrfsprogs
+
+---



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.sRp2pV/_old  2013-11-10 15:07:27.0 +0100
+++ /var/tmp/diff_new_pack.sRp2pV/_new  2013-11-10 15:07:27.0 +0100
@@ -56,6 +56,7 @@
 Requires:   lvm2
 Requires:   udev
 Requires:   util-linux
+Requires:   btrfsprogs
 
 %description
 This package detects other OSes available on a system and outputs the results

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-08-28 21:16:34

Comparing /work/SRC/openSUSE:Factory/os-prober (Old)
 and  /work/SRC/openSUSE:Factory/.os-prober.new (New)


Package is os-prober

Changes:

--- /work/SRC/openSUSE:Factory/os-prober/os-prober.changes  2013-06-19 
14:53:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-08-28 
21:16:36.0 +0200
@@ -1,0 +2,6 @@
+Sun Aug 18 18:54:20 UTC 2013 - arvidj...@gmail.com
+
+- add os-prober-accept-ESP-on-IMSM.patch
+  * accept EFI partition on IMSM MD array (bnc#818871)
+  * fix DOS partition table detection 
+

New:

  os-prober-accept-ESP-on-IMSM.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.M0fMBi/_old  2013-08-28 21:16:37.0 +0200
+++ /var/tmp/diff_new_pack.M0fMBi/_new  2013-08-28 21:16:37.0 +0200
@@ -45,6 +45,8 @@
 Patch9: os-prober-btrfsfix.patch
 # PATCH-FIX-OPENSUSE: difference between upstream and our previous scripts
 Patch10:os-prober-EFI-openSUSEfy.patch
+# PATCH-FIX-OPENSUSE: accept ESP on IMSM MD raid (bnc#818871)
+Patch11:os-prober-accept-ESP-on-IMSM.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -72,6 +74,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-accept-ESP-on-IMSM.patch ++
Index: os-prober-1.61/os-probes/mounted/x86/05efi
===
--- os-prober-1.61.orig/os-probes/mounted/x86/05efi
+++ os-prober-1.61/os-probes/mounted/x86/05efi
@@ -28,20 +28,31 @@ if type udevadm  /dev/null 21; then
 fi
 
 if type udevinfo  /dev/null 21; then
-   # Skip virtual devices
+   eval $(udevinfo -q property -n $partition | grep -E 
'^(MD_CONTAINER|ID_PART_ENTRY_(TYPE|SCHEME))=')
+   debug $partition container is '$MD_CONTAINER'
+
+   # Skip virtual devices unless they are known SW-RAID
if udevinfo -q path -n $partition | grep -q /virtual/; then
-   debug $1 is virtual device: exiting
-   exit 1
+   # Check for Intel Matrix array
+   if [ -n $MD_CONTAINER ]; then 
+   eval $(udevinfo -q property -n $MD_CONTAINER | grep 
-E '^MD_METADATA=')
+   debug $MD_CONTAINER metadata is '$MD_METADATA'
+   fi
+   if [ $MD_METADATA = imsm ]; then
+   debug $partition is on IMSM array
+   else
+   debug $1 is virtual device: exiting
+   exit 1
+   fi
fi
 
-   eval $(udevinfo -q property -n $partition | grep -E 
'^ID_PART_ENTRY_(TYPE|SCHEME)=')
debug $partition partition scheme is $ID_PART_ENTRY_SCHEME
debug $partition partition type is $ID_PART_ENTRY_TYPE
 
if [ -z $ID_PART_ENTRY_TYPE -o -z $ID_PART_ENTRY_SCHEME -o \
-   \( $ID_PART_ENTRY_SCHEME != gpt -a $ID_PART_ENTRY_SCHEME != 
msdos \) -o \
+   \( $ID_PART_ENTRY_SCHEME != gpt -a $ID_PART_ENTRY_SCHEME != 
dos \) -o \
\( $ID_PART_ENTRY_SCHEME = gpt -a $ID_PART_ENTRY_TYPE != 
c12a7328-f81f-11d2-ba4b-00a0c93ec93b \) -o \
-   \( $ID_PART_ENTRY_SCHEME = msdos -a $ID_PART_ENTRY_TYPE != 
0xef \) ]; then
+   \( $ID_PART_ENTRY_SCHEME = dos -a $ID_PART_ENTRY_TYPE != 
0xef \) ]; then
debug $partition is not a ESP partition: exiting
exit 1
fi
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-04-07 14:24:52

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-03-25 
20:41:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-04-07 
14:24:52.0 +0200
@@ -1,0 +2,6 @@
+Fri Apr  5 16:33:28 UTC 2013 - arvidj...@gmail.com
+
+- add os-prober-linux-secure-boot.patch (bnc#810912)
+  * recognize linuxefi/initrdefi too
+
+---

New:

  os-prober-linux-secure-boot.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.vJFz7l/_old  2013-04-07 14:24:55.0 +0200
+++ /var/tmp/diff_new_pack.vJFz7l/_new  2013-04-07 14:24:55.0 +0200
@@ -46,6 +46,8 @@
 Patch6: os-prober-usr_lib-detection.patch
 # PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006)
 Patch7: os-prober-probe-MD-devices.patch
+# PATCH-FIX-OPENSUSE: Detect linux secure boot entries too (bnc#810912)
+Patch8: os-prober-linux-secure-boot.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -72,6 +74,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-linux-secure-boot.patch ++
From: Andrey Borzenkov arvidj...@gmail.com
Subject: detect linuxefi/initrdefi secure bootloaders too
Reference: bnc#810912

Recognize initrdefi and linuxefi too. Whether linux/initrd or
linuxefi/initrdefi will be emitted is controlled by SECURE_BOOT
setting in /etc/sysconfig/bootloader.
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -64,7 +64,7 @@ parse_grub_menu () {
ignore_item=1
fi
;;
-   linux[ ]*)
+   linux[ ]*|linuxefi[  ]*)
# And here we do NOT want to strip off
# existing quting, which will be transferred
# verbatim in new grub.cfg
@@ -83,7 +83,7 @@ parse_grub_menu () {
kernel=/boot$kernel
fi
;;
-   initrd[]*)
+   initrd[]*|initrdefi[ ]*)
# And here we do NOT want to strip off
# existing quting, which will be transferred
# verbatim in new grub.cfg
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-03-25 20:40:26

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-03-04 
17:29:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-03-25 
20:41:46.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar 22 17:29:32 UTC 2013 - arvidj...@gmail.com
+
+- add os-prober-probe-MD-devices.patch (bnc#811006)
+  * probe also Linux MD devices
+
+---

New:

  os-prober-probe-MD-devices.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.TMVd3G/_old  2013-03-25 20:41:47.0 +0100
+++ /var/tmp/diff_new_pack.TMVd3G/_new  2013-03-25 20:41:47.0 +0100
@@ -44,6 +44,8 @@
 Patch5: os-prober-1.49-grub2-mount.patch
 # PATCH-FIX-OPENSUSE: Detect distributions which moved /lib to /usr/lib
 Patch6: os-prober-usr_lib-detection.patch
+# PATCH-FIX-OPENSUSE: Probe also unpartitioned Linux MD devices (bnc#811006)
+Patch7: os-prober-probe-MD-devices.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -69,6 +71,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-probe-MD-devices.patch ++
Index: os-prober/os-prober
===
--- os-prober.orig/os-prober
+++ os-prober/os-prober
@@ -39,6 +39,11 @@ partitions () {
fi
done
 
+   # Add Linux MD unpartioned devices. Linux MD partitions are 
already covered above
+   [ -f /proc/mdstat ]  grep '^md' /proc/mdstat | while read md 
line; do
+   [ -e /dev/$md ]  echo /dev/$md
+   done
+
# Add Serial ATA RAID devices
if type dmraid /dev/null 21  \
   dmraid -s -c /dev/null 21; then
@@ -79,7 +84,8 @@ parse_proc_mdstat () {
udevadm info $@
}
fi
-   while read line; do
+   # Only add MD slaves to the list
+   while read md line; do
for word in $line; do
dev=${word%%[*}
# TODO: factor this out to something in di-utils if
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-03-04 17:29:31

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-02-10 
15:20:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-03-04 
17:29:33.0 +0100
@@ -1,0 +2,5 @@
+Sun Mar  3 16:06:32 UTC 2013 - arvidj...@gmail.com
+
+- 05efi - accept FUSE as valid filesystem too (bnc#807190)
+
+---



Other differences:
--
++ 05efi ++
--- /var/tmp/diff_new_pack.wM0Thp/_old  2013-03-04 17:29:35.0 +0100
+++ /var/tmp/diff_new_pack.wM0Thp/_new  2013-03-04 17:29:35.0 +0100
@@ -17,6 +17,7 @@
 case $type in
vfat) debug $1 is a FAT32 partition ;;
msdos) debug $1 is a FAT16 partition ;;
+   fuse|fuseblk) debug $1 is a FUSE partition ;; # might be GRUB
*) debug $1 is $type partition: exiting; exit 1 ;;
 esac
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-02-10 15:20:28

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-29 
07:01:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-02-10 
15:20:30.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb  8 15:16:13 UTC 2013 - arvidj...@gmail.com
+
+- os-prober-usr_lib-detection.patch - fix detection of linux distro
+  which moved /lib to /usr/lib (e.g. Fedora)
+
+---

New:

  os-prober-usr_lib-detection.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.9yOPsC/_old  2013-02-10 15:20:32.0 +0100
+++ /var/tmp/diff_new_pack.9yOPsC/_new  2013-02-10 15:20:32.0 +0100
@@ -42,6 +42,8 @@
 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
+# PATCH-FIX-OPENSUSE: Detect distributions which moved /lib to /usr/lib
+Patch6: os-prober-usr_lib-detection.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -66,6 +68,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-usr_lib-detection.patch ++
From: Andrey Borzenkov arvidj...@gmail.com
Subject: fix detection of distributions with /lib = /usr/lib symlink
Upstream: yes

grub-mount does not implement symbolic links, so distributions
that replaced /lib with /usr/lib were not detected. Check both
/lib and /usr/lib. Patch taken from upstream version.

Affected is e.g. Fedora 18.
Index: os-prober/os-probes/mounted/common/90linux-distro
===
--- os-prober.orig/os-probes/mounted/common/90linux-distro
+++ os-prober/os-probes/mounted/common/90linux-distro
@@ -13,7 +13,7 @@ type=$3
 # better. Make sure this test has a high number so that more accurate tests
 # can come first.
 # TODO: look for ld-linux.so on arches that have it
-if ls $dir/lib*/ld*.so* /dev/null 2/dev/null; then
+if (ls $dir/lib*/ld*.so* || ls $dir/usr/lib*/ld*.so*) /dev/null 
2/dev/null; then
if [ -e $dir/etc/debian_version ]; then
short=Debian
long=$(printf Debian GNU/Linux (%s)\n $(cat 
$dir/etc/debian_version))
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

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.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-01-29 
07:01:38.0 +0100
@@ -1,0 +2,6 @@
+Sat Jan 19 19:12:20 UTC 2013 - arvidj...@gmail.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.jJtVtO/_new  2013-01-29 07:01:40.0 +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 arvidj...@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/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 21  \
-  grub-mount $boottomnt 
$tmpmnt/boot 2/dev/null; then
+   if which grub2-mount /dev/null 21  
\
+  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 21  \
-   grub-mount $partition $tmpmnt 2/dev/null; then
+if which grub2-mount /dev/null 21  \
+   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 21  \
-   grub-mount $partition $tmpmnt 2/dev/null; then
+if which grub2-mount /dev/null 21  \
+   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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-01-08 21:11:56

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-07 
17:30:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-01-08 
21:11:58.0 +0100
@@ -1,0 +2,5 @@
+Tue Jan  8 07:14:53 UTC 2013 - arvidj...@gmail.com
+
+- add os-prober-1.49-fix-grub2.cfg-parsing.patch (bnc#796919)
+
+---

New:

  os-prober-1.49-fix-grub2.cfg-parsing.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.ru6agI/_old  2013-01-08 21:11:59.0 +0100
+++ /var/tmp/diff_new_pack.ru6agI/_new  2013-01-08 21:11:59.0 +0100
@@ -36,6 +36,8 @@
 Patch1: os-prober-SUSE.patch
 # PATCH-FIX-OPENSUSE: Skip legacy Microsoft bootloader on UEFI [bnc#775610]
 Patch2: os-prober-skip-MS-legacy-on-UEFI.patch
+# PATCH-FIX-OPENSUSE: Fix parsing of grub.cfg [bnc#796919]
+Patch3: os-prober-1.49-fix-grub2.cfg-parsing.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -57,6 +59,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}

++ os-prober-1.49-fix-grub2.cfg-parsing.patch ++
From: Andrey Borzenkov arvidj...@gmail.com
Subject: fix parsing GRUB2 grub.cfg
References: bnc#796919

Fix several problems in parsing of grub.cfg by
linux-boot-probes/mounted/40grub2

1. It looked for /boot/grub/grub.cfg only. Make it check for
/boot/grub2-efi/grub.cfg, /boot/grub2/grub.cfg, /boot/grub/grub.cfg in
that order

2. Parsing of menuentry was completely broken. It is (near to) impossible
to parse full fledged shell quoted strings with a couple of sed expressions.
Replace it with ``eval set -- $line'', which should handle quoting
automatically. It still may fail for manually created grub.cfg though.

3. It checked for literal (on /dev/.*) to filter out menu entries
added by another os-prober on target system. But grub.cfg now includes
TRANSLATED strings, so this check will fail if grub.cfg was created in
non-English locale. Relax check and make it '(.* /dev/.*)'. It should
work as long as grub.cfg was created by grub-mkconfig.
Index: os-prober/linux-boot-probes/mounted/common/40grub2
===
--- os-prober.orig/linux-boot-probes/mounted/common/40grub2
+++ os-prober/linux-boot-probes/mounted/common/40grub2
@@ -34,33 +34,43 @@ parse_grub_menu () {
title=
ignore_item=0
 
-   while read line; do
+   # grub.cfg is written in shell like language that can contain
+   # arbitrary quoting. We need to extract second word according to
+   # normal quoting rules. Unfortunately, sticking ``eval $line'' for
+   # every line will try to interpret it according to shell
+   # grammar and error out for something as simple as xxx; then.
+   # So the following is using it only on known cases.
+   # FIXME: it will fail if ``menuentry'' is not the first word on line.
+   # case patterns below include SPACE and TAB.
+   while read -r line; do
debug parsing: $line
-   set -f
-   set -- $line
-   set +f
-   case $1 in
-   menuentry)
+   line=$(printf %s $line | sed -e 's/^[[:space:]]*//')
+   case $line in
+   menuentry[ ]*)
entry_result
-   shift 1
-   # The double-quoted string is the title.
-   title=$(echo $@ | sed -n 
's/[^]*\(.*\).*/\1/p' | sed 's/://g')
-   if [ -z $title ]; then
-   # ... or single-quoted?  The
-   # unescaping here is odd because the
-   # 'set' above has already eaten
-   # backslash-escapes.
-   title=$(echo $@ | sed -n 
s/[^']*'\(.*\)'.*/\1/p | sed s/'''/'/; s/://g)
-   fi
+   set -f
+   eval set -- $line
+   set +f
+   title=$2
if [ -z $title ]; then
ignore_item=1
-   elif echo 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2013-01-07 17:30:17

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  2012-01-04 
07:25:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2013-01-07 
17:30:20.0 +0100
@@ -1,0 +2,9 @@
+Fri Jan  4 11:18:01 UTC 2013 - arvidj...@gmail.com
+
+- add support for chainloading another UEFI bootloader (bnc#775610)
+  * 05efi - top level driver to search ESP
+  * efi-20microsoft - support Microsoft UEFI bootloader
+  * efi-10elilo - support ELILO UEFI bootloader (Agnelo de la Crotche)
+- skip legacy Microsoft bootloader on UEFI (bnc#775610)
+
+---

New:

  05efi
  efi-10elilo
  efi-20microsoft
  os-prober-skip-MS-legacy-on-UEFI.patch



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.ejG8cw/_old  2013-01-07 17:30:21.0 +0100
+++ /var/tmp/diff_new_pack.ejG8cw/_new  2013-01-07 17:30:21.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package os-prober
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:   os-prober
 Version:1.49
 Release:0
@@ -27,11 +26,16 @@
 Url:http://kitenet.net/~joey/code/os-prober/
 Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz
 Source1:COPYING-note.txt
+Source2:05efi
+Source3:efi-20microsoft
+Source4:efi-10elilo
 # move newns binary outside of os-prober subdirectory, so that debuginfo
 # can be automatically generated for it
 Patch0: os-prober-newnsdirfix.patch
 # PATCH-FIX-OPENSUSE: Fix spelling of SUSE a...@suse.de
 Patch1: os-prober-SUSE.patch
+# PATCH-FIX-OPENSUSE: Skip legacy Microsoft bootloader on UEFI [bnc#775610]
+Patch2: os-prober-skip-MS-legacy-on-UEFI.patch
 
 Requires:   /bin/grep
 Requires:   /bin/sed
@@ -52,6 +56,7 @@
 cp %SOURCE1 .
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}
@@ -88,6 +93,12 @@
 if [ $ARCH = x86 ]; then
 install -m 755 -p os-probes/mounted/powerpc/20macosx \
 %{buildroot}%{_libexecdir}/os-probes/mounted
+install -m 755 -p %SOURCE2 %{buildroot}%{_libexecdir}/os-probes/mounted
+install -m 755 -d %{buildroot}%{_libexecdir}/os-probes/mounted/efi
+install -m 755 -p %SOURCE3 \
+%{buildroot}%{_libexecdir}/os-probes/mounted/efi/20microsoft
+install -m 755 -p %SOURCE4 \
+%{buildroot}%{_libexecdir}/os-probes/mounted/efi/10elilo
 fi
 
 %files

++ 05efi ++
#!/bin/sh
# Detects all UEFI bootloaders on EFI System Partition

. /usr/share/os-prober/common.sh

partition=$1
mpoint=$2
type=$3

# This file is for UEFI platform only
if [ ! -d /sys/firmware/efi ]; then
debug Not on UEFI platform
exit 1
fi

# Weed out stuff that doesn't apply to us
case $type in
vfat) debug $1 is a FAT32 partition ;;
msdos) debug $1 is a FAT16 partition ;;
*) debug $1 is $type partition: exiting; exit 1 ;;
esac

if type udevadm  /dev/null 21; then
udevinfo () {
udevadm info $@
}
fi

if type udevinfo  /dev/null 21; then
# Skip virtual devices
if udevinfo -q path -n $partition | grep -q /virtual/; then
debug $1 is virtual device: exiting
exit 1
fi

eval $(udevinfo -q property -n $partition | grep -E 
'^ID_PART_ENTRY_(TYPE|SCHEME)=')
debug $partition partition scheme is $ID_PART_ENTRY_SCHEME
debug $partition partition type is $ID_PART_ENTRY_TYPE

if [ -z $ID_PART_ENTRY_TYPE -o -z $ID_PART_ENTRY_SCHEME -o \
\( $ID_PART_ENTRY_SCHEME != gpt -a $ID_PART_ENTRY_SCHEME != 
msdos \) -o \
\( $ID_PART_ENTRY_SCHEME = gpt -a $ID_PART_ENTRY_TYPE != 
c12a7328-f81f-11d2-ba4b-00a0c93ec93b \) -o \
\( $ID_PART_ENTRY_SCHEME = msdos -a $ID_PART_ENTRY_TYPE != 
0xef \) ]; then
debug $partition is not a ESP partition: exiting
exit 1
fi
else
debug udevinfo and udevadm missing - cannot check partition type
fi

efi=$(item_in_dir efi $mpoint)
if [ -z $efi ]; then

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory 
checked in at 2012-01-04 07:25:43

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  2011-10-04 
18:14:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.os-prober.new/os-prober.changes 2012-01-04 
07:25:44.0 +0100
@@ -1,0 +2,18 @@
+Mon Dec 19 11:13:44 UTC 2011 - a...@suse.de
+
+- Clarify license.
+
+---
+Thu Dec  8 12:23:12 UTC 2011 - a...@suse.de
+
+- Update to 1.49:
+  * MeeGo detection support
+  * Bugfixes
+
+---
+Thu Dec  8 11:18:49 UTC 2011 - co...@suse.com
+
+- this seems to be GPL as it was understood 2004, so guessing
+  GPL-2.0+
+
+---

Old:

  os-prober_1.47.tar.gz

New:

  COPYING-note.txt
  os-prober_1.49.tar.gz



Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.k2FHzU/_old  2012-01-04 07:25:45.0 +0100
+++ /var/tmp/diff_new_pack.k2FHzU/_new  2012-01-04 07:25:45.0 +0100
@@ -18,14 +18,15 @@
 
 
 Name:   os-prober
-Version:1.47
-Release:1
+Version:1.49
+Release:0
 Summary:Probes disks on the system for installed operating systems
+License:GPL-2.0+
+Group:  System/Boot
 
-License:GPL
 Url:http://kitenet.net/~joey/code/os-prober/
-Group:  System/Boot
 Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz
+Source1:COPYING-note.txt
 # move newns binary outside of os-prober subdirectory, so that debuginfo
 # can be automatically generated for it
 Patch0: os-prober-newnsdirfix.patch
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q -n %{name}
+cp %SOURCE1 .
 %patch0 -p1
 %patch1 -p1
 
@@ -90,7 +92,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO debian/copyright debian/changelog
+%doc README TODO debian/copyright debian/changelog COPYING-note.txt
 %{_bindir}/*
 %{_libexecdir}/linux-boot-probes
 %{_libexecdir}/newns

++ COPYING-note.txt ++
Version 1.50 of os-prober contains a license clarification, the
license of the package is GPL-2+, see for example the following commits:

http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commitdiff;h=249d0814ae9c6e308bd4ec4e0a403a592ffd
http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=25024daeccd86cec17353455b99af677b3b83b16
http://anonscm.debian.org/gitweb/?p=d-i/os-prober.git;a=commit;h=cc0ce8e5ec252b10127ca3ebb71c12cd31d4ebc4

The copyright file reads as of 2011-12-19:

The majority of code in os-prober is Copyright 2004-2011 by Joshua
Kwan, Joey Hess, Christian Perrier, Colin Watson and Otavio Salvador.
This is licensed under the terms of the GNU GPL, either version 2 or,
at your option, any later version.

Some portions of os-prober by other contributors has an unclear license
of GNU GPL, with the version not specified.

On Debian systems, a copy of the GNU General Public License is available in
/usr/share/common-licenses/GPL.
++ os-prober_1.47.tar.gz - os-prober_1.49.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-prober/common.sh new/os-prober/common.sh
--- old/os-prober/common.sh 2011-05-14 18:09:08.0 +0200
+++ new/os-prober/common.sh 2011-07-23 15:54:37.0 +0200
@@ -98,6 +98,7 @@
else
q=
fi
+   [ -d $2 ] || return 1
# find files with any case
ls -1 $2 | grep $q -i ^$1$
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/os-prober/debian/changelog 
new/os-prober/debian/changelog
--- old/os-prober/debian/changelog  2011-05-15 22:49:10.0 +0200
+++ new/os-prober/debian/changelog  2011-08-29 13:34:22.0 +0200
@@ -1,3 +1,29 @@
+os-prober (1.49) unstable; urgency=low
+
+  [ Robert Millan ]
+  * Depend on grub-mount-udeb only on architectures with FUSE support.
+
+  [ Colin Watson ]
+  * Restrict grub-mount-udeb dependency to architectures where
+grub-mount-udeb exists (closes: #639599).
+
+ -- Colin Watson cjwat...@debian.org  Mon, 29 Aug 2011 12:34:21 +0100
+
+os-prober (1.48) unstable; urgency=low
+
+  [ Colin Watson ]
+  * Depend on grub-mount-udeb (see changelog for 1.45).
+  * item_in_dir: return 1 immediately if second argument is not a directory
+(thanks, Daniel Richard G.; LP: #798447).
+
+  [ Otavio Salvador ]
+  * 

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory
checked in at Tue Oct 4 18:14:25 CEST 2011.




--- openSUSE:Factory/os-prober/os-prober.changes2011-09-23 
12:21:07.0 +0200
+++ /mounts/work_src_done/STABLE/os-prober/os-prober.changes2011-09-30 
17:53:38.0 +0200
@@ -1,0 +2,5 @@
+Fri Sep 30 15:53:26 UTC 2011 - u...@suse.com
+
+- cross-build fix: use %__cc macro
+
+---

calling whatdependson for head-i586




Other differences:
--
++ os-prober.spec ++
--- /var/tmp/diff_new_pack.MCRr10/_old  2011-10-04 18:14:22.0 +0200
+++ /var/tmp/diff_new_pack.MCRr10/_new  2011-10-04 18:14:22.0 +0200
@@ -52,7 +52,7 @@
 %patch1 -p1
 
 %build
-make %{?_smp_mflags} CFLAGS=%{optflags}
+make %{?_smp_mflags} CC=%__cc CFLAGS=%{optflags}
 
 %install
 install -m 0755 -d %{buildroot}%{_bindir}

continue with q...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit os-prober for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package os-prober for openSUSE:Factory
checked in at Fri Jul 29 16:52:24 CEST 2011.




New Changes file:

--- /dev/null   2010-08-26 16:28:41.0 +0200
+++ /mounts/work_src_done/STABLE/os-prober/os-prober.changes2011-07-12 
15:22:12.0 +0200
@@ -0,0 +1,5 @@
+---
+Tue Jul 12 13:08:58 UTC 2011 - a...@suse.de
+
+- Create new package.
+

calling whatdependson for head-i586


New:

  os-prober-SUSE.patch
  os-prober-newnsdirfix.patch
  os-prober.changes
  os-prober.spec
  os-prober_1.47.tar.gz



Other differences:
--
++ os-prober.spec ++
#
# spec file for package os-prober
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An Open Source License is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#



Name:   os-prober
Version:1.47
Release:1
Summary:Probes disks on the system for installed operating systems

License:GPL
Url:http://kitenet.net/~joey/code/os-prober/
Group:  System/Boot
Source0:
http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.tar.gz
# move newns binary outside of os-prober subdirectory, so that debuginfo
# can be automatically generated for it
Patch0: os-prober-newnsdirfix.patch
# PATCH-FIX-OPENSUSE: Fix spelling of SUSE a...@suse.de
Patch1: os-prober-SUSE.patch

Requires:   /bin/grep
Requires:   /bin/sed
Requires:   /sbin/modprobe
Requires:   coreutils
Requires:   dmraid
Requires:   lvm2
Requires:   udev
Requires:   util-linux

%description
This package detects other OSes available on a system and outputs the results
in a generic machine-readable format. Support for new OSes and Linux
distributions can be added easily.

%prep
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1

%build
make %{?_smp_mflags} CFLAGS=%{optflags}

%install
install -m 0755 -d %{buildroot}%{_bindir}
install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name}

install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir}
install -m 0755 -Dp newns %{buildroot}%{_libexecdir}/newns
install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh

%ifarch m68k
ARCH=m68k
%endif
%ifarch ppc ppc64
ARCH=powerpc
%endif
%ifarch sparc sparc64
ARCH=sparc
%endif
%ifarch %{ix86} x86_64
ARCH=x86
%endif

for probes in os-probes os-probes/mounted os-probes/init \
  linux-boot-probes linux-boot-probes/mounted; do
install -m 755 -d %{buildroot}%{_libexecdir}/$probes
cp -a $probes/common/* %{buildroot}%{_libexecdir}/$probes
if [ -e $probes/$ARCH ]; then
cp -a $probes/$ARCH/* %{buildroot}%{_libexecdir}/$probes
fi
done
if [ $ARCH = x86 ]; then
install -m 755 -p os-probes/mounted/powerpc/20macosx \
%{buildroot}%{_libexecdir}/os-probes/mounted
fi

%files
%defattr(-,root,root,-)
%doc README TODO debian/copyright debian/changelog
%{_bindir}/*
%{_libexecdir}/linux-boot-probes
%{_libexecdir}/newns
%{_libexecdir}/os-probes
%{_datadir}/%{name}
%{_localstatedir}/lib/%{name}

%changelog
++ os-prober-SUSE.patch ++
Index: os-prober/os-probes/mounted/common/90linux-distro
===
--- os-prober.orig/os-probes/mounted/common/90linux-distro
+++ os-prober/os-probes/mounted/common/90linux-distro
@@ -80,7 +80,7 @@ if ls $dir/lib*/ld*.so* /dev/null 2/
short=RedHat
long=$(cat $dir/etc/redhat-release)
elif [ -e $dir/etc/SuSE-release ]; then
-   short=SuSE
+   short=SUSE
long=$(head -n 1 $dir/etc/SuSE-release)
elif [ -e $dir/etc/gentoo-release ]; then
short=Gentoo
++ os-prober-newnsdirfix.patch ++
diff -up os-prober-1.46/common.sh.newnsmove os-prober-1.46/common.sh
--- os-prober-1.46/common.sh.newnsmove  2011-04-10 05:30:57.0 +0430
+++ os-prober-1.46/common.sh2011-05-04 04:08:09.603020037 +0430
@@ -1,5 +1,5 @@
 newns () {
-  [ $OS_PROBER_NEWNS ] || exec /usr/lib/os-prober/newns $0 $@
+  [ $OS_PROBER_NEWNS ] || exec /usr/lib/newns $0 $@
 }
 
 cleanup_tmpdir=false





Remember to have