[Pkg-samba-maint] [samba] 01/03: Remove upstart code
Mathieu Parent
sathieu at moszumanska.debian.org
Tue Jun 27 09:52:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
sathieu pushed a commit to branch master
in repository samba.
commit ee2f56115385ad3a7962af3b71bab4332dabfdfc
Author: Mathieu Parent <math.parent at gmail.com>
Date: Tue Jun 20 21:32:05 2017 +0200
Remove upstart code
Upstart is not in stretch
---
debian/rules | 1 -
debian/samba-ad-dc.upstart | 16 ----------------
debian/samba.lintian-overrides | 3 ---
debian/samba.nmbd.init | 9 ---------
debian/samba.nmbd.upstart | 21 ---------------------
debian/samba.reload-smbd.upstart | 12 ------------
debian/samba.samba-ad-dc.init | 9 ---------
debian/samba.smbd.init | 9 ---------
debian/samba.smbd.upstart | 15 ---------------
debian/samba.upstart.in | 16 ----------------
debian/winbind.init | 9 ---------
debian/winbind.upstart | 16 ----------------
12 files changed, 136 deletions(-)
diff --git a/debian/rules b/debian/rules
index 7564824..7758255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -212,7 +212,6 @@ ifneq (,$(filter samba, $(shell dh_listpackages)))
dh_installinit -psamba --name nmbd
dh_installinit -psamba --name samba-ad-dc
dh_installinit -psamba --noscripts
- dh_installinit -psamba --no-start --name reload-smbd
endif
ifneq (,$(filter winbind, $(shell dh_listpackages)))
dh_installinit -pwinbind
diff --git a/debian/samba-ad-dc.upstart b/debian/samba-ad-dc.upstart
deleted file mode 100644
index f51b304..0000000
--- a/debian/samba-ad-dc.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-description "SMB/CIFS File and Active Directory Server"
-author "Jelmer Vernooij <jelmer at ubuntu.com>"
-
-start on (local-filesystems and net-device-up)
-stop on runlevel [!2345]
-
-expect fork
-normal exit 0
-
-pre-start script
- [ -r /etc/default/samba4 ] && . /etc/default/samba4
- install -o root -g root -m 755 -d /var/run/samba
- install -o root -g root -m 755 -d /var/log/samba
-end script
-
-exec samba -D
diff --git a/debian/samba.lintian-overrides b/debian/samba.lintian-overrides
index 21c609b..d69ff61 100644
--- a/debian/samba.lintian-overrides
+++ b/debian/samba.lintian-overrides
@@ -1,8 +1,5 @@
# Standard path for [printers] section is world-writeable with sticky bit set
samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755
-# reload-smbd is upstart-only
-samba: init.d-script-not-marked-as-conffile etc/init.d/reload-smbd
-samba: init.d-script-not-included-in-package etc/init.d/reload-smbd
# /etc/init.d/samba is not a real init script, just a compatibility wrapper
samba: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/samba
samba: init.d-script-does-not-source-init-functions etc/init.d/samba
diff --git a/debian/samba.nmbd.init b/debian/samba.nmbd.init
index 4834858..971bd1e 100644
--- a/debian/samba.nmbd.init
+++ b/debian/samba.nmbd.init
@@ -26,9 +26,6 @@ test -x /usr/sbin/nmbd || exit 0
case $1 in
start)
- if init_is_upstart; then
- exit 1
- fi
SERVER_ROLE=`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`
if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
exit 0
@@ -53,9 +50,6 @@ case $1 in
;;
stop)
- if init_is_upstart; then
- exit 0
- fi
log_daemon_msg "Stopping NetBIOS name server" nmbd
@@ -73,9 +67,6 @@ case $1 in
;;
restart|force-reload)
- if init_is_upstart; then
- exit 1
- fi
$0 stop
sleep 1
$0 start
diff --git a/debian/samba.nmbd.upstart b/debian/samba.nmbd.upstart
deleted file mode 100644
index 908c284..0000000
--- a/debian/samba.nmbd.upstart
+++ /dev/null
@@ -1,21 +0,0 @@
-description "NetBIOS name server"
-author "Steve Langasek <steve.langasek at ubuntu.com>"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
-
-expect fork
-respawn
-
-pre-start script
- [ -f /etc/samba/smb.conf ] || { stop; exit 0; }
-
- install -o root -g root -m 755 -d /var/run/samba
- NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null || true`
-
- [ "x$NMBD_DISABLED" = xYes ] && { stop; exit 0; }
-
- exit 0
-end script
-
-exec nmbd -D
diff --git a/debian/samba.reload-smbd.upstart b/debian/samba.reload-smbd.upstart
deleted file mode 100644
index b7e61f1..0000000
--- a/debian/samba.reload-smbd.upstart
+++ /dev/null
@@ -1,12 +0,0 @@
-description "Samba Auto-reload Integration"
-author "James Page <james.page at ubuntu.com>"
-
-start on started cups
-
-task
-
-script
- if status smbd | grep -q "running"; then
- reload smbd
- fi
-end script
diff --git a/debian/samba.samba-ad-dc.init b/debian/samba.samba-ad-dc.init
index 4408dee..33241da 100644
--- a/debian/samba.samba-ad-dc.init
+++ b/debian/samba.samba-ad-dc.init
@@ -33,9 +33,6 @@ case "$1" in
exit 0
fi
- if init_is_upstart; then
- exit 1
- fi
# CVE-2013-4475
KEYFILE=/var/lib/samba/private/tls/key.pem
@@ -63,9 +60,6 @@ case "$1" in
log_end_msg 0
;;
stop)
- if init_is_upstart; then
- exit 0
- fi
log_daemon_msg "Stopping Samba AD DC daemon" "samba"
start-stop-daemon --stop --quiet --pidfile $SAMBAPID
@@ -82,9 +76,6 @@ case "$1" in
;;
restart|force-reload)
- if init_is_upstart; then
- exit 1
- fi
$0 stop
sleep 1
$0 start
diff --git a/debian/samba.smbd.init b/debian/samba.smbd.init
index f360620..976b528 100644
--- a/debian/samba.smbd.init
+++ b/debian/samba.smbd.init
@@ -26,9 +26,6 @@ test -x /usr/sbin/smbd || exit 0
case $1 in
start)
- if init_is_upstart; then
- exit 1
- fi
SERVER_ROLE=`samba-tool testparm --parameter-name="server role" 2>/dev/null | tail -1`
if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
exit 0
@@ -46,9 +43,6 @@ case $1 in
log_end_msg 0
;;
stop)
- if init_is_upstart; then
- exit 0
- fi
log_daemon_msg "Stopping SMB/CIFS daemon" smbd
@@ -73,9 +67,6 @@ case $1 in
log_end_msg 0
;;
restart|force-reload)
- if init_is_upstart; then
- exit 1
- fi
$0 stop
sleep 1
$0 start
diff --git a/debian/samba.smbd.upstart b/debian/samba.smbd.upstart
deleted file mode 100644
index 6186307..0000000
--- a/debian/samba.smbd.upstart
+++ /dev/null
@@ -1,15 +0,0 @@
-description "SMB/CIFS File Server"
-author "Steve Langasek <steve.langasek at ubuntu.com>"
-
-start on (local-filesystems and net-device-up)
-stop on runlevel [!2345]
-
-respawn
-
-pre-start script
- [ -r /etc/default/samba ] && . /etc/default/samba
-
- install -o root -g root -m 755 -d /var/run/samba
-end script
-
-exec smbd -F
diff --git a/debian/samba.upstart.in b/debian/samba.upstart.in
deleted file mode 100644
index f51b304..0000000
--- a/debian/samba.upstart.in
+++ /dev/null
@@ -1,16 +0,0 @@
-description "SMB/CIFS File and Active Directory Server"
-author "Jelmer Vernooij <jelmer at ubuntu.com>"
-
-start on (local-filesystems and net-device-up)
-stop on runlevel [!2345]
-
-expect fork
-normal exit 0
-
-pre-start script
- [ -r /etc/default/samba4 ] && . /etc/default/samba4
- install -o root -g root -m 755 -d /var/run/samba
- install -o root -g root -m 755 -d /var/log/samba
-end script
-
-exec samba -D
diff --git a/debian/winbind.init b/debian/winbind.init
index 505dcca..d09beba 100644
--- a/debian/winbind.init
+++ b/debian/winbind.init
@@ -35,9 +35,6 @@ fi
case "$1" in
start)
- if init_is_upstart; then
- exit 1
- fi
log_daemon_msg "Starting the Winbind daemon" "winbind"
start-stop-daemon --start --quiet --oknodo --exec $DAEMON -- $WINBINDD_OPTS
@@ -46,18 +43,12 @@ case "$1" in
;;
stop)
- if init_is_upstart; then
- exit 0
- fi
log_daemon_msg "Stopping the Winbind daemon" "winbind"
start-stop-daemon --stop --quiet --oknodo --exec $DAEMON
log_end_msg $?
;;
restart|force-reload)
- if init_is_upstart; then
- exit 1
- fi
$0 stop && sleep 2 && $0 start
;;
diff --git a/debian/winbind.upstart b/debian/winbind.upstart
deleted file mode 100644
index 9129d23..0000000
--- a/debian/winbind.upstart
+++ /dev/null
@@ -1,16 +0,0 @@
-description "Samba Winbind"
-author "David Weber"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
-
-respawn
-
-pre-start script
- test -x /usr/sbin/winbindd || exit 0
-end script
-
-script
- [ -r /etc/default/winbind ] && . /etc/default/winbind
- exec /usr/sbin/winbindd -F $WINBINDD_OPTS
-end script
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list