diff options
Diffstat (limited to 'initscript')
26 files changed, 10 insertions, 571 deletions
diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am index 2c1f8b54..98d43432 100644 --- a/initscript/Arch/Makefile.am +++ b/initscript/Arch/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d initd_SCRIPTS = networkmanager diff --git a/initscript/Arch/Makefile.in b/initscript/Arch/Makefile.in index f2561855..9bd465bc 100644 --- a/initscript/Arch/Makefile.in +++ b/initscript/Arch/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager initddir = $(sysconfdir)/rc.d initd_SCRIPTS = networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Arch/networkmanager b/initscript/Arch/networkmanager deleted file mode 100644 index 60874f22..00000000 --- a/initscript/Arch/networkmanager +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 0 - -PID=`pidof -o %PPID $NETWORKMANAGER_BIN` -case "$1" in - start) - stat_busy "Starting NetworkManager" - [ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager - if [ -z "$PID" ]; then - $NETWORKMANAGER_BIN - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon networkmanager - stat_done - fi - ;; - stop) - stat_busy "Stopping NetworkManager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon networkmanager - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - sleep) - /usr/bin/dbus-send --system \ - --dest=org.freedesktop.NetworkManager \ - --type=method_call \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.sleep - ;; - wake) - /usr/bin/dbus-send --system \ - --dest=org.freedesktop.NetworkManager \ - --type=method_call \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.wake - ;; - *) - echo "usage: $0 {start|stop|restart|sleep|wake}" - ;; -esac -exit 0 - - - diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am index 890ed77b..a7356452 100644 --- a/initscript/Debian/Makefile.am +++ b/initscript/Debian/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = NetworkManager.in -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/Debian/Makefile.in b/initscript/Debian/Makefile.in index 12b99d35..df36a08f 100644 --- a/initscript/Debian/Makefile.in +++ b/initscript/Debian/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager.in -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am index af023b75..a7356452 100644 --- a/initscript/Gentoo/Makefile.am +++ b/initscript/Gentoo/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/Gentoo/Makefile.in b/initscript/Gentoo/Makefile.in index e87643af..d7039dc4 100644 --- a/initscript/Gentoo/Makefile.in +++ b/initscript/Gentoo/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Gentoo/NetworkManager b/initscript/Gentoo/NetworkManager deleted file mode 100644 index 7db410be..00000000 --- a/initscript/Gentoo/NetworkManager +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Purpose License v2 -# $Header: $ - -depend() { - need dbus -} - -start() { - ebegin "Starting NetworkManager" - start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \ - --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid - eend $? -} - -stop() { - ebegin "Stopping NetworkManager" - start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid - eend $? -} - -# vim: set ft=gentoo-init-d ts=3 sw=3 et: diff --git a/initscript/Makefile.in b/initscript/Makefile.in index 84b2370e..ff52589c 100644 --- a/initscript/Makefile.in +++ b/initscript/Makefile.in @@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am index 0a0cc2bb..bdc99085 100644 --- a/initscript/Mandriva/Makefile.am +++ b/initscript/Mandriva/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager diff --git a/initscript/Mandriva/Makefile.in b/initscript/Mandriva/Makefile.in index eb882781..4ad3f365 100644 --- a/initscript/Mandriva/Makefile.in +++ b/initscript/Mandriva/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Mandriva/networkmanager b/initscript/Mandriva/networkmanager deleted file mode 100644 index bb65dc76..00000000 --- a/initscript/Mandriva/networkmanager +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# NetworkManager: NetworkManager daemon -# -# chkconfig: - 98 02 -# description: This is a daemon for automatically switching network \ -# connections to the best available connection. -# -# processname: NetworkManager -# pidfile: /var/run/NetworkManager/NetworkManager.pid -# -### BEGIN INIT INFO -# Provides: networkmanager -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 3 4 5 -# Short-Description: Daemon for automatically switching to best network connection. -# Description: This is a daemon for automatically switching network -# connections to the best available connection. -### END INIT INFO - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 1 - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source network configuration -. /etc/sysconfig/network - -# so we can rearrange this easily -processname=NetworkManager -servicename=NetworkManager -pidfile=/var/run/NetworkManager/NetworkManager.pid - -RETVAL=0 - -start() -{ - echo $"Setting network parameters... " - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 - - if [ ! -e /var/lock/subsys/named ]; then - service named start >/dev/null 2>&1 - fi - - echo -n $"Starting NetworkManager daemon: " - daemon --check $servicename $processname --pid-file=$pidfile - RETVAL=$? - echo - if [ -n "${NETWORKWAIT}" ]; then - [ -z "${LINKDELAY}" ] && LINKDELAY=10 - echo -n $"Waiting for network..." - nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30 - [ "$?" = "0" ] && success "network startup" || failure "network startup" - echo - [ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY} - fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename -} - -stop() -{ - echo -n $"Stopping NetworkManager daemon: " - killproc -p $pidfile $servicename - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$servicename - rm -f $pidfile - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p $pidfile $processname - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$servicename ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - ;; -esac -exit $RETVAL diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am index 3f7b876b..fc97ec45 100644 --- a/initscript/RedHat/Makefile.am +++ b/initscript/RedHat/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/RedHat/Makefile.in b/initscript/RedHat/Makefile.in index 9e3bc499..7ce3a5ce 100644 --- a/initscript/RedHat/Makefile.in +++ b/initscript/RedHat/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/RedHat/NetworkManager b/initscript/RedHat/NetworkManager deleted file mode 100644 index 465c7611..00000000 --- a/initscript/RedHat/NetworkManager +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# -# NetworkManager: NetworkManager daemon -# -# chkconfig: - 23 84 -# description: This is a daemon for automatically switching network \ -# connections to the best available connection. -# -# processname: NetworkManager -# pidfile: /var/run/NetworkManager/NetworkManager.pid -# -### BEGIN INIT INFO -# Provides: network_manager $network -# Required-Start: messagebus -# Required-Stop: messagebus -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop NetworkManager -# Description: NetworkManager is a tool for easily managing network connections -### END INIT INFO - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 1 - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source network configuration -. /etc/sysconfig/network - -# so we can rearrange this easily -processname=NetworkManager -servicename=NetworkManager -pidfile=/var/run/NetworkManager/NetworkManager.pid - -RETVAL=0 - -start() -{ - echo -n $"Setting network parameters... " - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 - success - echo - - echo -n $"Starting NetworkManager daemon: " - daemon --pidfile $pidfile --check $servicename $processname --pid-file=$pidfile - RETVAL=$? - echo - if [ -n "${NETWORKWAIT}" ]; then - [ -z "${LINKDELAY}" ] && LINKDELAY=10 - echo -n $"Waiting for network..." - nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30 - [ "$?" = "0" ] && success "network startup" || failure "network startup" - echo - [ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY} - fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename -} - -stop() -{ - echo -n $"Stopping NetworkManager daemon: " - killproc -p $pidfile $servicename - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$servicename - rm -f $pidfile - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p $pidfile $processname - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$servicename ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - ;; -esac -exit $RETVAL diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am index 75a7c2ac..4938e3e1 100644 --- a/initscript/SUSE/Makefile.am +++ b/initscript/SUSE/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager.in -DISTCLEANFILES = networkmanager - # Nowadays, NetworkManager support is built-in to the SUSE networking # subsystem, therefore a SUSE machine does not want these scripts. Uncomment # this if you actually want external initscripts, such as SUSE 10.0 or earlier. diff --git a/initscript/SUSE/Makefile.in b/initscript/SUSE/Makefile.in index 8e2c45de..e83f1d0b 100644 --- a/initscript/SUSE/Makefile.in +++ b/initscript/SUSE/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -244,8 +244,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager.in -DISTCLEANFILES = networkmanager all: all-am .SUFFIXES: @@ -349,7 +347,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am index ded3ee09..254bb7ad 100644 --- a/initscript/Slackware/Makefile.am +++ b/initscript/Slackware/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = rc.networkmanager -DISTCLEANFILES = rc.networkmanager - initddir = $(sysconfdir)/rc.d initd_SCRIPTS = rc.networkmanager diff --git a/initscript/Slackware/Makefile.in b/initscript/Slackware/Makefile.in index 58f85f47..b0d96d25 100644 --- a/initscript/Slackware/Makefile.in +++ b/initscript/Slackware/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = rc.networkmanager -DISTCLEANFILES = rc.networkmanager initddir = $(sysconfdir)/rc.d initd_SCRIPTS = rc.networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Slackware/rc.networkmanager b/initscript/Slackware/rc.networkmanager deleted file mode 100644 index 5ab01ea1..00000000 --- a/initscript/Slackware/rc.networkmanager +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# -# NetworkManager: NetworkManager daemon -# -# description: This is a daemon for automatically switching network \ -# connections to the best available connection. \ -# -# processname: NetworkManager -# pidfile: /var/run/NetworkManager.pid -# - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 0 - -PIDFILE=/var/run/NetworkManager.pid - -nm_start() -{ - if [ "`pgrep dbus-daemon`" = "" ]; then - echo "D-BUS must be running to start NetworkManager" - return - fi - - # Just in case the pidfile is still there, we may need to nuke it. - if [ -e "$PIDFILE" ]; then - rm -f $PIDFILE - fi - - echo "Starting NetworkManager daemon: $NETWORKMANAGER_BIN" - $NETWORKMANAGER_BIN -} - -nm_status() -{ - local pidlist=`cat $PIDFILE 2>/dev/null` - if [ -z "$pidlist" ]; then - return 1 - fi - local command=`ps -p $pidlist -o comm=` - if [ "$command" != 'NetworkManager' ]; then - return 1 - fi -} - -nm_stop() -{ - echo -en "Stopping NetworkManager: " - local pidlist=`cat $PIDFILE 2>/dev/null` - if [ ! -z "$pidlist" ]; then - kill $pidlist &>/dev/null - rm -f $PIDFILE &>/dev/null - fi - echo "stopped"; -} - -nm_restart() -{ - nm_stop - sleep 2 - nm_start -} - -case "$1" in -'start') - if ( ! nm_status ); then - nm_start - else - echo "NetworkManager is already running (will not start it twice)." - fi - ;; -'stop') - nm_stop - ;; -'restart') - nm_restart - ;; -'status') - if ( nm_status ); then - echo "NetworkManager is currently running" - else - echo "NetworkManager is not running." - fi - ;; -*) - echo "usage $0 start|stop|status|restart" -esac diff --git a/initscript/linexa/Makefile.am b/initscript/linexa/Makefile.am index 0a0cc2bb..bdc99085 100644 --- a/initscript/linexa/Makefile.am +++ b/initscript/linexa/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager diff --git a/initscript/linexa/Makefile.in b/initscript/linexa/Makefile.in index 49f99dae..9bd2bb0e 100644 --- a/initscript/linexa/Makefile.in +++ b/initscript/linexa/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/linexa/networkmanager b/initscript/linexa/networkmanager deleted file mode 100644 index 0d754c36..00000000 --- a/initscript/linexa/networkmanager +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# Start the networkmanager daemon -# -# Author: Elias <elias@linexa.de> -# [2010-08-20] - -# Information about the daemon -title="networkmanager" # No spaces allowed in here -start_after="dbus" # dependencies for start-up -stop_after="xinetd" # dependencies for stop -runlevel="2" # start/stop in this runlevel -sequence="25" # "checkinstall networkmanager enable" - # will create links to: - # /etc/rc.d/rc${runlevel}.d/S${sequence}${title} - # /etc/rc.d/rc${runlevel}.d/S$((100 - ${sequence}))${title} - -# check whether daemon is running -# returns 0 if running, >0 if not -check() { - [ -f /var/run/NetworkManager.pid ] -} - -# start procedure -start() { - if check ; then - warning "${title} is already running. Type 'service restart ${title}'" # Issue a warning - else - /usr/sbin/NetworkManager & - evaluate_retval "Starting ${title}. " # Print [ done ] or [ failed ] depending on outcome - fi -} - -# stop procedure -stop() { - if check ; then # daemon is running - kill $(cat /var/run/NetworkManager.pid) - evaluate_retval "Stopping ${title}." # Print [ done ] or [ failed ] depending on outcome - else # daemon not running - warning "${title} is not running." # Issue a warning - fi -} - -# restart procedure -restart() { - stop - sleep 1 - start -} - -# reload action -reload() { - if check ; then # daemon is running - kill -HUP $(cat /var/run/NetworkManager.pid) &>/dev/null - evaluate_retval "Reloading ${title}." # Print [ done ] or [ failed ] depending on outcome - else # daemon not running - warning "${title} is not running." # Issue a warning - fi -} - diff --git a/initscript/paldo/Makefile.am b/initscript/paldo/Makefile.am index 3d67ff6e..2c1b1964 100644 --- a/initscript/paldo/Makefile.am +++ b/initscript/paldo/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/paldo/Makefile.in b/initscript/paldo/Makefile.in index 4f8570ce..75cc966e 100644 --- a/initscript/paldo/Makefile.in +++ b/initscript/paldo/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/paldo/NetworkManager b/initscript/paldo/NetworkManager deleted file mode 100644 index fe66d80b..00000000 --- a/initscript/paldo/NetworkManager +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -### BEGIN INIT INFO -# Provides: NetworkManager -# Required-Start: $network dbus -# Required-Stop: $network dbus -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -### END INIT INFO -. /lib/lsb/init-functions - -[ -e /etc/default/NetworkManager ] && source /etc/default/NetworkManager -[ $(/usr/bin/tty -s; echo $?) -gt 0 -o "$(/usr/bin/tty)" == "/dev/console" ] && [ "$START_NETWORK_MANAGER" != "TRUE" ] && exit 0 - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -case "$1" in - start) - echo -n "Starting NetworkManager..." - if start_daemon $sbindir/NetworkManager - then - log_success_msg - else - log_failure_msg - fi - ;; - stop) - echo -n "Stopping NetworkManager..." - if killproc $sbindir/NetworkManager - then - log_success_msg "." - else - log_failure_msg - fi - ;; - restart|force-reload) - $0 stop - sleep 1 - $0 start - ;; - try-restart) - if pidofproc $sbindir/NetworkManager - then - $0 restart - fi - ;; - status) - pidofproc $sbindir/NetworkManager - exit $? - ;; - *) - echo "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" - exit 1 - ;; -esac |