diff -Nru multipath-tools-0.5.0+git1.656f8865/debian/changelog multipath-tools-0.5.0+git1.656f8865/debian/changelog --- multipath-tools-0.5.0+git1.656f8865/debian/changelog 2016-04-05 02:49:29.000000000 +0000 +++ multipath-tools-0.5.0+git1.656f8865/debian/changelog 2016-06-21 09:22:06.000000000 +0000 @@ -1,3 +1,14 @@ +multipath-tools (0.5.0+git1.656f8865-5ubuntu2.1) xenial; urgency=medium + + * Cherrypick from debian: + - Call clean target before rebuilding with systemd support + - Call systemd in debian/rules. Also adapt init service + aliasing. + - Resolves LP: #1578638, LP: #1589526, LP: #1583563. Separate bugs, all + due to same root cause. + + -- Dimitri John Ledkov Thu, 16 Jun 2016 11:53:33 +0300 + multipath-tools (0.5.0+git1.656f8865-5ubuntu2) xenial; urgency=medium [ Mauricio Faria de Oliveira ] diff -Nru multipath-tools-0.5.0+git1.656f8865/debian/rules multipath-tools-0.5.0+git1.656f8865/debian/rules --- multipath-tools-0.5.0+git1.656f8865/debian/rules 2016-04-05 02:36:42.000000000 +0000 +++ multipath-tools-0.5.0+git1.656f8865/debian/rules 2016-06-16 08:53:25.000000000 +0000 @@ -29,9 +29,9 @@ build-arch: build-multipath-udeb-stamp build-stamp build-indep: -build-stamp: +build-stamp: clean-tree dh_testdir - + [ ! -f kpartx/kpartx.rules ] || cp kpartx/kpartx.rules debian/kpartx.udev $(MAKE) $(OPTFLAGS) LIB=/lib SYSTEMDPATH=/lib USE_SYSTEMD=1 @@ -42,8 +42,8 @@ build-multipath-udeb-stamp: dh_testdir - DEB_CFLAGS_MAINT_APPEND="-static-libgcc" CFLAGS_DISABLE_FEXCEPTIONS=1 $(MAKE) $(OPTFLAGS) LIB=lib USE_SYSTEMD=0 - + DEB_CFLAGS_MAINT_APPEND="-static-libgcc" CFLAGS_DISABLE_FEXCEPTIONS=1 $(MAKE) $(OPTFLAGS) LIB=/lib USE_SYSTEMD=0 + # store files for install target mkdir -p $(CURDIR)/debian/tmp-multipath-udeb/sbin $(MAKE) install INSTALL_PROGRAM=$(INSTALL_PROGRAM) DESTDIR=$(CURDIR)/debian/tmp-multipath-udeb LIB=/lib USE_SYSTEMD=0 @@ -103,10 +103,14 @@ dh_installdocs dh_installexamples dh_lintian + dh_systemd_enable -pmultipath-tools multipathd.service dh_installinit -pmultipath-tools dh_installinit -pmultipath-tools --name=multipath-tools-boot --no-start -- start 21 S . dh_installudev -pkpartx --priority=95 dh_installudev -pmultipath-tools --name=dm-mpath-lvm --priority=56 + dh_link lib/systemd/system/multipathd.service \ + lib/systemd/system/multipath-tools.service + dh_systemd_start -pmultipath-tools multipathd.service dh_installdebconf -pmultipath-tools-boot dh_installman dh_makeshlibs --add-udeb=multipath-udeb