From eb179bc0ad4158885fa3c4b2c165e84f12e70728 Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Wed, 26 Sep 2007 11:08:39 +0000 Subject: [PATCH] 2007-09-26 Juerg Billeter * 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 --- ChangeLog | 7 +++++++ initscript/paldo/NetworkManager.in | 3 +++ initscript/paldo/NetworkManagerDispatcher.in | 3 +++ src/backends/NetworkManagerPaldo.c | 5 ++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e810fc4e3..d65c9cdb1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-09-26 Jürg Billeter + + * initscript/paldo/NetworkManager.in: + * initscript/paldo/NetworkManagerDispatcher.in: + * src/backends/NetworkManagerPaldo.c: (nm_system_enable_loopback), + (nm_system_flush_loopback_routes): update paldo backend + 2007-09-26 Tambet Ingo * src/nm-device-802-3-ethernet.c (real_get_best_connection): Don't leak NMManager. 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@ diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c index 05cd6d0471..27fe516981 100644 --- a/src/backends/NetworkManagerPaldo.c +++ b/src/backends/NetworkManagerPaldo.c @@ -156,8 +156,7 @@ void nm_system_device_flush_addresses_with_iface (const char *iface) */ void nm_system_enable_loopback (void) { - nm_system_device_set_up_down_with_iface ("lo", TRUE); - nm_spawn_process (IP_BINARY_PATH " addr add 127.0.0.1/8 brd 127.255.255.255 dev lo scope host label loopback"); + nm_generic_enable_loopback (); } @@ -170,7 +169,7 @@ void nm_system_enable_loopback (void) */ void nm_system_flush_loopback_routes (void) { - nm_system_device_flush_routes_with_iface ("lo"); + nm_generic_flush_loopback_routes (); }