Attachment 525267 Details for Bug 803058

[patch] migrate NETWORKMANAGER=no setting

migrate-nm-variable.diff (text/plain), 1.69 KB, created by Marius Tomaschewski on 2013-02-19 14:54:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2013-02-19 14:54:08 UTC

Size: 1.69 KB

patch

obsolete

>Index: sysconfig.changes
>===================================================================
>--- sysconfig.changes (revision 143)
>+++ sysconfig.changes (revision 3)
>@@ -1,4 +1,10 @@
> -------------------------------------------------------------------
>+Tue Feb 19 11:50:02 UTC 2013 - mt@suse.de
>+
>+- Added migration hook disabling NetworkManager.service on update
>+  from installation with a NETWORKMANAGER=no setting (bnc#803058).
>+
>+-------------------------------------------------------------------
> Thu Jan 31 10:46:51 UTC 2013 - mt@suse.com
> 
> - version 0.80.4
>Index: sysconfig.spec
>===================================================================
>--- sysconfig.spec (revision 143)
>+++ sysconfig.spec (revision 3)
>@@ -123,6 +123,12 @@
> 	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
> 		touch etc/sysconfig/network/__move_shm_sysconfig__
> 	fi
>+	# update from < 0.80.x only (-> openSUSE 12.3),
>+	# (skip if it were added to network/config later)
>+	if grep -qs "^NETWORKMANAGER=" \
>+		var/adm/fillup-templates/sysconfig.config-network ; then
>+		touch etc/sysconfig/network/__migrate_nm_variable__
>+	fi
> fi
> 
> %post 
>@@ -174,6 +180,12 @@
> sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS
> # remove NETWORKMANAGER variable; 12.3 is using network.service alias
> sysconfig_remove_and_set network/config NETWORKMANAGER
>+if [ -f etc/sysconfig/network/__migrate_nm_variable__ ] ; then
>+	rm -f etc/sysconfig/network/__migrate_nm_variable__
>+	if [ "X$NETWORKMANAGER" = "Xno" -a -x /bin/systemctl ] ; then
>+		/bin/systemctl --force disable NetworkManager.service || :
>+	fi
>+fi
> # be a little bit paranoid and set the correct mode even we set umask
> chmod 0600 etc/sysconfig/network/ifcfg-*
> 
>

Actions: View | Diff

Attachments on bug 803058: 525267