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 - [email protected] + +- 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 "$tmpmnt" ]; then +--- os-prober-1.76.orig/os-probes/common/50mounted-tests ++++ os-prober-1.76/os-probes/common/50mounted-tests +@@ -58,11 +58,11 @@ if [ ! -d "$tmpmnt" ]; then fi mounted= @@ -53,10 +53,10 @@ if [ "$type" ]; then debug "mounted using GRUB $type filesystem driver" else -Index: os-prober/os-probes/init/common/10filesystems +Index: os-prober-1.76/os-probes/init/common/10filesystems =================================================================== ---- os-prober.orig/os-probes/init/common/10filesystems -+++ os-prober/os-probes/init/common/10filesystems +--- os-prober-1.76.orig/os-probes/init/common/10filesystems ++++ os-prober-1.76/os-probes/init/common/10filesystems @@ -3,7 +3,7 @@ set +e # ignore errors from modprobe ++++++ os-prober-accept-ESP-on-IMSM.patch ++++++ --- /var/tmp/diff_new_pack.xVSv2k/_old 2018-10-22 11:02:53.000298543 +0200 +++ /var/tmp/diff_new_pack.xVSv2k/_new 2018-10-22 11:02:53.004298540 +0200 @@ -1,8 +1,8 @@ -Index: os-prober-1.61/os-probes/mounted/x86/05efi +Index: os-prober-1.76/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 2>&1; then +--- os-prober-1.76.orig/os-probes/mounted/x86/05efi ++++ os-prober-1.76/os-probes/mounted/x86/05efi +@@ -28,13 +28,24 @@ if type udevadm > /dev/null 2>&1; then fi if type udevinfo > /dev/null 2>&1; then @@ -31,12 +31,3 @@ 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 ++++++ os-prober-dont-load-all-fs-module-and-dont-test-mount.patch ++++++ --- /var/tmp/diff_new_pack.xVSv2k/_old 2018-10-22 11:02:53.024298522 +0200 +++ /var/tmp/diff_new_pack.xVSv2k/_new 2018-10-22 11:02:53.024298522 +0200 @@ -1,8 +1,8 @@ -Index: os-prober/os-probes/common/50mounted-tests +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 -@@ -57,19 +57,13 @@ elif [ -z "$types" ]; then +--- os-prober-1.76.orig/os-probes/common/50mounted-tests ++++ os-prober-1.76/os-probes/common/50mounted-tests +@@ -49,19 +49,13 @@ elif [ -z "$types" ]; then debug "$1 is a LUKS partition; skipping" exit 0 fi @@ -29,19 +29,10 @@ fi tmpmnt=/var/lib/os-prober/mount -@@ -161,7 +155,7 @@ if type grub2-mount >/dev/null 2>&1 && \ - fi - elif dm_device="$(do_dmsetup osprober "$partition")" && \ - [ "$dm_device" ]; then -- for type in $types $delaytypes; do -+ for type in $types; do - if mountinfo=`mount -o ro -t "$type" "$dm_device" "$tmpmnt" 2>&1`; then - debug "mounted as $type filesystem" - mounted=1 -Index: os-prober/os-probes/init/common/10filesystems +Index: os-prober-1.76/os-probes/init/common/10filesystems =================================================================== ---- os-prober.orig/os-probes/init/common/10filesystems -+++ os-prober/os-probes/init/common/10filesystems +--- os-prober-1.76.orig/os-probes/init/common/10filesystems ++++ os-prober-1.76/os-probes/init/common/10filesystems @@ -1,39 +1,19 @@ #!/bin/sh # Make sure filesystems are available. ++++++ os-prober-fix-btrfs-subvol-mounted-tests.patch ++++++ --- /var/tmp/diff_new_pack.xVSv2k/_old 2018-10-22 11:02:53.032298515 +0200 +++ /var/tmp/diff_new_pack.xVSv2k/_new 2018-10-22 11:02:53.032298515 +0200 @@ -1,8 +1,8 @@ -Index: os-prober/os-probes/common/50mounted-tests +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 -@@ -73,10 +73,51 @@ fi +--- os-prober-1.76.orig/os-probes/common/50mounted-tests ++++ os-prober-1.76/os-probes/common/50mounted-tests +@@ -65,10 +65,40 @@ fi mounted= @@ -21,17 +21,6 @@ + debug "mounted using GRUB, but unknown filesystem?" + type=fuseblk + fi -+elif dm_device="$(do_dmsetup osprober "$partition")" && \ -+ [ "$dm_device" ]; then -+ for type in $types; do -+ if mountinfo=`mount -o ro -t "$type" "$dm_device" "$tmpmnt" 2>&1`; then -+ debug "mounted as $type filesystem" -+ mounted=1 -+ break -+ else -+ debug "mounting $dm_device ($partition) as $type failed: $mountinfo" -+ fi -+ done +fi + +if [ "$mounted" ]; then @@ -55,15 +44,15 @@ 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 -@@ -137,48 +178,8 @@ if [ "$types" = btrfs ]; then +@@ -129,37 +159,8 @@ if [ "$types" = btrfs ]; then rmdir "$tmpmnt" || true if [ "$found" ]; then exit 0 - else - exit 1 - fi - fi - +- fi +-fi +- -if type grub2-mount >/dev/null 2>&1 && \ - type grub2-probe >/dev/null 2>&1 && \ - grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then @@ -74,20 +63,9 @@ - else - debug "mounted using GRUB, but unknown filesystem?" - type=fuseblk -- fi --elif dm_device="$(do_dmsetup osprober "$partition")" && \ -- [ "$dm_device" ]; then -- for type in $types; do -- if mountinfo=`mount -o ro -t "$type" "$dm_device" "$tmpmnt" 2>&1`; then -- debug "mounted as $type filesystem" -- mounted=1 -- break -- else -- debug "mounting $dm_device ($partition) as $type failed: $mountinfo" -- fi -- done --fi -- + fi + fi + -if [ "$mounted" ]; then - for test in /usr/lib/os-probes/mounted/*; do - debug "running subtest $test" ++++++ os-prober_1.74.tar.xz -> os-prober_1.76.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/common.sh new/os-prober-1.76/common.sh --- old/os-prober/common.sh 2017-01-27 22:49:14.000000000 +0100 +++ new/os-prober-1.76/common.sh 2017-05-01 05:03:02.000000000 +0200 @@ -204,37 +204,14 @@ fi } -do_dmsetup () { - local prefix partition dm_device partition_name size_p - prefix="$1" - partition="$2" - dm_device= - - if type dmsetup >/dev/null 2>&1 && \ - type blockdev >/dev/null 2>&1; then - partition_name="osprober-linux-${partition##*/}" - dm_device="/dev/mapper/$partition_name" - size_p=$(blockdev --getsize $partition ) - if [ -e "$dm_device" ]; then - error "$dm_device already exists" - dm_device= - else - debug "creating device mapper device $dm_device" - echo "0 $size_p linear $partition 0" | dmsetup create -r $partition_name - fi - fi - echo "$dm_device" -} - -# Sets $mountboot and $dm_device as output variables. This is very messy, -# but POSIX shell isn't really up to the task of doing it more cleanly. +# Sets $mountboot as output variables. This is very messy, but POSIX shell +# isn't really up to the task of doing it more cleanly. linux_mount_boot () { partition="$1" tmpmnt="$2" bootpart="" mounted="" - dm_device="" if [ -e "$tmpmnt/etc/fstab" ]; then # Try to mount any /boot partition. bootmnt=$(parsefstab < "$tmpmnt/etc/fstab" | grep " /boot ") || true @@ -305,13 +282,6 @@ if type grub-mount >/dev/null 2>&1 && \ grub-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 - debug "mounted as $3 filesystem" - mounted=1 - else - error "failed to mount $dm_device on $tmpmnt/boot: $mountinfo" - fi fi fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/debian/changelog new/os-prober-1.76/debian/changelog --- old/os-prober/debian/changelog 2017-02-01 00:01:21.000000000 +0100 +++ new/os-prober-1.76/debian/changelog 2017-06-28 07:08:36.000000000 +0200 @@ -1,3 +1,21 @@ +os-prober (1.76) unstable; urgency=medium + + [ Cyril Brulebois ] + * os-probes/mounted/x86/05efi: Fix check on ID_PART_ENTRY_SCHEME, to + look for "dos" instead of "msdos" (Closes: #817023). + + -- Christian Perrier <[email protected]> Wed, 28 Jun 2017 07:08:36 +0200 + +os-prober (1.75) unstable; urgency=medium + + * Remove code using device mapper (Closes: #860833, #853927, #853163). + This code doesn't work in d-i and it has some issues outside d-i. All + architectures can use the grub-mount codepath, which was already the + default anyway. + This also removes the dependency on dmsetup. + + -- Ivo De Decker <[email protected]> Mon, 01 May 2017 09:55:33 +0200 + os-prober (1.74) unstable; urgency=high [ Ivo De Decker ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/debian/control new/os-prober-1.76/debian/control --- old/os-prober/debian/control 2017-01-27 22:49:14.000000000 +0100 +++ new/os-prober-1.76/debian/control 2017-05-01 05:03:02.000000000 +0200 @@ -11,7 +11,7 @@ Package: os-prober-udeb Package-Type: udeb Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, di-utils-mapdevfs, anna (>= 1.16), grub-mount-udeb [linux-any kfreebsd-any], dmsetup-udeb [linux-any] +Depends: ${misc:Depends}, ${shlibs:Depends}, di-utils-mapdevfs, anna (>= 1.16), grub-mount-udeb [linux-any kfreebsd-any] Provides: os-prober Description: utility to detect other OSes on a set of drives This package is to be used by boot loader installers to detect other OSes @@ -22,7 +22,7 @@ Architecture: any Section: utils Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common [linux-any kfreebsd-any], dmsetup [linux-any] +Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common [linux-any kfreebsd-any] Description: utility to detect other OSes on a set of drives This package detects other OSes available on a system and outputs the results in a generic machine-readable format. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/linux-boot-probes/common/50mounted-tests new/os-prober-1.76/linux-boot-probes/common/50mounted-tests --- old/os-prober/linux-boot-probes/common/50mounted-tests 2017-01-27 22:49:14.000000000 +0100 +++ new/os-prober-1.76/linux-boot-probes/common/50mounted-tests 2017-05-01 05:03:02.000000000 +0200 @@ -10,12 +10,6 @@ warn "failed to umount $tmpmnt" fi fi - for dm_device in $dm_devices; do - if [ -e "$dm_device" ]; then - debug "remove device mapper device $dm_device" - dmsetup remove $dm_device - fi - done rmdir "$tmpmnt" || true } @@ -54,34 +48,18 @@ 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 mounted=1 type="$(grub-probe -d "$partition" -t fs)" [ "$type" ] || type=fuseblk -elif dm_device="$(do_dmsetup osprober-linux "$partition")" && \ - [ "$dm_device" ]; then - dm_devices="$dm_device" - for type in $types; do - if mountinfo=`mount -o ro -t "$type" "$dm_device" "$tmpmnt" 2>&1`; then - debug "mounted as $type filesystem" - mounted=1 - break - else - debug "mounting $dm_device ($partition) as $type failed: $mountinfo" - fi - done fi if [ "$mounted" ]; then linux_mount_boot "$partition" "$tmpmnt" bootpart="${mountboot%% *}" mounted="${mountboot#* }" - if [ "$dm_device" ]; then - dm_devices="$dm_device $dm_devices" - fi for test in /usr/lib/linux-boot-probes/mounted/*; do if [ -f "$test" ] && [ -x "$test" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/os-probes/common/50mounted-tests new/os-prober-1.76/os-probes/common/50mounted-tests --- old/os-prober/os-probes/common/50mounted-tests 2017-01-31 23:03:40.000000000 +0100 +++ new/os-prober-1.76/os-probes/common/50mounted-tests 2017-05-01 05:03:02.000000000 +0200 @@ -11,11 +11,6 @@ warn "failed to umount $tmpmnt" fi fi - if [ -e "$dm_device" ] - then - debug "remove device mapper device $dm_device" - dmsetup remove $dm_device - fi rmdir "$tmpmnt" || true } @@ -74,17 +69,6 @@ debug "mounted using GRUB, but unknown filesystem?" type=fuseblk fi -elif dm_device="$(do_dmsetup osprober "$partition")" && \ - [ "$dm_device" ]; then - for type in $types $delaytypes; do - if mountinfo=`mount -o ro -t "$type" "$dm_device" "$tmpmnt" 2>&1`; then - debug "mounted as $type filesystem" - mounted=1 - break - else - debug "mounting $dm_device ($partition) as $type failed: $mountinfo" - fi - done fi if [ "$mounted" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/os-prober/os-probes/mounted/x86/05efi new/os-prober-1.76/os-probes/mounted/x86/05efi --- old/os-prober/os-probes/mounted/x86/05efi 2014-12-01 13:28:32.000000000 +0100 +++ new/os-prober-1.76/os-probes/mounted/x86/05efi 2017-06-25 05:03:18.000000000 +0200 @@ -39,9 +39,9 @@ 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
