commit NetworkManager for openSUSE:Factory
Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at Sun Sep 11 19:02:41 CEST 2011. -------- --- NetworkManager/NetworkManager.changes 2011-09-06 22:07:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2011-09-09 17:11:23.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 9 14:50:55 UTC 2011 - fcrozat@suse.com + +- Update systemd-network-config.patch to enable + NetworkManager-wait-online.service too (and read timeout value + from /etc/sysconfig/network/config). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.v9HClr/_old 2011-09-11 19:02:33.000000000 +0200 +++ /var/tmp/diff_new_pack.v9HClr/_new 2011-09-11 19:02:33.000000000 +0200 @@ -23,7 +23,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.9.0 -Release: 4 +Release: 6 License: GPLv2+ Group: Productivity/Networking/System Summary: Network Link Manager and User Applications ++++++ systemd-network-config.patch ++++++ --- /var/tmp/diff_new_pack.v9HClr/_old 2011-09-11 19:02:33.000000000 +0200 +++ /var/tmp/diff_new_pack.v9HClr/_new 2011-09-11 19:02:33.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- NetworkManager-0.9.0.orig/data/NetworkManager.service.in +++ NetworkManager-0.9.0/data/NetworkManager.service.in -@@ -8,7 +8,8 @@ Before=network.target +@@ -8,7 +8,9 @@ Before=network.target Type=dbus BusName=org.freedesktop.NetworkManager ExecStart=@sbindir@/NetworkManager --no-daemon @@ -12,3 +12,19 @@ [Install] WantedBy=multi-user.target -Alias=dbus-org.freedesktop.NetworkManager.service ++Also=NetworkManager-wait-online.service +Index: NetworkManager-0.9.0/data/NetworkManager-wait-online.service.in +=================================================================== +--- NetworkManager-0.9.0.orig/data/NetworkManager-wait-online.service.in ++++ NetworkManager-0.9.0/data/NetworkManager-wait-online.service.in +@@ -7,7 +7,9 @@ Before=network.target + + [Service] + Type=oneshot +-ExecStart=@bindir@/nm-online -q --timeout=30 ++Environment=NM_ONLINE_TIMEOUT=30 ++EnvironmentFile=-/etc/sysconfig/network/config ++ExecStart=@bindir@/nm-online -q --timeout=${NM_ONLINE_TIMEOUT} + + [Install] + WantedBy=network.target ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de