tags 661109 patch thanks Whoops, sorry, forgot the patch. Here it is!
-- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ [email protected] [email protected]
diff -Nru lsb-3.2/debian/changelog lsb-3.2/debian/changelog --- lsb-3.2/debian/changelog 2012-01-15 22:21:29.000000000 -0800 +++ lsb-3.2/debian/changelog 2012-02-24 00:57:30.000000000 -0800 @@ -1,3 +1,12 @@ +lsb (3.2-28.2) UNRELEASED; urgency=low + + * Non-maintainer upload. + * New helper function, init_is_upstart(), to be used by init scripts of + upstart-aware packages to render the init script inert when upstart is + present. + + -- Steve Langasek <[email protected]> Wed, 22 Feb 2012 23:36:44 -0800 + lsb (3.2-28.1) unstable; urgency=low * Non-maintainer upload. diff -Nru lsb-3.2/init-functions lsb-3.2/init-functions --- lsb-3.2/init-functions 2011-01-17 12:30:07.000000000 -0800 +++ lsb-3.2/init-functions 2012-02-24 00:57:18.000000000 -0800 @@ -249,6 +249,18 @@ sed -n "/$LSB_S/,/$LSB_E/ s/# $2: \(.*\)/\1/p" $1 } +# If the currently running init daemon is upstart, return zero; if the +# calling init script belongs to a package which also provides a native +# upstart job, it should generally exit non-zero in this case. +init_is_upstart() +{ + if which initctl && initctl version | grep -q upstart + then + return 0 + fi + return 1 +} + # int log_begin_message (char *message) log_begin_msg () { if [ -z "${1:-}" ]; then
signature.asc
Description: Digital signature
