From fd5e3bb0cc59f9e04a84340463d8775586838fa9 Mon Sep 17 00:00:00 2001 From: Robert Love Date: Sat, 21 Jan 2006 01:47:41 +0000 Subject: [PATCH] 2006-01-20 Robert Love * initscript/Debian/NetworkManager, initscript/Gentoo/NetworkManager.in, initscript/RedHat/NetworkManager.in, initscript/RedHat/NetworkManagerDispatcher.in, initscript/SUSE/networkmanager-dispatcher.in, initscript/SUSE/networkmanager.in: Update for /usr/sbin not /usr/bin. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1372 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ initscript/Debian/NetworkManager | 2 +- initscript/Gentoo/NetworkManager.in | 4 ++-- initscript/RedHat/NetworkManager.in | 4 ++-- initscript/RedHat/NetworkManagerDispatcher.in | 4 ++-- initscript/SUSE/networkmanager-dispatcher.in | 4 ++-- initscript/SUSE/networkmanager.in | 4 ++-- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72277501b9..c3e79739db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ man/Makefile.am: Add man pages for NetworkManager and its crime-solving bumbling buddy, NetworkManagerDispatcher. * man/.cvsignore: Add. + * initscript/Debian/NetworkManager, + initscript/Gentoo/NetworkManager.in, + initscript/RedHat/NetworkManager.in, + initscript/RedHat/NetworkManagerDispatcher.in, + initscript/SUSE/networkmanager-dispatcher.in, + initscript/SUSE/networkmanager.in: Update for /usr/sbin not /usr/bin. 2006-01-20 Robert Love diff --git a/initscript/Debian/NetworkManager b/initscript/Debian/NetworkManager index 5d5666ccb2..d12004e00c 100755 --- a/initscript/Debian/NetworkManager +++ b/initscript/Debian/NetworkManager @@ -17,7 +17,7 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DESC="Network connection manager daemon" NAME="NetworkManager" -DAEMON=/usr/bin/$NAME +DAEMON=/usr/sbin/$NAME PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME USER=root diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in index 85d58f47ef..330f5d6130 100755 --- a/initscript/Gentoo/NetworkManager.in +++ b/initscript/Gentoo/NetworkManager.in @@ -15,9 +15,9 @@ prefix=@prefix@ exec_prefix=@prefix@ -bindir=@bindir@ +sbindir=@sbindir@ -NETWORKMANAGER_BIN=${bindir}/NetworkManager +NETWORKMANAGER_BIN=${sbindir}/NetworkManager # Sanity checks. [ -x $NETWORKMANAGER_BIN ] || exit 0 diff --git a/initscript/RedHat/NetworkManager.in b/initscript/RedHat/NetworkManager.in index 378a7d4220..29bdef7964 100755 --- a/initscript/RedHat/NetworkManager.in +++ b/initscript/RedHat/NetworkManager.in @@ -12,9 +12,9 @@ prefix=@prefix@ exec_prefix=@prefix@ -bindir=@bindir@ +sbindir=@sbindir@ -NETWORKMANAGER_BIN=${bindir}/NetworkManager +NETWORKMANAGER_BIN=${sbindir}/NetworkManager # Sanity checks. [ -x $NETWORKMANAGER_BIN ] || exit 1 diff --git a/initscript/RedHat/NetworkManagerDispatcher.in b/initscript/RedHat/NetworkManagerDispatcher.in index c3a6f30ef0..fbd60d787a 100755 --- a/initscript/RedHat/NetworkManagerDispatcher.in +++ b/initscript/RedHat/NetworkManagerDispatcher.in @@ -12,9 +12,9 @@ prefix=@prefix@ exec_prefix=@prefix@ -bindir=@bindir@ +sbindir=@sbindir@ -NETWORKMANAGERDISPATCHER_BIN=${bindir}/NetworkManagerDispatcher +NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher # Sanity checks. [ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 1 diff --git a/initscript/SUSE/networkmanager-dispatcher.in b/initscript/SUSE/networkmanager-dispatcher.in index 480bda228f..5eda576e46 100644 --- a/initscript/SUSE/networkmanager-dispatcher.in +++ b/initscript/SUSE/networkmanager-dispatcher.in @@ -8,9 +8,9 @@ # Description: NetworkManagerDispatcher responds to network events ### END INIT INFO -bindir=@bindir@ +sbindir=@sbindir@ -NETWORKMANAGER_BIN=${bindir}/NetworkManagerDispatcher +NETWORKMANAGER_BIN=${sbindir}/NetworkManagerDispatcher test -x $NETWORKMANAGER_BIN || exit 5 . /etc/rc.status diff --git a/initscript/SUSE/networkmanager.in b/initscript/SUSE/networkmanager.in index 8ef6e7e032..df2cd24a2b 100644 --- a/initscript/SUSE/networkmanager.in +++ b/initscript/SUSE/networkmanager.in @@ -8,9 +8,9 @@ # Description: NetworkManager, a network and wireless connection manager ### END INIT INFO -bindir=@bindir@ +sbindir=@sbindir@ -NETWORKMANAGER_BIN=${bindir}/NetworkManager +NETWORKMANAGER_BIN=${sbindir}/NetworkManager test -x $NETWORKMANAGER_BIN || exit 5 . /etc/rc.status