summaryrefslogtreecommitdiff
path: root/initscript
diff options
context:
space:
mode:
authorJuerg Billeter <j@bitron.ch>2007-09-26 11:08:39 +0000
committerJuerg Billeter <j@bitron.ch>2007-09-26 11:08:39 +0000
commiteb179bc0ad4158885fa3c4b2c165e84f12e70728 (patch)
treefd15555a25bb0bc1fd71dd6457e9b93585d8924b /initscript
parentf1599fe699912fae2e663a21a6f2cd6e9dedb4df (diff)
downloadNetworkManager-eb179bc0ad4158885fa3c4b2c165e84f12e70728.tar.gz
2007-09-26 Juerg Billeter <j@bitron.ch>
* initscript/paldo/NetworkManager.in: * initscript/paldo/NetworkManagerDispatcher.in: * src/backends/NetworkManagerPaldo.c: (nm_system_enable_loopback), (nm_system_flush_loopback_routes): update paldo backend git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2888 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'initscript')
-rw-r--r--initscript/paldo/NetworkManager.in3
-rw-r--r--initscript/paldo/NetworkManagerDispatcher.in3
2 files changed, 6 insertions, 0 deletions
diff --git a/initscript/paldo/NetworkManager.in b/initscript/paldo/NetworkManager.in
index 8f3cc5c6b5..ebf709970f 100644
--- a/initscript/paldo/NetworkManager.in
+++ b/initscript/paldo/NetworkManager.in
@@ -8,6 +8,9 @@
### 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=@prefix@
exec_prefix=@prefix@
sbindir=@sbindir@
diff --git a/initscript/paldo/NetworkManagerDispatcher.in b/initscript/paldo/NetworkManagerDispatcher.in
index fa567ea788..01fdb3eb03 100644
--- a/initscript/paldo/NetworkManagerDispatcher.in
+++ b/initscript/paldo/NetworkManagerDispatcher.in
@@ -8,6 +8,9 @@
### 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=@prefix@
exec_prefix=@prefix@
sbindir=@sbindir@