Hello community, here is the log from the commit of package psmisc for openSUSE:Leap:15.2 checked in at 2020-05-19 14:08:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/psmisc (Old) and /work/SRC/openSUSE:Leap:15.2/.psmisc.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psmisc" Tue May 19 14:08:24 2020 rev:24 rq:806867 version:23.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/psmisc/psmisc.changes 2020-01-15 15:45:36.319328968 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.psmisc.new.2738/psmisc.changes 2020-05-19 14:08:43.423026954 +0200 @@ -1,0 +2,6 @@ +Mon Apr 27 14:57:57 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Modify patch 0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch + * Allow not unique mounts as well as not unique mountpoint (bsc#1170247) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch ++++++ --- /var/tmp/diff_new_pack.lzHbZf/_old 2020-05-19 14:08:43.755027599 +0200 +++ /var/tmp/diff_new_pack.lzHbZf/_new 2020-05-19 14:08:43.759027608 +0200 @@ -280,7 +280,7 @@ #endif /* DEBUG */ add_inode(ino_list, this_name, this_name->st.st_dev, this_name->st.st_ino); -@@ -501,12 +553,54 @@ parse_mounts(struct names *this_name, st +@@ -501,12 +544,45 @@ parse_mounts(struct names *this_name, st const opt_type opts) { dev_t match_device; @@ -297,8 +297,6 @@ + count = 0; + list_for_each(ptr, &mntinfo) { + mntinfo_t *mnt = list_entry(ptr, mntinfo_t); -+ if (match_device != mnt->dev && match_device != mnt->vol) -+ continue; + if (S_ISBLK(this_name->st.st_mode)) { + /* Skip mount IDs check if a block device + * was specified */ @@ -322,13 +320,6 @@ + this_name->filename); + return -1; + } -+ if (count > 1) { -+ errno = ENOTUNIQ; -+ fprintf(stderr, -+ _("The device %u:%u is not unique. Please change!\n"), -+ major(match_device), minor(match_device)); -+ /* return -1 */ -+ } + if (S_ISBLK(this_name->st.st_mode)) + return 0; + this_name->mnt_id = mountinfo->id; @@ -780,7 +771,7 @@ + return; + mid = 1; + parid = -1; -+ while (fscanf (mnt, "%s %s %s %*[^\n]", &devname[0], &mpoint[0], &type[0]) == 2) { ++ while (fscanf (mnt, "%s %s %s %*[^\n]", &devname[0], &mpoint[0], &type[0]) == 3) { + struct stat st; + if (stat(mpoint, &st) != 0) { + if (errno != EACCES) {
