Hello! As previously discussed in Bug#399608 I'm planning to ship mountpoint implementation from src:util-linux. While investigating this I did not find it to be critical to do before the Jessie release so I postponed it. Doing it now, early in the Stretch development phase, would be highly desirable.
I would be very happy to not have to NMU sysvinit, or atleast get some feedback from someone involved with sysvinit before doing so. Please speak up now if you're willing to help out! The actual changes are trivial, but I assume there are corner-cases hiding here that might be hard to spot for someone like me who has no previous experience dealing with sysvinit. While at it, I'd also like to see the initscripts dependency changes suggested in Bug#781766 implemented. I'm including patches (which are completely untested as I could not get git-buildpackage to build from your repo layout right now) for sysvinit: 0001-Let-mount-src-util-linux-provide-mountpoint.patch 0002-Make-sysvinit-depend-on-initscripts.patch (Then "gbp dch --auto" to update debian/changelog) I'm also including the patch for src:util-linux as a reference: 0001-mount-ship-mountpoint-utility.patch Any feedback welcome! Even if it's just to say that you intend to look at this some rainy day in the future! Regards, Andreas Henriksson
>From a05cd13a542ce971075ae995987594dfcea9aaed Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Tue, 5 May 2015 15:28:04 +0200 Subject: [PATCH 1/2] Let mount (src:util-linux) provide mountpoint Stop installing 'mountpoint' in initscripts package. It will be provided by mount (from src:util-linux) instead. Add a versioned dependency on mount package to protect partial upgrades to always have something providing mountpoint. The initscripts package itself probably should not depend on util-linux in the future. Closes: #399608 --- debian/control | 4 +++- debian/initscripts.install | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 debian/initscripts.install diff --git a/debian/control b/debian/control index b15586e..1df5d16 100644 --- a/debian/control +++ b/debian/control @@ -99,7 +99,9 @@ Depends: debianutils (>= 4), lsb-base (>= 3.2-14), sysvinit-utils (>= 2.88dsf-50), sysv-rc | file-rc, - coreutils (>= 5.93) + coreutils (>= 5.93), +# mountpoint was moved to the mount package (src:util-linux) + mount (>= 2.26.2-3) Recommends: psmisc, e2fsprogs Conflicts: libdevmapper1.02.1 (<< 2:1.02.24-1), diff --git a/debian/initscripts.install b/debian/initscripts.install deleted file mode 100644 index d3a30ab..0000000 --- a/debian/initscripts.install +++ /dev/null @@ -1,2 +0,0 @@ -bin/mountpoint -usr/share/man/man1/mountpoint.1 -- 2.1.4
>From 283318e347e099f7388413ee69f72ce272792adc Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Tue, 5 May 2015 15:43:37 +0200 Subject: [PATCH 2/2] Make sysvinit depend on initscripts Stop relying on other things pulling in the initscripts for us and make sure it's always possible to use init=/lib/sysvinit/init when having sysvinit (and not sysvinit-core) installed. Closes: #781766 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 1df5d16..92c0532 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Package: sysvinit Priority: optional Architecture: any Pre-Depends: init -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, initscripts Description: System-V-like init utilities - transitional package This package depends on init, which is an essential package that pulls in the default init system. Starting with jessie, this will be -- 2.1.4
>From 5c011c12832feec76d6dce4f30f0f1611014213b Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Tue, 5 May 2015 16:06:59 +0200 Subject: [PATCH] mount: ship mountpoint utility This utility was previously shipped by the initscripts (src:sysvinit) package. Closes: #753779 --- debian/control | 2 ++ debian/mount.install | 2 ++ debian/rules | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 274cbf0..6da4e45 100644 --- a/debian/control +++ b/debian/control @@ -66,6 +66,8 @@ 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 ca3707f..0efe24b 100644 --- a/debian/mount.install +++ b/debian/mount.install @@ -1,9 +1,11 @@ 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/rules b/debian/rules index d517c82..2584d63 100755 --- a/debian/rules +++ b/debian/rules @@ -34,8 +34,6 @@ CONFOPTS += --disable-su CONFOPTS += --disable-sulogin CONFOPTS += --disable-last CONFOPTS += --disable-mesg -# => initscripts -CONFOPTS += --disable-mountpoint # => procps CONFOPTS += --disable-kill # => eject -- 2.1.4
_______________________________________________ Pkg-sysvinit-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-sysvinit-devel
