From: Didier Raboud <odyx@debian.org>
Date: Wed, 1 Jun 2016 06:38:03 +0000 (+0200)
Subject: Revert "Add 01-upstart-lsb from the upstart package, and make executing rc.d scripts... 
X-Git-Tag: archive/raspbian/10.2018112800+rpi1^2~37
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55de165c92148520d36bb41c7bf8641057c460db;p=lsb.git

Revert "Add 01-upstart-lsb from the upstart package, and make executing rc.d scripts no-op if there is an upstart job for that script"

This reverts commit 3ce3a48572b780c9ee3162d117762725bdf325d8.

The upstart package should have shipped this file in the first place.
Upstart is now removed from Debian.
This file should probably be adopted by any future (or other-distro) upstart package.

Closes: #825946
Thanks-To: Michael Biebl <biebl@debian.org>
---

diff --git a/debian/control b/debian/control
index 5c2b65f..85eb103 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,6 @@ Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Replaces: upstart (<< 1.12.1-0ubuntu8)
-Breaks: upstart (<< 1.12.1-0ubuntu8)
 Priority: required
 Description: Linux Standard Base init script functionality
  The Linux Standard Base (http://www.linuxbase.org/) is a standard
diff --git a/debian/lsb-base.install b/debian/lsb-base.install
index a60c86d..66dc0df 100644
--- a/debian/lsb-base.install
+++ b/debian/lsb-base.install
@@ -1,3 +1,2 @@
 init-functions /lib/lsb
-init-functions.d/01-upstart-lsb /lib/lsb/init-functions.d
 init-functions.d/20-left-info-blocks /lib/lsb/init-functions.d
diff --git a/init-functions.d/01-upstart-lsb b/init-functions.d/01-upstart-lsb
deleted file mode 100644
index 92205ce..0000000
--- a/init-functions.d/01-upstart-lsb
+++ /dev/null
@@ -1,31 +0,0 @@
-# Allow executing init.d scripts as upstart jobs
-
-# Operate against system upstart, not session
-unset UPSTART_SESSION
-
-# Bail if there is an upstart job, and called via RC
-_RC_SCRIPT=${0#/etc/rc?.d/[KS]??*}
-if [ -r "/etc/init/${_RC_SCRIPT}.conf" ] && which initctl >/dev/null \
-   && initctl version 2>/dev/null | grep -q upstart
-then
-   exit 0
-fi
-
-_UPSTART_JOB=${0#/etc/init.d/}
-if [ -r "/etc/init/${_UPSTART_JOB}.conf" ] && which initctl >/dev/null \
-   && initctl version 2>/dev/null | grep -q upstart \
-   && initctl status ${_UPSTART_JOB} 2>/dev/null 1>/dev/null
-then
-   # Upstart configuration exists for this job and we're running under upstart
-   case "${1:-}" in
-      start|stop|status|reload)
-         # Action is a valid upstart action
-         exec ${1} ${_UPSTART_JOB}
-      ;;
-      restart|force-reload)
-        # Map restart to the usual sysvinit behavior.
-         stop ${_UPSTART_JOB} || :
-         exec start ${_UPSTART_JOB}
-      ;;
-   esac
-fi