Hi Anibal,

I took Matthews files and converted them to a proper debdiff. It fixes
nfs-common/networking/rpcbind ordering for me. Since this might fix the
RC bug #622394, it would be nice to get this in archive for testing.

Riku
diff -Nru rpcbind-0.2.1/debian/changelog rpcbind-0.2.1/debian/changelog
--- rpcbind-0.2.1/debian/changelog	2014-08-18 12:46:29.000000000 +0300
+++ rpcbind-0.2.1/debian/changelog	2014-10-31 12:08:33.000000000 +0200
@@ -1,3 +1,11 @@
+rpcbind (0.2.1-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add systemd unit to start rpcbind earlier, closes: #748074
+    - works around #622394
+
+ -- Riku Voipio <[email protected]>  Fri, 31 Oct 2014 09:46:50 +0200
+
 rpcbind (0.2.1-6) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru rpcbind-0.2.1/debian/control rpcbind-0.2.1/debian/control
--- rpcbind-0.2.1/debian/control	2014-08-18 12:37:52.000000000 +0300
+++ rpcbind-0.2.1/debian/control	2014-10-31 09:57:50.000000000 +0200
@@ -2,7 +2,7 @@
 Section: net
 Priority: standard
 Maintainer: Anibal Monsalve Salazar <[email protected]>
-Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), autotools-dev, pkg-config, libtirpc-dev (>= 0.2.4-2~), libwrap0-dev
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), dh-systemd, autotools-dev, pkg-config, libtirpc-dev (>= 0.2.4-2~), libwrap0-dev
 Standards-Version: 3.9.5
 Homepage: http://sourceforge.net/projects/rpcbind/
 
diff -Nru rpcbind-0.2.1/debian/rpcbind.service rpcbind-0.2.1/debian/rpcbind.service
--- rpcbind-0.2.1/debian/rpcbind.service	1970-01-01 02:00:00.000000000 +0200
+++ rpcbind-0.2.1/debian/rpcbind.service	2014-10-31 09:46:40.000000000 +0200
@@ -0,0 +1,16 @@
+[Unit]
+Description=RPC bind portmap service
+After=systemd-tmpfiles-setup.service
+Wants=remote-fs-pre.target
+Before=remote-fs-pre.target
+DefaultDependencies=no
+
+[Service]
+ExecStart=/sbin/rpcbind -f -w
+KillMode=process
+Restart=on-failure
+
+[Install]
+WantedBy=sysinit.target
+Alias=portmap
+
diff -Nru rpcbind-0.2.1/debian/rpcbind.tmpfiles.conf rpcbind-0.2.1/debian/rpcbind.tmpfiles.conf
--- rpcbind-0.2.1/debian/rpcbind.tmpfiles.conf	1970-01-01 02:00:00.000000000 +0200
+++ rpcbind-0.2.1/debian/rpcbind.tmpfiles.conf	2014-10-31 11:48:03.000000000 +0200
@@ -0,0 +1,4 @@
+# See tmpfiles.d(5) for details
+d     /run/rpcbind 0755 root root - 
+f     /run/rpcbind/rpcbind.xdr 0600 root root - 
+f     /run/rpcbind/portmap.xdr 0600 root root - 
diff -Nru rpcbind-0.2.1/debian/rules rpcbind-0.2.1/debian/rules
--- rpcbind-0.2.1/debian/rules	2014-01-01 02:52:02.000000000 +0200
+++ rpcbind-0.2.1/debian/rules	2014-10-31 11:48:40.000000000 +0200
@@ -54,6 +54,8 @@
 	install -d debian/rpcbind/sbin
 	install -d debian/rpcbind/usr/sbin
 	install -d debian/rpcbind/etc/insserv.conf.d
+	install -d debian/rpcbind/usr/lib/tmpfiles.d
+	cp debian/rpcbind.tmpfiles.conf debian/rpcbind/usr/lib/tmpfiles.d/rpcbind.conf
 	mv debian/rpcbind/usr/bin/rpcbind debian/rpcbind/sbin/rpcbind
 	mv debian/rpcbind/usr/bin/rpcinfo debian/rpcbind/usr/sbin/rpcinfo
 	rmdir debian/rpcbind/usr/bin
@@ -72,9 +74,11 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installman man/rpcinfo.7
+	dh_systemd_enable
 	dh_installinit --no-start --name rpcbind-boot
 	dh_installinit --no-start --name portmap-wait
 	dh_installinit
+	dh_systemd_start
 	dh_link
 	dh_strip
 	dh_compress

Reply via email to