diff --git a/configure.in b/configure.in index 1f147e56d5..e4c5457e91 100644 --- a/configure.in +++ b/configure.in @@ -288,10 +288,14 @@ gnome/vpn-properties/Makefile test/Makefile initscript/Makefile initscript/RedHat/Makefile +initscript/RedHat/NetworkManager +initscript/RedHat/NetworkManagerDispatcher initscript/Gentoo/Makefile +initscript/Gentoo/NetworkManager initscript/Debian/Makefile initscript/Slackware/Makefile initscript/SUSE/Makefile +initscript/SUSE/networkmanager po/Makefile.in NetworkManager.pc ]) 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 similarity index 84% rename from initscript/Gentoo/NetworkManager rename to 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 similarity index 90% rename from initscript/RedHat/NetworkManager rename to 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 similarity index 88% rename from initscript/RedHat/NetworkManagerDispatcher rename to 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 similarity index 89% rename from initscript/SUSE/networkmanager rename to 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