- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422)

This commit is contained in:
Daniel Williams 2009-03-10 03:31:37 +00:00
parent 7e93001cf9
commit aae1d86989
2 changed files with 21 additions and 1 deletions

View File

@ -18,7 +18,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.7.0.99
Release: 2%{snapshot}%{?dist}
Release: 3%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -29,6 +29,7 @@ Source2: nm-system-settings.conf
Patch1: nm-applet-internal-buildfixes.patch
Patch2: explain-dns1-dns2.patch
Patch4: NetworkManager-0.7.0.99-fix-hal-resync.patch
Patch5: missing-onboot-equals-yes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig
@ -147,6 +148,7 @@ tar -xjf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .explain-dns1-dns2
%patch4 -p1 -b .fix-hal-resync
%patch5 -p1 -b .missing-onboot
%build
@ -327,6 +329,9 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
* Mon Mar 9 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-3
- Missing ONBOOT should actually mean ONBOOT=yes (rh #489422)
* Mon Mar 9 2009 Dan Williams <dcbw@redhat.com> - 1:0.7.0.99-2
- Fix conflict with NetworkManager-openconnect (rh #489271)
- Fix possible crash when resynchronizing devices if HAL restarts

View File

@ -0,0 +1,15 @@
diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c
--- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c.ignore-minimal 2009-03-09 23:02:38.000000000 -0400
+++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/reader.c 2009-03-09 23:22:57.000000000 -0400
@@ -132,9 +132,9 @@ make_connection_setting (const char *fil
NULL);
g_free (uuid);
- /* Be somewhat conservative about autoconnect */
+ /* Missing ONBOOT is treated as "ONBOOT=true" by the old network service */
g_object_set (s_con, NM_SETTING_CONNECTION_AUTOCONNECT,
- svTrueValue (ifcfg, "ONBOOT", FALSE),
+ svTrueValue (ifcfg, "ONBOOT", TRUE),
NULL);
value = svGetValue (ifcfg, "LAST_CONNECT", FALSE);