View | Details | Raw Unified | Return to bug 803058
Collapse All | Expand All

(-)sysconfig.changes (+6 lines)
Lines 1-4 Link Here
1
-------------------------------------------------------------------
1
-------------------------------------------------------------------
2
Tue Feb 19 11:50:02 UTC 2013 - mt@suse.de
3
4
- Added migration hook disabling NetworkManager.service on update
5
  from installation with a NETWORKMANAGER=no setting (bnc#803058).
6
7
-------------------------------------------------------------------
2
Thu Jan 31 10:46:51 UTC 2013 - mt@suse.com
8
Thu Jan 31 10:46:51 UTC 2013 - mt@suse.com
3
9
4
- version 0.80.4
10
- version 0.80.4
(-)sysconfig.spec (+12 lines)
Lines 123-128 Link Here
123
	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
123
	if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then
124
		touch etc/sysconfig/network/__move_shm_sysconfig__
124
		touch etc/sysconfig/network/__move_shm_sysconfig__
125
	fi
125
	fi
126
	# update from < 0.80.x only (-> openSUSE 12.3),
127
	# (skip if it were added to network/config later)
128
	if grep -qs "^NETWORKMANAGER=" \
129
		var/adm/fillup-templates/sysconfig.config-network ; then
130
		touch etc/sysconfig/network/__migrate_nm_variable__
131
	fi
126
fi
132
fi
127
133
128
%post 
134
%post 
Lines 174-179 Link Here
174
sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS
180
sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS
175
# remove NETWORKMANAGER variable; 12.3 is using network.service alias
181
# remove NETWORKMANAGER variable; 12.3 is using network.service alias
176
sysconfig_remove_and_set network/config NETWORKMANAGER
182
sysconfig_remove_and_set network/config NETWORKMANAGER
183
if [ -f etc/sysconfig/network/__migrate_nm_variable__ ] ; then
184
	rm -f etc/sysconfig/network/__migrate_nm_variable__
185
	if [ "X$NETWORKMANAGER" = "Xno" -a -x /bin/systemctl ] ; then
186
		/bin/systemctl --force disable NetworkManager.service || :
187
	fi
188
fi
177
# be a little bit paranoid and set the correct mode even we set umask
189
# be a little bit paranoid and set the correct mode even we set umask
178
chmod 0600 etc/sysconfig/network/ifcfg-*
190
chmod 0600 etc/sysconfig/network/ifcfg-*
179
191

Return to bug 803058