Remove SysV init script

5 files changed, 5 insertions, 94 deletions

diff --git a/debian/network-manager-config-connectivity-debian.postinst b/debian/network-manager-config-connectivity-debian.postinst
index eb087aa4..576f8898 100644
--- a/debian/network-manager-config-connectivity-debian.postinst
+++ b/debian/network-manager-config-connectivity-debian.postinst
@@ -3,7 +3,7 @@
 set -e
 
 if [ "$1" = configure ]; then
-    invoke-rc.d network-manager force-reload || true
+    nmcli general reload 2>/dev/null || true
 fi
 
 #DEBHELPER#
diff --git a/debian/network-manager.init b/debian/network-manager.init
deleted file mode 100644
index ac9c584c..00000000
--- a/debian/network-manager.init
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          network-manager
-# Required-Start:    $remote_fs dbus udev
-# Required-Stop:     $remote_fs dbus udev
-# Should-Start:	     $syslog
-# Should-Stop:       $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: network connection manager
-# Description:       Daemon for automatically switching network 
-#		     connections to the best available connection.
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="network connection manager"
-NAME="NetworkManager"
-
-DAEMON=/usr/sbin/$NAME
-
-PIDFILE=/run/$NAME/$NAME.pid
-
-SCRIPTNAME=/etc/init.d/network-manager
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
-
-#
-#	Function that starts the daemon/service.
-#
-d_start() {
-	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--exec $DAEMON -- $DAEMON_OPTS
-}
-
-#
-#	Function that stops the daemon/service.
-#
-d_stop() {
-	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
-}
-
-d_reload() {
-	start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE \
-		--exec $DAEMON
-}
-
-case "$1" in
-  start)
-	log_daemon_msg "Starting $DESC" "$NAME"
-	d_start
-	case "$?" in
-		0) log_end_msg 0 ;;
-		1) log_progress_msg "already started"
-		   log_end_msg 0 ;;
-		*) log_end_msg 1 ;;
-	esac
-	;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	d_stop
-	case "$?" in
-		0) log_end_msg 0 ;;
-		1) log_progress_msg "already stopped"
-		   log_end_msg 0 ;;
-		*) log_end_msg 1 ;;
-	esac
-	;;
-  reload|force-reload)
-	log_daemon_msg "Reloading $DESC" "$NAME"
-	d_reload
-	log_end_msg $?
-	;;
-  restart)
-	$0 stop
-	$0 start
-	;;
-  status)
-	status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/network-manager.links b/debian/network-manager.links
deleted file mode 100644
index d32ad80e..00000000
--- a/debian/network-manager.links
+++ /dev/null
@@ -1 +0,0 @@
-lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index 673456df..bb7498aa 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1,3 +1,4 @@
 mv_conffile /etc/NetworkManager/dispatcher.d/01ifupdown /etc/NetworkManager/dispatcher.d/01-ifupdown 1.8.0-5~
 rm_conffile /etc/dbus-1/system.d/nm-dispatcher.conf 1.14.4-4~
 rm_conffile /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 1.14.4-4~
+rm_conffile /etc/init.d/network-manager 1.25.91-1~
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index f62edf2a..2996afcc 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -53,6 +53,9 @@ case "$1" in
                 chmod 0600 /var/lib/NetworkManager/secret_key
             fi
         fi
+        if dpkg --compare-versions "$2" lt-nl "1.25.91-1"; then
+            update-rc.d -f network-manager remove || true
+        fi
         ;;
 
     abort-upgrade|abort-deconfigure|abort-remove)