summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-04-01 18:45:57 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-04-01 18:45:57 +0200
commiteae08845d199ff31af0218b5ca07f08ff24ffa3e (patch)
tree2a01496adf28771f1e86bda4cb20c03ed2a88540
parent5e8e40e843a3f956add3524082391d5d40a4ddfc (diff)
Remove the RUN parameter from /etc/default/saned and /etc/init.d/saned
-rw-r--r--debian/changelog2
-rw-r--r--debian/sane-utils.saned.default4
-rw-r--r--debian/sane-utils.saned.init5
3 files changed, 2 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 06dd5b5..ca80e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ sane-backends (1.0.27-1~experimental4) UNRELEASED; urgency=medium
- Change debian/compat to 11.
- Bump minimum debhelper version in debian/control to >= 11.
* Declare compliance with Debian Policy 4.1.3 (No changes needed).
+ * Remove the RUN parameter from /etc/default/saned and /etc/init.d/saned
+ in relation to Debian Policy Manual section 9.3.3.1.
-- Jörg Frings-Fürst <debian@jff.email> Sun, 12 Nov 2017 13:59:10 +0100
diff --git a/debian/sane-utils.saned.default b/debian/sane-utils.saned.default
index b0647cc..691e5a5 100644
--- a/debian/sane-utils.saned.default
+++ b/debian/sane-utils.saned.default
@@ -1,8 +1,4 @@
# Defaults for the saned initscript, from sane-utils
-# To enable under systemd please read README.Debian
-# Set to yes to start saned under SysV
-RUN=no
-
# Set to the user saned should run as
RUN_AS_USER=saned
diff --git a/debian/sane-utils.saned.init b/debian/sane-utils.saned.init
index 2e624a6..e629105 100644
--- a/debian/sane-utils.saned.init
+++ b/debian/sane-utils.saned.init
@@ -33,11 +33,6 @@ if [ -f /etc/default/saned ] ; then
. /etc/default/saned
fi
-if [ "x$RUN" != "xyes" ] ; then
- log_success_msg "$NAME disabled; edit /etc/default/saned"
- exit 0
-fi
-
DAEMON_OPTS="-a $RUN_AS_USER"
set -e