diff options
| author | Christopher Aillon <caillon@redhat.com> | 2005-08-18 19:51:11 +0000 |
|---|---|---|
| committer | Chris Aillon <caillon@redhat.com> | 2005-08-18 19:51:11 +0000 |
| commit | e9607dea0ce79c35847fd18487f2afb0a7fa538a (patch) | |
| tree | 4d8f330af8ec9c5644105f6d8bf4a32554418811 /initscript | |
| parent | 87bbf6f958648e1af27621d84c2567a3c77a822e (diff) | |
| download | NetworkManager-e9607dea0ce79c35847fd18487f2afb0a7fa538a.tar.gz | |
2005-08-18 Christopher Aillon <caillon@redhat.com>
* initscript/Gentoo/NetworkManager:
* initscript/RedHat/NetworkManager:
* initscript/RedHat/NetworkManagerDispatcher:
* initscript/SUSE/networkmanager:
CVS remove these in place of .in replacements
* configure.in:
* initscript/Gentoo/NetworkManager.in:
* initscript/RedHat/NetworkManager.in:
* initscript/RedHat/NetworkManagerDispatcher.in:
* initscript/SUSE/networkmanager.in:
These scripts now are generated so they work still when
NM is built using a bindir other than /usr/bin
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@880 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'initscript')
| -rw-r--r-- | initscript/Gentoo/.cvsignore | 1 | ||||
| -rwxr-xr-x | initscript/Gentoo/NetworkManager.in (renamed from initscript/Gentoo/NetworkManager) | 10 | ||||
| -rw-r--r-- | initscript/RedHat/.cvsignore | 3 | ||||
| -rwxr-xr-x | initscript/RedHat/NetworkManager.in (renamed from initscript/RedHat/NetworkManager) | 8 | ||||
| -rwxr-xr-x | initscript/RedHat/NetworkManagerDispatcher.in (renamed from initscript/RedHat/NetworkManagerDispatcher) | 8 | ||||
| -rw-r--r-- | initscript/SUSE/.cvsignore | 1 | ||||
| -rw-r--r-- | initscript/SUSE/networkmanager.in (renamed from initscript/SUSE/networkmanager) | 6 |
7 files changed, 32 insertions, 5 deletions
diff --git a/initscript/Gentoo/.cvsignore b/initscript/Gentoo/.cvsignore index 282522db03..47e4a4182d 100644 --- a/initscript/Gentoo/.cvsignore +++ b/initscript/Gentoo/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +NetworkManager diff --git a/initscript/Gentoo/NetworkManager b/initscript/Gentoo/NetworkManager.in index 40cdade5d1..85d58f47ef 100755 --- a/initscript/Gentoo/NetworkManager +++ b/initscript/Gentoo/NetworkManager.in @@ -13,14 +13,20 @@ # Provides: $network ### END INIT INFO +prefix=@prefix@ +exec_prefix=@prefix@ +bindir=@bindir@ + +NETWORKMANAGER_BIN=${bindir}/NetworkManager + # Sanity checks. -[ -x /usr/bin/NetworkManager ] || exit 0 +[ -x $NETWORKMANAGER_BIN ] || exit 0 # We need /sbin/ip [ -x /sbin/ip ] || exit 0 # so we can rearrange this easily -processname=/usr/bin/NetworkManager +processname=$NETWORKMANAGER_BIN pidfile=/var/run/NetworkManager.pid depend() { diff --git a/initscript/RedHat/.cvsignore b/initscript/RedHat/.cvsignore index 282522db03..d4f33ad452 100644 --- a/initscript/RedHat/.cvsignore +++ b/initscript/RedHat/.cvsignore @@ -1,2 +1,5 @@ Makefile Makefile.in +NetworkManager +NetworkManagerDispatcher + diff --git a/initscript/RedHat/NetworkManager b/initscript/RedHat/NetworkManager.in index 13102ca0f6..378a7d4220 100755 --- a/initscript/RedHat/NetworkManager +++ b/initscript/RedHat/NetworkManager.in @@ -10,8 +10,14 @@ # pidfile: /var/run/NetworkManager.pid # +prefix=@prefix@ +exec_prefix=@prefix@ +bindir=@bindir@ + +NETWORKMANAGER_BIN=${bindir}/NetworkManager + # Sanity checks. -[ -x /usr/bin/NetworkManager ] || exit 1 +[ -x $NETWORKMANAGER_BIN ] || exit 1 # We need /sbin/ip [ -x /sbin/ip ] || exit 1 diff --git a/initscript/RedHat/NetworkManagerDispatcher b/initscript/RedHat/NetworkManagerDispatcher.in index a01f0ba90a..c3a6f30ef0 100755 --- a/initscript/RedHat/NetworkManagerDispatcher +++ b/initscript/RedHat/NetworkManagerDispatcher.in @@ -10,8 +10,14 @@ # pidfile: /var/run/NetworkManagerDispatcher.pid # +prefix=@prefix@ +exec_prefix=@prefix@ +bindir=@bindir@ + +NETWORKMANAGERDISPATCHER_BIN=${bindir}/NetworkManagerDispatcher + # Sanity checks. -[ -x /usr/bin/NetworkManagerDispatcher ] || exit 1 +[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 1 # Source function library. . /etc/rc.d/init.d/functions diff --git a/initscript/SUSE/.cvsignore b/initscript/SUSE/.cvsignore index 282522db03..a7a2dc3b8b 100644 --- a/initscript/SUSE/.cvsignore +++ b/initscript/SUSE/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +networkmanager diff --git a/initscript/SUSE/networkmanager b/initscript/SUSE/networkmanager.in index 60c5f89548..7e317354c3 100644 --- a/initscript/SUSE/networkmanager +++ b/initscript/SUSE/networkmanager.in @@ -8,7 +8,11 @@ # Description: NetworkManager, a network and wireless connection manager ### END INIT INFO -NETWORKMANAGER_BIN=/usr/bin/NetworkManager +prefix=@prefix@ +exec_prefix=@prefix@ +bindir=@bindir@ + +NETWORKMANAGER_BIN=${bindir}/NetworkManager test -x $NETWORKMANAGER_BIN || exit 5 . /etc/rc.status |