Fix "Wrong way of inhibiting start when using systemd" by removing the

useless (and wrong) code (Closes: #691086)
This commit is contained in:
Ludovic Rousseau 2012-10-24 11:49:49 +00:00
parent 17f6d08440
commit 3e055f5cda
2 changed files with 7 additions and 21 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
pcsc-lite (1.8.6-2) unstable; urgency=low
* Fix "Wrong way of inhibiting start when using systemd" by removing the
useless (and wrong) code (Closes: #691086)
-- Ludovic Rousseau <rousseau@debian.org> Wed, 24 Oct 2012 13:47:03 +0200
pcsc-lite (1.8.6-1) unstable; urgency=low
* New upstream release

21
debian/pcscd.init vendored
View File

@ -41,14 +41,6 @@ SCRIPTNAME=/etc/init.d/$NAME
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
# Do not start at boot using systemd but start using on-demand
# http://ludovicrousseau.blogspot.com/2011/11/pcscd-auto-start-using-systemd.html
if [ $1 = "start" -a -d /sys/fs/cgroup/systemd ]
then
# Do not start from this script
exit 0
fi
# Define LSB log_* functions.
# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
. /lib/lsb/init-functions
@ -104,19 +96,6 @@ do_stop()
[ "$RETVAL" = 2 ] && return 2
}
#
# Function that sends a SIGHUP to the daemon/service
#
do_reload() {
#
# If the daemon can reload its configuration without
# restarting (for example, when it is sent a SIGHUP),
# then implement that here.
#
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
return 0
}
case "$1" in
start)
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"