Hello community,
here is the log from the commit of package NetworkManager for openSUSE:12.3
checked in at 2013-03-01 07:36:16
Comparing /work/SRC/openSUSE:12.3/NetworkManager (Old)
and /work/SRC/openSUSE:12.3/.NetworkManager.new (New)
Package is NetworkManager, Maintainer is gnome-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.3/NetworkManager/NetworkManager.changes
2013-01-31 01:11:39.0 +0100
+++ /work/SRC/openSUSE:12.3/.NetworkManager.new/NetworkManager.changes
2013-03-01 07:36:18.0 +0100
@@ -1,0 +2,6 @@
+Thu Feb 21 18:58:07 UTC 2013 - m...@suse.com
+
+- Added migration hook enabling NetworkManager.service on update
+ from openSUSE 12.3 and NETWORKMANAGER=yes setting (bnc#803058).
+
+---
Other differences:
--
++ NetworkManager.spec ++
--- /var/tmp/diff_new_pack.oxsTK9/_old 2013-03-01 07:36:18.0 +0100
+++ /var/tmp/diff_new_pack.oxsTK9/_new 2013-03-01 07:36:18.0 +0100
@@ -82,7 +82,7 @@
Requires: iputils
Requires: mozilla-nss
Requires: ppp
-Requires: sysconfig = 0.80.0
+Requires: sysconfig = 0.80.5
Requires: wpa_supplicant = 0.6.4
%{?systemd_requires}
Provides: dhcdbd = 1.14
@@ -249,6 +249,31 @@
%post
%service_add_post NetworkManager.service
+# bnc#803058:
+# sysconfig creates this file while update from openSUSE 12.3,
+# which were using the NETWORKMANAGER=yes/no sysconfig variable.
+# When it exists and NETWORKMANAGER were enabled, force enable to
+# ensure, the network.service alias link exists points to us.
+if [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then
+ . /dev/.sysconfig/network/migrate_nm_variable
+ if [ X$NETWORKMANAGER = Xyes ] ; then
+ # In running system --force enable is sufficient to
+ # create the network.service alias link regardless if
+ # the network.service is masked or not.
+ # While 12.2 - 12.3 dist update, enable seems to be
+ # unable to create the alias... no idea why. Kick it
+ rm -f /etc/systemd/system/network.service
+ /usr/bin/systemctl --system daemon-reload || :
+ /usr/bin/systemctl --force enable NetworkManager.service || :
+ # and create the alias when enable failed to make it.
+ if [ ! -e /etc/systemd/system/network.service ] ; then
+ ln -sf %{_unitdir}/NetworkManager.service \
+ /etc/systemd/system/network.service
+ fi
+ /usr/bin/systemctl --system daemon-reload || :
+ fi
+ rm -f /dev/.sysconfig/network/migrate_nm_variable
+fi
%preun
%service_del_preun NetworkManager.service
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
