--- a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/debian/changelog +++ a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/debian/changelog @@ -1,3 +1,9 @@ +univention-system-setup (7.0.69-62) unstable; urgency=low + + * Bug #3xxxx: Fix miimon UCR variable + + -- Philipp Hahn Wed, 29 Oct 2014 15:03:49 +0100 + univention-system-setup (7.0.69-61) unstable; urgency=low * Fixed translation error in ApplianceWizard.js (Bug #34090) --- a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/debian/univention-system-setup.postinst +++ a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/debian/univention-system-setup.postinst @@ -37,4 +37,11 @@ create_logfile /var/log/univention/setup.log "root:adm" 640 chmod -R 700 /var/cache/univention-system-setup +if dpkg --compare-versions "$2" lt-nl 7.0.69-62~ +then + ucr search --brief --non-empty '^interfaces/.*/options/' | + sed -rne 's,(interfaces/.*/options/.*): (miimon .*)$,\1=bond-\2,p' | + xargs -d '\n' --no-run-if-empty ucr set +fi + exit 0 --- a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/umc/python/setup/network.py +++ a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/umc/python/setup/network.py @@ -729,7 +729,7 @@ class Bond(Device): self.bond_mode = self.modes[value.strip()] except KeyError: pass # invalid mode - elif name == 'miimon': + elif name in ('bond-miimon', 'miimon'): try: self.miimon = int(value) except ValueError: @@ -747,7 +747,7 @@ class Bond(Device): if self.bond_mode == 1 and self.bond_primary: options.append('bond-primary %s' % (' '.join(self.bond_primary),)) if self.miimon is not None: - options.append('miimon %s' % (self.miimon,)) + options.append('bond-miimon %s' % (self.miimon,)) return options