Bug#859388: blkdeactivate: /bin/sort: No such file or directory

[Julian Andres Klode]

Package: lvm2
Version: 2.02.176-4.1
Followup-For: Bug #859388
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch



*** /tmp/tmpqyjXGq/bug_body

In Ubuntu, the attached patch was applied to achieve the following:

  * scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort


Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (990, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-13-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-- 
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer                              i speak de, en
-------------- next part --------------
diff -Nru lvm2-2.02.176/debian/control lvm2-2.02.176/debian/control
--- lvm2-2.02.176/debian/control	2018-01-30 08:31:47.000000000 +0100
+++ lvm2-2.02.176/debian/control	2018-04-12 10:35:07.000000000 +0200
@@ -1,8 +1,7 @@
 Source: lvm2
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
+Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
 Build-Depends:
  debhelper (>= 10.9.2),
diff -Nru lvm2-2.02.176/debian/patches/blkdeactivate-use-usr-bin-sort.patch lvm2-2.02.176/debian/patches/blkdeactivate-use-usr-bin-sort.patch
--- lvm2-2.02.176/debian/patches/blkdeactivate-use-usr-bin-sort.patch	1970-01-01 01:00:00.000000000 +0100
+++ lvm2-2.02.176/debian/patches/blkdeactivate-use-usr-bin-sort.patch	2018-04-12 10:35:07.000000000 +0200
@@ -0,0 +1,17 @@
+Description: scripts/blkdeactivate.sh.in: Refer to /usr/bin/sort, not /bin/sort
+ We ship sort in /usr/bin, not in /bin
+Author: Julian Andres Klode <juliank at ubuntu.com>
+Forwarded: no
+Last-Update: 2018-04-12
+
+--- lvm2-2.02.176.orig/scripts/blkdeactivate.sh.in
++++ lvm2-2.02.176/scripts/blkdeactivate.sh.in
+@@ -58,7 +58,7 @@ MPATHD_OPTS=""
+ LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
+ LSBLK_VARS="local devtype local kname local name local mnt"
+ LSBLK_READ="read -r devtype kname name mnt"
+-SORT_MNT="/bin/sort -r -u -k 4"
++SORT_MNT="/usr/bin/sort -r -u -k 4"
+ 
+ # Do not show tool errors by default (only done/skipping summary
+ # message provided by this script) and no verbose mode by default.
diff -Nru lvm2-2.02.176/debian/patches/series lvm2-2.02.176/debian/patches/series
--- lvm2-2.02.176/debian/patches/series	2018-01-26 17:07:31.000000000 +0100
+++ lvm2-2.02.176/debian/patches/series	2018-04-12 10:35:07.000000000 +0200
@@ -12,3 +12,4 @@
 systemd-pvscan-background.patch
 enable-issue-discards.patch
 0014-no-lvm2-monitor-in-containers.patch
+blkdeactivate-use-usr-bin-sort.patch