colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into dhcp6

Browse Source
This commit is contained in:
Dan Williams
2010-01-20 16:54:12 -08:00
parent 5598a4493b 8720a74c2e
commit e21885e764
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -1,6 +1,6 @@
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_INIT(NetworkManager, 0.7.998, dcbw@redhat.com, NetworkManager) AC_INIT(NetworkManager, 0.7.999, dcbw@redhat.com, NetworkManager)
AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2]) AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

2
libnm-glib/libnm-glib-vpn.pc.in
View File

@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libnm-glib-vpn Name: libnm-glib-vpn
Description: Convenience library for NetworkManager VPN plugins Description: Convenience library for NetworkManager VPN plugins
Version: @VERSION@ Version: @VERSION@
Requires: NetworkManager >= 0.7.995 glib-2.0 dbus-glib-1 Requires: NetworkManager >= 0.7.999 glib-2.0 dbus-glib-1
Cflags: -I${includedir}/libnm-glib Cflags: -I${includedir}/libnm-glib
Libs: -L${libdir} -lnm-glib-vpn Libs: -L${libdir} -lnm-glib-vpn

2
libnm-glib/libnm-glib.pc.in
View File

@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libnm-glib Name: libnm-glib
Description: Convenience library for clients of NetworkManager Description: Convenience library for clients of NetworkManager
Version: @VERSION@ Version: @VERSION@
Requires: NetworkManager >= 0.7.995 glib-2.0 dbus-glib-1 Requires: NetworkManager >= 0.7.999 glib-2.0 dbus-glib-1
Cflags: -I${includedir}/libnm-glib Cflags: -I${includedir}/libnm-glib
Libs: -L${libdir} -lnm-glib Libs: -L${libdir} -lnm-glib

4
libnm-util/libnm-util.pc.in
View File

@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: libnm_util Name: libnm-util
Description: Convenience library for clients of NetworkManager Description: Convenience library for clients of NetworkManager
Version: @VERSION@ Version: @VERSION@
Requires: glib-2.0 Requires: glib-2.0 dbus-glib-1
Cflags: -I${includedir}/NetworkManager Cflags: -I${includedir}/NetworkManager
Libs: -L${libdir} -lnm-util Libs: -L${libdir} -lnm-util

12
system-settings/plugins/ifcfg-rh/writer.c
View File

@@ -1206,20 +1206,16 @@ write_ip6_setting (NMConnection *connection, shvarFile *ifcfg, GError **error)
if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
svSetValue (ifcfg, "IPV6INIT", "no", FALSE); svSetValue (ifcfg, "IPV6INIT", "no", FALSE);
return TRUE; return TRUE;
} } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_AUTO)) {
else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_AUTO)) {
svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE); svSetValue (ifcfg, "IPV6_AUTOCONF", "yes", FALSE);
} } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE); svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE);
} } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) {
else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_LINK_LOCAL)) {
svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE); svSetValue (ifcfg, "IPV6_AUTOCONF", "no", FALSE);
} } else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) {
else if (!strcmp (value, NM_SETTING_IP6_CONFIG_METHOD_SHARED)) {
svSetValue (ifcfg, "IPV6INIT", "yes", FALSE); svSetValue (ifcfg, "IPV6INIT", "yes", FALSE);
/* TODO */ /* TODO */
} }