Bug#796627: live-tools NMU uploaded to DELAYED/2
Hello Iain R. Learmonth
I've just uploaded an NMU of live-tools to DELAYED/2 as previously
agreed on over IRC. Please see attached updated debdiff which
also includes the init script fix, spotted by Felipe.
Regards,
Andreas Henriksson
diff -Nru live-tools-20151214/debian/changelog live-tools-20151214+nmu1/debian/changelog
--- live-tools-20151214/debian/changelog 2015-12-14 17:14:10.000000000 +0100
+++ live-tools-20151214+nmu1/debian/changelog 2016-06-09 16:07:49.000000000 +0200
@@ -1,3 +1,19 @@
+live-tools (1:20151214+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add a native live-tools.service unit (Closes: #796627)
+ * Add dh-systemd build-dependency and use "--with systemd" for above.
+ * Source /lib/lsb/init-functions in init script
+ - fixes lintian warning: init.d-script-does-not-source-init-functions
+ which means if someone directly invokes the init script under
+ systemd then the systemd LSB hooks will redirect to systemctl.
+ * Add lsb-base dependency because of the above.
+ * Fix up path in init script to make it actually do something
+ (/bin/live-media-eject -> /bin/live-medium-eject)
+ Thanks to Felipe Sateler for spotting this.
+
+ -- Andreas Henriksson <andreas@fatal.se> Thu, 09 Jun 2016 16:07:07 +0200
+
live-tools (1:20151214) unstable; urgency=medium
[ Carlos Zuferri ]
diff -Nru live-tools-20151214/debian/control live-tools-20151214+nmu1/debian/control
--- live-tools-20151214/debian/control 2015-12-14 17:11:28.000000000 +0100
+++ live-tools-20151214+nmu1/debian/control 2016-06-09 16:04:35.000000000 +0200
@@ -5,6 +5,7 @@
Uploaders: Iain R. Learmonth <irl@debian.org>
Build-Depends:
debhelper (>= 9),
+ dh-systemd (>= 1.5),
Standards-Version: 3.9.6
Homepage: https://debian-live.alioth.debian.org/live-tools/
Vcs-Browser: http://anonscm.debian.org/cgit/debian-live/live-tools.git
@@ -13,6 +14,7 @@
Package: live-tools
Architecture: all
Depends:
+ lsb-base,
initramfs-tools,
${misc:Depends},
Suggests:
diff -Nru live-tools-20151214/debian/live-tools.init live-tools-20151214+nmu1/debian/live-tools.init
--- live-tools-20151214/debian/live-tools.init 2015-12-14 17:09:42.000000000 +0100
+++ live-tools-20151214+nmu1/debian/live-tools.init 2016-06-09 16:06:49.000000000 +0200
@@ -16,11 +16,13 @@
# X-Interactive: true
### END INIT INFO
+. /lib/lsb/init-functions
+
case "${1}" in
stop)
- if [ -e /bin/live-media-eject ]
+ if [ -e /bin/live-medium-eject ]
then
- /bin/live-media-eject ${@}
+ /bin/live-medium-eject ${@}
fi
;;
diff -Nru live-tools-20151214/debian/live-tools.service live-tools-20151214+nmu1/debian/live-tools.service
--- live-tools-20151214/debian/live-tools.service 1970-01-01 01:00:00.000000000 +0100
+++ live-tools-20151214+nmu1/debian/live-tools.service 2016-06-09 16:04:35.000000000 +0200
@@ -0,0 +1,14 @@
+[Unit]
+Documentation=man:live-tools(7)
+Description=live-tools - System Support Scripts
+DefaultDependencies=no
+Before=shutdown.target
+Conflicts=shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStop=/bin/live-medium-eject
+
+[Install]
+WantedBy=multi-user.target
diff -Nru live-tools-20151214/debian/rules live-tools-20151214+nmu1/debian/rules
--- live-tools-20151214/debian/rules 2015-12-14 17:09:08.000000000 +0100
+++ live-tools-20151214+nmu1/debian/rules 2016-06-09 16:04:35.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh ${@} --parallel
+ dh ${@} --parallel --with systemd
override_dh_auto_install:
dh_auto_install
Reply to: