Hello again! On Sun, May 17, 2015 at 06:51:32PM +0200, Pino Toscano wrote: > Hi Andreas, [...] > one of the issues I'm noticing with the new util-linux upload is that > mountpoint(1) has been moved to bin:mount, which is arch:linux-any, > thus creating boot issues on non-Linux systems. [...]
Unless someone shouts at me and says this has to be handled right away I'm thinking maybe it's best to give it a few more days to allow people to find any other potential problems before acting again. While waiting, would you mind helping out with reviewing and testing the attached patches? Please also make sure to test if util-linux implementation of mountpoint actually works on non-linux... util-linux: 0001-Ship-mountpoint-in-util-linux-package-instead.patch sysvinit: 0001-Update-dependency-to-reflect-that-mountpoint-was-mov.patch (Both patches are on top of respective package Vcs, so use debcheckout + git am + gbp dch --auto + git-buildpackage. Hopefully they also apply cleanly against currently shipped package if preferred to try applying them there.) Thanks in advance. Regards, Andreas Henriksson
>From bf44ed24f8d699ec500682f92323feca3e055135 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Sun, 17 May 2015 21:04:00 +0200 Subject: [PATCH] Ship mountpoint in util-linux package instead - This suits non-linux archs better, since mount is linux-any. Git-Dch: Full --- debian/changelog | 10 ++++++++++ debian/control | 14 ++++++++++---- debian/mount.install | 2 -- debian/util-linux.install | 1 + debian/util-linux.manpages | 1 + 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 09aa960..2364105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +util-linux (2.26.2-4) UNRELEASED; urgency=medium + + * Drop now obsolete purging of fstrim timer unit helper + * Reclaim /sbin/fdisk on PowerPC + * Ship /sbin/fdisk everywhere + * Ship mountpoint in util-linux package instead + - This suits non-linux archs better, since mount is linux-any. + + -- Andreas Henriksson <[email protected]> Sun, 17 May 2015 21:09:07 +0200 + util-linux (2.26.2-3) unstable; urgency=medium * The "moving in on sysvinit(-utils) turf" release. diff --git a/debian/control b/debian/control index 8ba9edf..cfff601 100644 --- a/debian/control +++ b/debian/control @@ -37,8 +37,16 @@ Essential: yes Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends} Depends: initscripts, lsb-base (>= 3.0-6), tzdata (>=2006c-2), ${misc:Depends} Suggests: dosfstools, kbd | console-tools, util-linux-locales -Replaces: bash-completion (<< 1:2.1-4.1~), sysvinit-utils (<< 2.88dsf-59.1~) -Breaks: bash-completion (<< 1:2.1-4.1~), grml-debootstrap (<< 0.68), cloud-utils (<< 0.27-1~), sysvinit-utils (<< 2.88dsf-59.1~) +Replaces: bash-completion (<< 1:2.1-4.1~), + sysvinit-utils (<< 2.88dsf-59.1~), + initscripts (<< 2.88dsf-59.2~), + mount (= 2.26.2-3) +Breaks: bash-completion (<< 1:2.1-4.1~), + grml-debootstrap (<< 0.68), + cloud-utils (<< 0.27-1~), + sysvinit-utils (<< 2.88dsf-59.1~), + initscripts (<< 2.88dsf-59.2~), + mount (= 2.26.2-3) Multi-Arch: foreign Description: Miscellaneous system utilities This package contains a number of important utilities, most of which @@ -66,8 +74,6 @@ Section: admin Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends} Depends: ${misc:Depends} Suggests: nfs-common (>=1:1.1.0-13) -Replaces: initscripts (<< 2.88dsf-59.1~) -Breaks: initscripts (<< 2.88dsf-59.1~) Multi-Arch: foreign Description: Tools for mounting and manipulating filesystems This package provides the mount(8), umount(8), swapon(8), diff --git a/debian/mount.install b/debian/mount.install index 0efe24b..ca3707f 100644 --- a/debian/mount.install +++ b/debian/mount.install @@ -1,11 +1,9 @@ bin/findmnt bin/mount bin/umount -bin/mountpoint sbin/losetup sbin/swapoff sbin/swapon -usr/share/man/man1/mountpoint.1 usr/share/man/man5/fstab.5 usr/share/man/man8/findmnt.8 usr/share/man/man8/losetup.8 diff --git a/debian/util-linux.install b/debian/util-linux.install index 368c08d..4b9a5ce 100755 --- a/debian/util-linux.install +++ b/debian/util-linux.install @@ -10,6 +10,7 @@ debian/tmp/usr/bin/rename => /usr/bin/rename.ul [linux-any] lib/systemd/system/fstrim.timer => /usr/share/doc/util-linux/examples/fstrim.timer [linux-any] lib/systemd/system/fstrim.service => /usr/share/doc/util-linux/examples/fstrim.service bin/more +bin/mountpoint sbin/agetty sbin/blkid sbin/cfdisk diff --git a/debian/util-linux.manpages b/debian/util-linux.manpages index f3e00ea..481dfe0 100755 --- a/debian/util-linux.manpages +++ b/debian/util-linux.manpages @@ -18,6 +18,7 @@ debian/tmp/usr/share/man/man1/line.1 debian/tmp/usr/share/man/man1/mcookie.1 debian/tmp/usr/share/man/man1/mesg.1 debian/tmp/usr/share/man/man1/more.1 +debian/tmp/usr/share/man/man1/mountpoint.1 debian/tmp/usr/share/man/man1/namei.1 debian/tmp/usr/share/man/man1/pg.1 debian/tmp/usr/share/man/man1/rev.1 -- 2.1.4
>From ce13fdcd92ced28df3b884f8dcf8ea483c9addce Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Sun, 17 May 2015 21:06:49 +0200 Subject: [PATCH] Update dependency to reflect that mountpoint was moved again The mount package is only available on linux-any, so it's better for non-linux archs if util-linux provides the mountpoint binary. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 8fc6f65..c6959e0 100644 --- a/debian/control +++ b/debian/control @@ -102,8 +102,8 @@ Depends: lsb-base (>= 3.2-14), sysvinit-utils (>= 2.88dsf-50), sysv-rc | file-rc, coreutils (>= 5.93), -# mountpoint was moved to the mount package (src:util-linux) - mount (>= 2.26.2-3) +# mountpoint was moved to util-linux + util-linux (>= 2.26.2-4) Recommends: psmisc, e2fsprogs Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1), -- 2.1.4
