mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	CLOUDSTACK-7143: split locale config into its own file
This commit is contained in:
		
							parent
							
								
									3f8c31b0da
								
							
						
					
					
						commit
						aa14a619a6
					
				| @ -0,0 +1,13 @@ | |||||||
|  | fix_locale() { | ||||||
|  |   cat >> /etc/default/locale  << EOF | ||||||
|  | LANG=en_US.UTF-8 | ||||||
|  | LC_ALL=en_US.UTF-8 | ||||||
|  | EOF | ||||||
|  |   cat >> /etc/locale.gen  << EOF | ||||||
|  | en_US.UTF-8 UTF-8 | ||||||
|  | EOF | ||||||
|  | 
 | ||||||
|  |   locale-gen en_US.UTF-8 | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | fix_locale | ||||||
| @ -60,6 +60,7 @@ config = { | |||||||
|         'build_time.sh', |         'build_time.sh', | ||||||
|         'apt_upgrade.sh', |         'apt_upgrade.sh', | ||||||
|         'configure_grub.sh', |         'configure_grub.sh', | ||||||
|  |         'configure_locale.sh', | ||||||
|         'configure_login.sh', |         'configure_login.sh', | ||||||
|         'postinstall.sh', |         'postinstall.sh', | ||||||
|         'cleanup.sh', |         'cleanup.sh', | ||||||
|  | |||||||
| @ -140,18 +140,6 @@ fix_hostname() { | |||||||
|   sed -i '/127.0.1.1/d' /etc/hosts |   sed -i '/127.0.1.1/d' /etc/hosts | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| fix_locale() { |  | ||||||
|   cat >> /etc/default/locale  << EOF |  | ||||||
| LANG=en_US.UTF-8 |  | ||||||
| LC_ALL=en_US.UTF-8 |  | ||||||
| EOF |  | ||||||
|   cat >> /etc/locale.gen  << EOF |  | ||||||
| en_US.UTF-8 UTF-8 |  | ||||||
| EOF |  | ||||||
| 
 |  | ||||||
|   locale-gen en_US.UTF-8 |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| # This is actually a bug in the conntrackd package. The comment in the conf file says stats logging is off by default but the parameter is set to on. | # This is actually a bug in the conntrackd package. The comment in the conf file says stats logging is off by default but the parameter is set to on. | ||||||
| # After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking even if we don't want it to (on non-redundant routers for instance). | # After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking even if we don't want it to (on non-redundant routers for instance). | ||||||
| fix_conntrackd() { | fix_conntrackd() { | ||||||
| @ -178,7 +166,6 @@ do_fixes() { | |||||||
|   fix_nameserver |   fix_nameserver | ||||||
|   fix_acpid |   fix_acpid | ||||||
|   fix_hostname |   fix_hostname | ||||||
|   fix_locale |  | ||||||
|   fix_conntrackd |   fix_conntrackd | ||||||
|   fix_vhdutil |   fix_vhdutil | ||||||
|   fix_modules |   fix_modules | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user