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

(-)a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1 
univention-system-setup (7.0.69-62) unstable; urgency=low
2 

            

            

              3
              
  * Bug #3xxxx: Fix miimon UCR variable

            

            

              4
              

            

            

              5
              
 -- Philipp Hahn <hahn@univention.de>  Wed, 29 Oct 2014 15:03:49 +0100

            

            

              6
              

            

        

          1
          
univention-system-setup (7.0.69-61) unstable; urgency=low

          7
          
univention-system-setup (7.0.69-61) unstable; urgency=low

        

        

          2
          

          8
          

        

        

          3
          
  * Fixed translation error in ApplianceWizard.js (Bug #34090)

          9
          
  * 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
      (+7 lines)




  

    

    

       Lines 37-40
      create_logfile /var/log/univention/setup.log "root:adm" 640 
    
  Link Here 
    

  

        

          37
          

          37
          

        

        

          38
          
chmod -R 700 /var/cache/univention-system-setup

          38
          
chmod -R 700 /var/cache/univention-system-setup

        

        

          39
          

          39
          

        

            

              
              
              40
              
if dpkg --compare-versions "$2" lt-nl 7.0.69-62~

            

            

              41
              
then

            

            

              42
              
	ucr search --brief --non-empty '^interfaces/.*/options/' |

            

            

              43
              
		sed -rne 's,(interfaces/.*/options/.*): (miimon .*)$,\1=bond-\2,p' |

            

            

              44
              
		xargs -d '\n' --no-run-if-empty ucr set

            

            

              45
              
fi

            

            

              46
              

            

        

          40
          
exit 0

          47
          
exit 0

        



(-)a/branches/ucs-3.2/ucs-3.2-3/base/univention-system-setup/umc/python/setup/network.py
      (-2 / +2 lines)




  

    

    

       Lines 729-735
      class Bond(Device): 
    
  Link Here 
    

  

        

          729
          
						self.bond_mode = self.modes[value.strip()]

          729
          
						self.bond_mode = self.modes[value.strip()]

        

        

          730
          
					except KeyError:

          730
          
					except KeyError:

        

        

          731
          
						pass  # invalid mode

          731
          
						pass  # invalid mode

        

          
            

              732
              
			elif name == 'miimon':


              732
              
			elif name in ('bond-miimon', 'miimon'):

            

        

          733
          
				try:

          733
          
				try:

        

        

          734
          
					self.miimon = int(value)

          734
          
					self.miimon = int(value)

        

        

          735
          
				except ValueError:

          735
          
				except ValueError:

        

  

    

    

       Lines 747-753
      class Bond(Device): 
    
  Link Here 
    

  

        

          747
          
		if self.bond_mode == 1 and self.bond_primary:

          747
          
		if self.bond_mode == 1 and self.bond_primary:

        

        

          748
          
			options.append('bond-primary %s' % (' '.join(self.bond_primary),))

          748
          
			options.append('bond-primary %s' % (' '.join(self.bond_primary),))

        

        

          749
          
		if self.miimon is not None:

          749
          
		if self.miimon is not None:

        

          
            

              750
              
			options.append('miimon %s' % (self.miimon,))


              750
              
			options.append('bond-miimon %s' % (self.miimon,))

            

        

          751
          

          751
          

        

        

          752
          
		return options

          752
          
		return options

        

        

          753
          

          753
          

        






  

  Return to bug 36339