From e9e6f3124c47c56243c896fc2810ebfba7df640d Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 1 Apr 2008 21:26:09 +0000 Subject: [PATCH] 2008-04-01 Dan Williams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch from Per Øyvind Karlsen * configure.in initscript/Makefile.am initscript/Mandriva/Makefile.am initscript/Mandriva/networkmanager.in initscript/Mandriva/networkmanagerdispatcher.in src/backends/Makefile.am src/backends/NetworkManagerMandriva.c system-settings/plugins/Makefile.am - Add Mandriva support git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3523 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 14 + configure.in | 11 +- initscript/Makefile.am | 3 + initscript/Mandriva/Makefile.am | 5 + initscript/Mandriva/networkmanager.in | 98 ++++ .../Mandriva/networkmanagerdispatcher.in | 88 +++ src/backends/Makefile.am | 6 + src/backends/NetworkManagerMandriva.c | 541 ++++++++++++++++++ system-settings/plugins/Makefile.am | 4 + 9 files changed, 767 insertions(+), 3 deletions(-) create mode 100644 initscript/Mandriva/Makefile.am create mode 100644 initscript/Mandriva/networkmanager.in create mode 100644 initscript/Mandriva/networkmanagerdispatcher.in create mode 100644 src/backends/NetworkManagerMandriva.c diff --git a/ChangeLog b/ChangeLog index 9c52265814..602b5ba1ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-04-01 Dan Williams + + Patch from Per Øyvind Karlsen + + * configure.in + initscript/Makefile.am + initscript/Mandriva/Makefile.am + initscript/Mandriva/networkmanager.in + initscript/Mandriva/networkmanagerdispatcher.in + src/backends/Makefile.am + src/backends/NetworkManagerMandriva.c + system-settings/plugins/Makefile.am + - Add Mandriva support + 2008-03-31 Dan Williams * src/vpn-manager/nm-vpn-service.c diff --git a/configure.in b/configure.in index dacb557fa5..02b205ff6e 100644 --- a/configure.in +++ b/configure.in @@ -76,7 +76,7 @@ dnl Make sha1.c happy on big endian systems dnl AC_C_BIGENDIAN -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware or paldo])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo or mandriva])) if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") @@ -86,6 +86,7 @@ if test "z$with_distro" = "z"; then AC_CHECK_FILE(/etc/arch-release,with_distro="arch") AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware") + AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva") if test "z$with_distro" = "z"; then with_distro=`lsb_release -is` fi @@ -97,7 +98,7 @@ if test "z$with_distro" = "z"; then exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware) ;; + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -112,8 +113,9 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) AM_CONDITIONAL(TARGET_PALDO, test x"$with_distro" = xpaldo) AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware) +AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) -if test x"$with_distro" = xgentoo ; then +if test x"$with_distro" = xgentoo -o x"$with_distro" = xmandriva ; then AC_ARG_WITH([mdns_provider], AS_HELP_STRING([--with-mdns-provider=PROVIDER], [Specify the mDNS implementation: Avahi, Bonjour]),, [with_mdns_provider=avahi]) @@ -328,6 +330,9 @@ initscript/Arch/networkmanager-dispatcher initscript/paldo/Makefile initscript/paldo/NetworkManager initscript/paldo/NetworkManagerDispatcher +initscript/Mandriva/Makefile +initscript/Mandriva/networkmanager +initscript/Mandriva/networkmanagerdispatcher introspection/Makefile man/Makefile man/NetworkManager.8 diff --git a/initscript/Makefile.am b/initscript/Makefile.am index be662e9d82..4cc710eba4 100644 --- a/initscript/Makefile.am +++ b/initscript/Makefile.am @@ -20,3 +20,6 @@ endif if TARGET_PALDO SUBDIRS += paldo endif +if TARGET_MANDRIVA +SUBDIRS += Mandriva +endif diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am new file mode 100644 index 0000000000..3c1533f483 --- /dev/null +++ b/initscript/Mandriva/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = networkmanager networkmanagerdispatcher + +initddir = $(sysconfdir)/rc.d/init.d +initd_SCRIPTS = networkmanager networkmanagerdispatcher + diff --git a/initscript/Mandriva/networkmanager.in b/initscript/Mandriva/networkmanager.in new file mode 100644 index 0000000000..8f45b20487 --- /dev/null +++ b/initscript/Mandriva/networkmanager.in @@ -0,0 +1,98 @@ +#!/bin/sh +# +# NetworkManager: NetworkManager daemon +# +# chkconfig: - 98 02 +# description: This is a daemon for automatically switching network \ +# connections to the best available connection. +# +# processname: NetworkManager +# pidfile: /var/run/NetworkManager/NetworkManager.pid +# +### BEGIN INIT INFO +# Provides: networkmanager +# Required-Start: $network +# Required-Stop: $network +# Default-Start: 3 4 5 +# Short-Description: Daemon for automatically switching to best network connection. +# Description: This is a daemon for automatically switching network +# connections to the best available connection. +### END INIT INFO + +prefix=@prefix@ +exec_prefix=@prefix@ +sbindir=@sbindir@ + +NETWORKMANAGER_BIN=${sbindir}/NetworkManager + +# Sanity checks. +[ -x $NETWORKMANAGER_BIN ] || exit 1 + +# We need /sbin/ip +[ -x /sbin/ip ] || exit 1 + +# Source function library. +. /etc/rc.d/init.d/functions + +# so we can rearrange this easily +processname=NetworkManager +servicename=NetworkManager +pidfile=/var/run/NetworkManager/NetworkManager.pid + +RETVAL=0 + +start() +{ + echo $"Setting network parameters... " + sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + + if [ ! -e /var/lock/subsys/named ]; then + service named start >/dev/null 2>&1 + fi + + echo -n $"Starting NetworkManager daemon: " + daemon --check $servicename $processname --pid-file=$pidfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename +} + +stop() +{ + echo -n $"Stopping NetworkManager daemon: " + killproc -p $pidfile $servicename + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile + fi +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f /var/lock/subsys/$servicename ]; then + stop + start + fi + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart}" + ;; +esac +exit $RETVAL diff --git a/initscript/Mandriva/networkmanagerdispatcher.in b/initscript/Mandriva/networkmanagerdispatcher.in new file mode 100644 index 0000000000..b4bc5f53da --- /dev/null +++ b/initscript/Mandriva/networkmanagerdispatcher.in @@ -0,0 +1,88 @@ +#!/bin/sh +# +# NetworkManager: NetworkManagerDispatcher daemon +# +# chkconfig: - 98 02 +# description: This daemon automatically runs scripts when NetworkManager \ +# changes the network state. +# +# processname: NetworkManagerDispatcher +# pidfile: /var/run/NetworkManager/NetworkManagerDispatcher.pid +# +### BEGIN INIT INFO +# Provides: networkmanagerdispatcher +# Required-Start: networkmanager +# Required-Stop: networkmanager +# Default-Start: 3 4 5 +# Short-Description: Daemon for automatically running scripts at change of network state +# Description: This daemon automatically runs scripts when NetworkManager +# changes the network state. +### END INIT INFO + +prefix=@prefix@ +exec_prefix=@prefix@ +sbindir=@sbindir@ + +NETWORKMANAGERDISPATCHER_BIN=${sbindir}/NetworkManagerDispatcher + +# Sanity checks. +[ -x $NETWORKMANAGERDISPATCHER_BIN ] || exit 1 + +# Source function library. +. /etc/rc.d/init.d/functions + +# so we can rearrange this easily +processname=NetworkManagerDispatcher +servicename=NetworkManagerDispatcher +pidfile=/var/run/NetworkManager/NetworkManagerDispatcher.pid + +RETVAL=0 + +start() +{ + echo -n $"Starting NetworkManagerDispatcher daemon: " + daemon --check $servicename $processname --pid-file=$pidfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename +} + +stop() +{ + echo -n $"Stopping NetworkManagerDispatcher daemon: " + killproc $servicename -TERM + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile + fi +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + if [ -f /var/lock/subsys/$servicename ]; then + stop + start + fi + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart}" + ;; +esac +exit $RETVAL diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index 4536082b44..e988da56af 100644 --- a/src/backends/Makefile.am +++ b/src/backends/Makefile.am @@ -53,6 +53,12 @@ libnmbackend_la_SOURCES += NetworkManagerFrugalware.c libnmbackend_la_LIBADD += -lfwnetconfig -lfwutil endif +if TARGET_MANDRIVA +libnmbackend_la_SOURCES += NetworkManagerMandriva.c \ + shvar.c \ + shvar.h +endif + libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS) libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c new file mode 100644 index 0000000000..ec9979d19e --- /dev/null +++ b/src/backends/NetworkManagerMandriva.c @@ -0,0 +1,541 @@ +/* NetworkManager -- Network link manager + * + * Dan Williams + * Per Øyvind Karlsen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * (C) Copyright 2004 Red Hat, Inc. + * (C) Copyright 2008 Per Øyvind Karlsen + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include +#include + +#include "NetworkManagerGeneric.h" +#include "NetworkManagerSystem.h" +#include "NetworkManagerUtils.h" +#include "nm-device.h" +#include "nm-device-802-3-ethernet.h" +#include "nm-device-802-11-wireless.h" +#include "nm-utils.h" +#include "shvar.h" + +/* + * nm_system_init + * + * Initializes the distribution-specific system backend + * + */ +void nm_system_init (void) +{ + nm_generic_init (); +} + + +/* + * nm_system_device_flush_routes + * + * Flush all routes associated with a network device + * + */ +void nm_system_device_flush_routes (NMDevice *dev) +{ + nm_generic_device_flush_routes (dev); +} + + +/* + * nm_system_device_flush_routes_with_iface + * + * Flush all routes associated with a network device + * + */ +void nm_system_device_flush_routes_with_iface (const char *iface) +{ + nm_generic_device_flush_routes_with_iface (iface); +} + + +/* + * nm_system_device_replace_default_route + * + * Add default route to the given device + * + */ +void +nm_system_device_replace_default_route (const char *iface, + guint32 gw, + guint32 mss) +{ + nm_generic_device_replace_default_route (iface, gw, mss); +} + + +/* + * nm_system_device_add_route_via_device_with_iface + * + * Add route to the given device + * + */ +void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route) +{ + nm_generic_device_add_route_via_device_with_iface (iface, route); +} + + +/* + * nm_system_device_has_active_routes + * + * Find out whether the specified device has any routes in the routing + * table. + * + */ +gboolean nm_system_device_has_active_routes (NMDevice *dev) +{ + return (FALSE); +} + + +/* + * nm_system_device_flush_addresses + * + * Flush all network addresses associated with a network device + * + */ +void nm_system_device_flush_addresses (NMDevice *dev) +{ + nm_generic_device_flush_addresses (dev); +} + + +/* + * nm_system_device_flush_addresses_with_iface + * + * Flush all network addresses associated with a network device + * + */ +void nm_system_device_flush_addresses_with_iface (const char *iface) +{ + nm_generic_device_flush_addresses_with_iface (iface); +} + + +#if 0 + /* Alert other computers of our new address */ + temp_addr.s_addr = addr; + buf = g_strdup_printf ("/sbin/arping -q -A -c 1 -I %s %s", iface, inet_ntoa (temp_addr)); + nm_spawn_process (buf); + g_free (buf); + g_usleep (G_USEC_PER_SEC * 2); + buf = g_strdup_printf ("/sbin/arping -q -U -c 1 -I %s %s", iface, inet_ntoa (temp_addr)); + nm_spawn_process (buf); + g_free (buf); +#endif + + +/* + * nm_system_enable_loopback + * + * Bring up the loopback interface + * + */ +void nm_system_enable_loopback (void) +{ + nm_generic_enable_loopback (); +} + + +/* + * nm_system_flush_loopback_routes + * + * Flush all routes associated with the loopback device, because it + * sometimes gets the first route for ZeroConf/Link-Local traffic. + * + */ +void nm_system_flush_loopback_routes (void) +{ + nm_generic_flush_loopback_routes (); +} + + +/* + * nm_system_flush_arp_cache + * + * Flush all entries in the arp cache. + * + */ +void nm_system_flush_arp_cache (void) +{ + nm_generic_flush_arp_cache (); +} + + +/* + * nm_system_kill_all_dhcp_daemons + * + * Kill all DHCP daemons currently running, done at startup. + * + */ +void nm_system_kill_all_dhcp_daemons (void) +{ +} + + +/* + * nm_system_update_dns + * + * Invalidate the nscd host cache, if it exists, since + * we changed resolv.conf. + * + */ +void nm_system_update_dns (void) +{ + if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE | G_FILE_TEST_IS_REGULAR)) { + nm_spawn_process ("/etc/init.d/nscd condrestart"); + nm_spawn_process ("/usr/sbin/nscd -i hosts"); + } +} + + +/* + * nm_system_restart_mdns_responder + * + * Restart the multicast DNS responder so that it knows about new + * network interfaces and IP addresses. + * + */ +void nm_system_restart_mdns_responder (void) +{ +#if defined(MDNS_PROVIDER_AVAHI) + nm_info ("Restarting avahi-daemon"); + if (g_file_test ("/var/run/avahi-daemon/pid", G_FILE_TEST_EXISTS)) + { + nm_spawn_process ("/etc/init.d/avahi-daemon restart"); + } +#elif defined(MDNS_PROVIDER_HOWL) + if (g_file_text ("/var/run/mDNSResponder.pid", G_FILE_TEST_EXISTS)) + { + nm_info ("Restarting mDNSResponder"); + nm_spawn_process ("/etc/init.d/mDNSResponder stop"); + nm_spawn_process ("/etc/init.d/mDNSResponder zap"); + nm_spawn_process ("/etc/init.d/mDNSResponder start"); + } +#elif defined(MDNS_PROVIDER_BONJOUR) + if (g_file_test ("/var/run/mDNSResponderPosix.pid", G_FILE_TEST_EXISTS)) + { + nm_info ("Restarting mDNSResponderPosix"); + nm_spawn_process ("/etc/init.d/mDNSResponderPosix restart"); + } +#else + g_printerr("No mDNSResponder support enabled"); + g_assert_not_reached(); +#endif +} + + +/* + * nm_system_device_add_ip6_link_address + * + * Add a default link-local IPv6 address to a device. + * + */ +void nm_system_device_add_ip6_link_address (NMDevice *dev) +{ + nm_generic_device_add_ip6_link_address (dev); +} + + +typedef struct MandrivaSystemConfigData +{ + NMIP4Config * config; + gboolean use_dhcp; + gboolean system_disabled; +} MandrivaSystemConfigData; + + +/* + * get_current_profile_name + * + * Retrieve the current network profile, if any + * + */ +static char *get_current_profile_name (void) +{ + shvarFile * file; + char * buf; + + if (!(file = svNewFile (SYSCONFDIR"/sysconfig/network"))) + return NULL; + + buf = svGetValue (file, "CURRENT_PROFILE"); + if (!buf) + buf = strdup ("default"); + svCloseFile (file); + + return buf; +} + + +/* + * nm_system_device_get_system_config + * + * Read in the config file for a device. + * + */ +void *nm_system_device_get_system_config (NMDevice *dev) +{ + char * cfg_file_path = NULL; + shvarFile * file; + char * buf = NULL; + MandrivaSystemConfigData * sys_data = NULL; + gboolean error = FALSE; + + g_return_val_if_fail (dev != NULL, NULL); + + /* Red Hat/Fedora Core systems store this information in + * /etc/sysconfig/network-scripts/ifcfg-* where * is the interface + * name. + */ + + sys_data = g_malloc0 (sizeof (MandrivaSystemConfigData)); + sys_data->use_dhcp = TRUE; + + cfg_file_path = g_strdup_printf (SYSCONFDIR"/sysconfig/network-scripts/ifcfg-%s", nm_device_get_iface (dev)); + if (!cfg_file_path) + return sys_data; + + if (!(file = svNewFile (cfg_file_path))) + { + g_free (cfg_file_path); + return sys_data; + } + g_free (cfg_file_path); + + /* Make sure this config file is for this device */ + buf = svGetValue (file, "DEVICE"); + if (!buf || strcmp (buf, nm_device_get_iface (dev))) + { + free (buf); + goto out; + } + + if ((buf = svGetValue (file, "BOOTPROTO"))) + { + if (strcasecmp (buf, "dhcp")) + sys_data->use_dhcp = FALSE; + free (buf); + } + + if ((buf = svGetValue (file, "NM_CONTROLLED"))) + { + nm_debug ("NM_CONTROLLED=%s", buf); + if (!strcasecmp (buf, "no")) + { + nm_info ("System configuration disables device %s", nm_device_get_iface (dev)); + sys_data->system_disabled = TRUE; + } + free (buf); + } + + sys_data->config = nm_ip4_config_new (); + + if (!(sys_data->use_dhcp)) + { + if ((buf = svGetValue (file, "IPADDR"))) + { + nm_ip4_config_set_address (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + nm_warning ("Network configuration for device '%s' was invalid (non-DHCP configuration, " + "but no IP address specified. Will use DHCP instead.", nm_device_get_iface (dev)); + error = TRUE; + goto out; + } + + if ((buf = svGetValue (file, "GATEWAY"))) + { + nm_ip4_config_set_gateway (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + nm_warning ("Network configuration for device '%s' was invalid (non-DHCP configuration, " + "but no gateway specified. Will use DHCP instead.", nm_device_get_iface (dev)); + error = TRUE; + goto out; + } + + if ((buf = svGetValue (file, "NETMASK"))) + { + nm_ip4_config_set_netmask (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + guint32 addr = nm_ip4_config_get_address (sys_data->config); + + /* Make a default netmask if we have an IP address */ + if (((ntohl (addr) & 0xFF000000) >> 24) <= 127) + nm_ip4_config_set_netmask (sys_data->config, htonl (0xFF000000)); + else if (((ntohl (addr) & 0xFF000000) >> 24) <= 191) + nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFF0000)); + else + nm_ip4_config_set_netmask (sys_data->config, htonl (0xFFFFFF00)); + } + + if ((buf = svGetValue (file, "BROADCAST"))) + { + nm_ip4_config_set_broadcast (sys_data->config, inet_addr (buf)); + free (buf); + } + else + { + guint32 broadcast = ((nm_ip4_config_get_address (sys_data->config) & nm_ip4_config_get_netmask (sys_data->config)) + | ~nm_ip4_config_get_netmask (sys_data->config)); + nm_ip4_config_set_broadcast (sys_data->config, broadcast); + } + } + + /* If we're using Static IP, grab DNS servers from the profile's config file */ + if (!sys_data->use_dhcp) + { + char * cur_profile_name = get_current_profile_name (); + + if (cur_profile_name) + { + char *filename = g_strdup_printf (SYSCONFDIR"/sysconfig/networking/profiles/%s/resolv.conf", cur_profile_name); + + nm_generic_set_ip4_config_from_resolv_conf (filename, sys_data->config); + g_free (filename); + g_free (cur_profile_name); + } + } + +#if 0 + nm_debug ("------ Config (%s)", nm_device_get_iface (dev)); + nm_debug (" DHCP=%d\n", sys_data->use_dhcp); + nm_debug (" ADDR=%d\n", nm_ip4_config_get_address (sys_data->config)); + nm_debug (" GW=%d\n", nm_ip4_config_get_gateway (sys_data->config)); + nm_debug (" NM=%d\n", nm_ip4_config_get_netmask (sys_data->config)); + nm_debug ("---------------------\n"); +#endif + +out: + svCloseFile (file); + + if (error) + { + sys_data->use_dhcp = TRUE; + /* Clear out the config */ + g_object_unref (sys_data->config); + sys_data->config = NULL; + } + + return (void *)sys_data; +} + + +/* + * nm_system_device_free_system_config + * + * Free stored system config data + * + */ +void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data) +{ + MandrivaSystemConfigData *sys_data = (MandrivaSystemConfigData *)system_config_data; + + g_return_if_fail (dev != NULL); + + if (!sys_data) + return; + + if (sys_data->config) + g_object_unref (sys_data->config); +} + + +/* + * nm_system_device_get_disabled + * + * Return whether the distro-specific system config tells us to use + * dhcp for this device. + * + */ +gboolean nm_system_device_get_disabled (NMDevice *dev) +{ + MandrivaSystemConfigData *sys_data; + + g_return_val_if_fail (dev != NULL, FALSE); + + if ((sys_data = nm_device_get_system_config_data (dev))) + return sys_data->system_disabled; + + return FALSE; +} + + +/* + * nm_system_activate_nis + * + * set up the nis domain and write a yp.conf + * + */ +void nm_system_activate_nis (NMIP4Config *config) +{ +} + +/* + * nm_system_shutdown_nis + * + * shutdown ypbind + * + */ +void nm_system_shutdown_nis (void) +{ +} + +/* + * nm_system_set_hostname + * + * set the hostname + * + */ +void nm_system_set_hostname (NMIP4Config *config) +{ +} + + +/* + * nm_system_should_modify_resolv_conf + * + * Can NM update resolv.conf, or is it locked down? + */ +gboolean nm_system_should_modify_resolv_conf (void) +{ + return TRUE; +} + diff --git a/system-settings/plugins/Makefile.am b/system-settings/plugins/Makefile.am index b32120c19a..30c4228435 100644 --- a/system-settings/plugins/Makefile.am +++ b/system-settings/plugins/Makefile.am @@ -5,3 +5,7 @@ endif if TARGET_SUSE SUBDIRS=ifcfg-suse endif + +if TARGET_MANDRIVA +SUBDIRS=ifcfg-fedora +endif